Generalized ammo to just 'stuff' so we can have other countable things.

This commit is contained in:
Martin Haye 2016-06-17 07:39:52 -07:00
parent d5f1663267
commit b8b2541715
2 changed files with 4 additions and 4 deletions

View File

@ -118,7 +118,7 @@ const randomFromArray = gameLibVecs + 3*57
const makePlayer_pt1 = gameLibVecs + 3*58 const makePlayer_pt1 = gameLibVecs + 3*58
const makePlayer_pt2 = gameLibVecs + 3*59 const makePlayer_pt2 = gameLibVecs + 3*59
const calcPlayerArmor = gameLibVecs + 3*60 const calcPlayerArmor = gameLibVecs + 3*60
const makeAmmo = gameLibVecs + 3*61 const makeStuff = gameLibVecs + 3*61
const UNUSED_FN_62 = gameLibVecs + 3*62 const UNUSED_FN_62 = gameLibVecs + 3*62
const UNUSED_FN_63 = gameLibVecs + 3*63 const UNUSED_FN_63 = gameLibVecs + 3*63
const UNUSED_FN_64 = gameLibVecs + 3*64 const UNUSED_FN_64 = gameLibVecs + 3*64

View File

@ -111,7 +111,7 @@ predef _reboot, _brk, _encodeDice, _rollDice
predef _setPlural, _makeEnemy, _getStringResponse, _strcmpi, _addEncounterZone, _fatal predef _setPlural, _makeEnemy, _getStringResponse, _strcmpi, _addEncounterZone, _fatal
predef _pause, _tossStrings, _showMapName, _setMapWindow predef _pause, _tossStrings, _showMapName, _setMapWindow
predef _makeModifier, _makeArmor, _makeWeapon_pt1, _makeWeapon_pt2, _randomFromArray predef _makeModifier, _makeArmor, _makeWeapon_pt1, _makeWeapon_pt2, _randomFromArray
predef _makePlayer_pt1, _makePlayer_pt2, _calcPlayerArmor, _makeAmmo predef _makePlayer_pt1, _makePlayer_pt2, _calcPlayerArmor, _makeStuff
word gameLib_addrs = @_setScriptInfo, @_scriptDisplayStr, @_scriptDisplayStrNL, @_getYN word gameLib_addrs = @_setScriptInfo, @_scriptDisplayStr, @_scriptDisplayStrNL, @_getYN
word = @_queue_setMap, @_setSky, @_setGround, @_queue_teleport, @_setPortrait, @_clearPortrait word = @_queue_setMap, @_setSky, @_setGround, @_queue_teleport, @_setPortrait, @_clearPortrait
@ -127,7 +127,7 @@ word = @_reboot, @_brk, @_encodeDice, @_rollDice
word = @_setPlural, @_makeEnemy, @_getStringResponse, @_strcmpi, @_addEncounterZone, @_fatal word = @_setPlural, @_makeEnemy, @_getStringResponse, @_strcmpi, @_addEncounterZone, @_fatal
word = @_pause, @_tossStrings, @_showMapName, @_setMapWindow word = @_pause, @_tossStrings, @_showMapName, @_setMapWindow
word = @_makeModifier, @_makeArmor, @_makeWeapon_pt1, @_makeWeapon_pt2, @_randomFromArray word = @_makeModifier, @_makeArmor, @_makeWeapon_pt1, @_makeWeapon_pt2, @_randomFromArray
word = @_makePlayer_pt1, @_makePlayer_pt2, @_calcPlayerArmor, @_makeAmmo word = @_makePlayer_pt1, @_makePlayer_pt2, @_calcPlayerArmor, @_makeStuff
word = 0 // end of library functions word = 0 // end of library functions
@ -2231,7 +2231,7 @@ def _calcPlayerArmor(player)
end end
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
def _makeAmmo(name, kind, price, count) def _makeStuff(name, kind, price, count)
word p; p = mmgr(HEAP_ALLOC, TYPE_ARMOR) word p; p = mmgr(HEAP_ALLOC, TYPE_ARMOR)
p=>s_name = mmgr(HEAP_INTERN, name) p=>s_name = mmgr(HEAP_INTERN, name)
p=>s_itemKind = mmgr(HEAP_INTERN, kind) p=>s_itemKind = mmgr(HEAP_INTERN, kind)