mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of github.com:diasurgical/devilution

pull/973/head
Anders Jenbo 5 years ago
parent
890b1dd9a7 2467a982a1
commit
5bdbf18902
8 changed files with 138 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Source/diablo.cpp
  2. 2
      Source/error.cpp
  3. 12
      Source/gmenu.cpp
  4. 4
      Source/help.cpp
  5. 24
      Source/mpqapi.cpp
  6. 198
      Source/objects.cpp
  7. 10
      Source/stores.cpp
  8. 6
      Source/stores.h

2
Source/diablo.cpp
Unescape View File

@ -411,7 +411,7 @@ BOOL StartGame(BOOL bNewGame, BOOL bSinglePlayer)
}
run_game_loop(uMsg);
NetClose();
pfile_create_player_description(0, 0);
pfile_create_player_description(NULL, 0);
} while (gbRunGameResult);
SNetDestroy();

2
Source/error.cpp
Unescape View File

@ -83,7 +83,7 @@ void InitDiabloMsg(char e)
return;
}
msgtable[msgcnt] = e;
msgtable[msgcnt] = e; // BUGFIX: missing out-of-bounds check (fixed)
msgcnt++;
msgflag = msgtable[0];

12
Source/gmenu.cpp
Unescape View File

@ -15,7 +15,7 @@ BYTE *BigTGold_cel;
int LogoAnim_tick;
BYTE LogoAnim_frame;
int PentSpin_tick;
void (*dword_63447C)(TMenuItem *);
void (*gmenu_current_option)(TMenuItem *);
TMenuItem *sgpCurrentMenu;
BYTE *option_cel;
BYTE *sgpLogo;
@ -87,7 +87,7 @@ void gmenu_init_menu()
#endif
sgpCurrentMenu = NULL;
sgpCurrItem = NULL;
dword_63447C = NULL;
gmenu_current_option = NULL;
sgCurrentMenuIdx = 0;
mouseNavigation = FALSE;
#ifdef HELLFIRE
@ -143,9 +143,9 @@ void gmenu_set_items(TMenuItem *pItem, void (*gmFunc)(TMenuItem *))
PauseMode = 0;
mouseNavigation = FALSE;
sgpCurrentMenu = pItem;
dword_63447C = gmFunc;
gmenu_current_option = gmFunc;
if (gmFunc) {
dword_63447C(sgpCurrentMenu);
gmenu_current_option(sgpCurrentMenu);
pItem = sgpCurrentMenu;
}
sgCurrentMenuIdx = 0;
@ -229,8 +229,8 @@ void gmenu_draw()
DWORD ticks;
if (sgpCurrentMenu) {
if (dword_63447C)
dword_63447C(sgpCurrentMenu);
if (gmenu_current_option)
gmenu_current_option(sgpCurrentMenu);
#ifdef HELLFIRE
ticks = SDL_GetTicks();
if ((int)(ticks - LogoAnim_tick) > 25) {

4
Source/help.cpp
Unescape View File

@ -8,7 +8,7 @@
DEVILUTION_BEGIN_NAMESPACE
int help_select_line;
int dword_634494;
int unused_help;
BOOL helpflag;
int displayinghelp[22]; /* check, does nothing? */
int HelpTop;
@ -445,7 +445,7 @@ const char gszHelpText[] = {
void InitHelp()
{
helpflag = FALSE;
dword_634494 = 0;
unused_help = 0;
displayinghelp[0] = 0;
}

24
Source/mpqapi.cpp
Unescape View File

@ -17,6 +17,8 @@
DEVILUTION_BEGIN_NAMESPACE
#define INDEX_ENTRIES 2048
// Amiga cannot seekp beyond EOF.
// See https://github.com/bebbo/libnix/issues/30
#ifndef __AMIGA__
@ -167,8 +169,8 @@ private:
std::unique_ptr<std::fstream> s_;
};
constexpr std::size_t kBlockEntrySize = 0x8000;
constexpr std::size_t kHashEntrySize = 0x8000;
constexpr std::size_t kBlockEntrySize = INDEX_ENTRIES * sizeof(_BLOCKENTRY);
constexpr std::size_t kHashEntrySize = INDEX_ENTRIES * sizeof(_HASHENTRY);
constexpr std::ios::off_type kMpqBlockEntryOffset = sizeof(_FILEHEADER);
constexpr std::ios::off_type kMpqHashEntryOffset = kMpqBlockEntryOffset + kBlockEntrySize;
@ -267,8 +269,8 @@ private:
fhdr.sectorsizeid = SDL_SwapLE16(3);
fhdr.hashoffset = SDL_SwapLE32(static_cast<uint32_t>(kMpqHashEntryOffset));
fhdr.blockoffset = SDL_SwapLE32(static_cast<uint32_t>(kMpqBlockEntryOffset));
fhdr.hashcount = SDL_SwapLE32(2048);
fhdr.blockcount = SDL_SwapLE32(2048);
fhdr.hashcount = SDL_SwapLE32(INDEX_ENTRIES);
fhdr.blockcount = SDL_SwapLE32(INDEX_ENTRIES);
if (!stream.write(reinterpret_cast<const char *>(&fhdr), sizeof(fhdr)))
return false;
@ -327,8 +329,8 @@ bool IsValidMPQHeader(const Archive &archive, _FILEHEADER *hdr)
&& hdr->filesize == archive.size
&& hdr->hashoffset == kMpqHashEntryOffset
&& hdr->blockoffset == sizeof(_FILEHEADER)
&& hdr->hashcount == 2048
&& hdr->blockcount == 2048;
&& hdr->hashcount == INDEX_ENTRIES
&& hdr->blockcount == INDEX_ENTRIES;
}
bool ReadMPQHeader(Archive *archive, _FILEHEADER *hdr)
@ -351,7 +353,7 @@ static _BLOCKENTRY *mpqapi_new_block(int *block_index)
{
_BLOCKENTRY *blockEntry = cur_archive.sgpBlockTbl;
for (DWORD i = 0; i < 2048; i++, blockEntry++) {
for (DWORD i = 0; i < INDEX_ENTRIES; i++, blockEntry++) {
if (blockEntry->offset != 0)
continue;
if (blockEntry->sizealloc != 0)
@ -377,7 +379,7 @@ void mpqapi_alloc_block(uint32_t block_offset, uint32_t block_size)
int i;
block = cur_archive.sgpBlockTbl;
i = 2048;
i = INDEX_ENTRIES;
while (i-- != 0) {
if (block->offset && !block->flags && !block->sizefile) {
if (block->offset + block->sizealloc == block_offset) {
@ -415,7 +417,7 @@ int mpqapi_find_free_block(uint32_t size, uint32_t *block_size)
int result;
_BLOCKENTRY *pBlockTbl = cur_archive.sgpBlockTbl;
for (int i = 2048; i--; pBlockTbl++) {
for (int i = INDEX_ENTRIES; i--; pBlockTbl++) {
if (pBlockTbl->offset == 0)
continue;
if (pBlockTbl->flags != 0)
@ -446,7 +448,7 @@ static int mpqapi_get_hash_index(int index, int hash_a, int hash_b, int locale)
{
DWORD idx, i;
i = 2048;
i = INDEX_ENTRIES;
for (idx = index & 0x7FF; cur_archive.sgpHashTbl[idx].block != -1; idx = (idx + 1) & 0x7FF) {
if (i-- == 0)
break;
@ -511,7 +513,7 @@ static _BLOCKENTRY *mpqapi_add_file(const char *pszName, _BLOCKENTRY *pBlk, int
if (mpqapi_get_hash_index(h1, h2, h3, 0) != -1)
app_fatal("Hash collision between \"%s\" and existing file\n", pszName);
hIdx = h1 & 0x7FF;
i = 2048;
i = INDEX_ENTRIES;
while (i--) {
if (cur_archive.sgpHashTbl[hIdx].block == -1 || cur_archive.sgpHashTbl[hIdx].block == -2)
break;

198
Source/objects.cpp
Unescape View File

@ -724,7 +724,7 @@ void LoadMapObjects(BYTE *pMap, int startx, int starty, int x1, int y1, int w, i
InitObjFlag = TRUE;
lm = pMap;
rw = lm[0];
rw = *lm;
lm += 2;
rh = *lm;
mapoff = (rw * rh + 1) * 2;
@ -736,7 +736,7 @@ void LoadMapObjects(BYTE *pMap, int startx, int starty, int x1, int y1, int w, i
for (j = 0; j < rh; j++) {
for (i = 0; i < rw; i++) {
if (*lm) {
type = lm[0];
type = *lm;
AddObject(ObjTypeConv[type], startx + 16 + i, starty + 16 + j);
oi = ObjIndex(startx + 16 + i, starty + 16 + j);
SetObjMapRange(oi, x1, y1, x1 + w, y1 + h, leveridx);
@ -3458,7 +3458,7 @@ void OperateShrine(int pnum, int i, int sType)
DWORD lv, t;
int xx, yy;
int v1, v2, v3, v4;
unsigned __int64 spell, spells;
unsigned __int64 spell;
if (dropGoldFlag) {
dropGoldFlag = FALSE;
@ -3478,8 +3478,8 @@ void OperateShrine(int pnum, int i, int sType)
object[i]._oAnimFlag = 1;
object[i]._oAnimDelay = 1;
} else {
object[i]._oAnimFlag = 0;
object[i]._oAnimFrame = object[i]._oAnimLen;
object[i]._oAnimFlag = 0;
}
switch (object[i]._oVar1) {
case SHRINE_MYSTERIOUS:
@ -3532,10 +3532,12 @@ void OperateShrine(int pnum, int i, int sType)
while (TRUE) {
cnt = 0;
for (j = 0; j < NUM_INVLOC; j++) {
if (plr[pnum].InvBody[j]._itype != ITYPE_NONE
&& plr[pnum].InvBody[j]._iMaxDur != DUR_INDESTRUCTIBLE
&& plr[pnum].InvBody[j]._iMaxDur != 0)
cnt++;
if (plr[pnum].InvBody[j]._itype != ITYPE_NONE)
#ifndef HELLFIRE
if (plr[pnum].InvBody[j]._iMaxDur != DUR_INDESTRUCTIBLE
&& plr[pnum].InvBody[j]._iMaxDur != 0)
#endif
cnt++;
}
if (cnt == 0)
break;
@ -3593,8 +3595,8 @@ void OperateShrine(int pnum, int i, int sType)
plr[pnum].InvList[j]._iMaxDam = plr[pnum].InvList[j]._iMinDam;
break;
case ITYPE_SHIELD:
case ITYPE_LARMOR:
case ITYPE_HELM:
case ITYPE_LARMOR:
case ITYPE_MARMOR:
case ITYPE_HARMOR:
plr[pnum].InvList[j]._iAC += 2;
@ -3687,9 +3689,8 @@ void OperateShrine(int pnum, int i, int sType)
return;
cnt = 0;
spell = 1;
spells = plr[pnum]._pMemSpells;
for (j = 0; j < MAX_SPELLS; j++) {
if (spell & spells)
if (spell & plr[pnum]._pMemSpells)
cnt++;
spell <<= 1;
}
@ -3705,10 +3706,10 @@ void OperateShrine(int pnum, int i, int sType)
do {
r = random_(0, MAX_SPELLS);
} while (!(plr[pnum]._pMemSpells & SPELLBIT(r + 1)));
if (plr[pnum]._pSplLvl[r] >= 2)
plr[pnum]._pSplLvl[r] -= 2;
if (plr[pnum]._pSplLvl[r + 1] >= 2)
plr[pnum]._pSplLvl[r + 1] -= 2;
else
plr[pnum]._pSplLvl[r] = 0;
plr[pnum]._pSplLvl[r + 1] = 0;
}
InitDiabloMsg(EMSG_SHRINE_ENCHANTED);
break;
@ -3721,8 +3722,8 @@ void OperateShrine(int pnum, int i, int sType)
|| object[v1]._otype == OBJ_CHEST3)
&& object[v1]._oSelFlag == 0) {
object[v1]._oRndSeed = GetRndSeed();
object[v1]._oAnimFrame -= 2;
object[v1]._oSelFlag = 1;
object[v1]._oAnimFrame -= 2;
}
}
if (deltaload)
@ -3749,12 +3750,12 @@ void OperateShrine(int pnum, int i, int sType)
plr[pnum]._pMaxMana -= t;
plr[pnum]._pMaxManaBase -= t;
if (plr[pnum]._pMana >> 6 <= 0) {
plr[pnum]._pManaBase = 0;
plr[pnum]._pMana = v1;
plr[pnum]._pManaBase = 0;
}
if (plr[pnum]._pMaxMana >> 6 <= 0) {
plr[pnum]._pMaxManaBase = 0;
plr[pnum]._pMaxMana = v2;
plr[pnum]._pMaxManaBase = 0;
}
InitDiabloMsg(EMSG_SHRINE_FASCINATING);
break;
@ -3855,10 +3856,10 @@ void OperateShrine(int pnum, int i, int sType)
do {
xx = random_(159, MAXDUNX);
yy = random_(159, MAXDUNY);
lv = dPiece[xx][yy];
j++;
if (j > MAXDUNX * 112)
if (j > MAXDUNX * MAXDUNY)
break;
lv = dPiece[xx][yy];
} while (nSolidTable[lv] || dObject[xx][yy] != 0 || dMonster[xx][yy] != 0);
AddMissile(plr[pnum]._px, plr[pnum]._py, xx, yy, plr[pnum]._pdir, MIS_RNDTELEPORT, -1, pnum, 0, 2 * leveltype);
if (pnum != myplr)
@ -4064,6 +4065,9 @@ void OperateShrine(int pnum, int i, int sType)
case PC_SORCERER:
ModifyPlrMag(myplr, 2);
break;
case PC_BARBARIAN:
ModifyPlrVit(myplr, 2);
break;
case PC_MONK:
ModifyPlrStr(myplr, 1);
ModifyPlrDex(myplr, 1);
@ -4072,11 +4076,8 @@ void OperateShrine(int pnum, int i, int sType)
ModifyPlrDex(myplr, 1);
ModifyPlrMag(myplr, 1);
break;
case PC_BARBARIAN:
ModifyPlrVit(myplr, 2);
break;
}
CheckStats(myplr);
CheckStats(pnum);
AddMissile(
object[i]._ox,
object[i]._oy,
@ -4102,24 +4103,25 @@ void OperateShrine(int pnum, int i, int sType)
magicGain = 5;
xpLoss = (signed __int64)((double)playerXP * 0.95);
} else {
xpLoss = 0;
magicGain = playerXP / 1000;
xpLoss = 0;
}
ModifyPlrMag(myplr, magicGain);
plr[myplr]._pExperience = xpLoss;
CheckStats(myplr);
CheckStats(pnum);
} break;
case SHRINE_MENDICANT:
case SHRINE_MENDICANT: {
if (deltaload)
return;
if (pnum != myplr)
return;
InitDiabloMsg(EMSG_SHRINE_MENDICANT);
AddPlrExperience(myplr, plr[myplr]._pLevel, plr[myplr]._pGold / 2);
TakePlrsMoney(plr[myplr]._pGold / 2);
CheckStats(myplr);
break;
int gold = plr[myplr]._pGold / 2;
AddPlrExperience(myplr, plr[myplr]._pLevel, gold);
TakePlrsMoney(gold);
CheckStats(pnum);
} break;
case SHRINE_SPARKLING:
if (deltaload)
return;
@ -4138,7 +4140,7 @@ void OperateShrine(int pnum, int i, int sType)
0,
3 * currlevel + 2,
0);
CheckStats(myplr);
CheckStats(pnum);
break;
case SHRINE_TOWN:
if (deltaload)
@ -4164,8 +4166,8 @@ void OperateShrine(int pnum, int i, int sType)
if (pnum != myplr)
return;
InitDiabloMsg(EMSG_SHRINE_SHIMMERING);
plr[myplr]._pMana = plr[myplr]._pMaxMana;
plr[myplr]._pManaBase = plr[myplr]._pMaxManaBase;
plr[pnum]._pMana = plr[pnum]._pMaxMana;
plr[pnum]._pManaBase = plr[pnum]._pMaxManaBase;
break;
case SHRINE_SOLAR: {
@ -4178,21 +4180,17 @@ void OperateShrine(int pnum, int i, int sType)
if (hour > 20 || hour < 4) {
InitDiabloMsg(EMSG_SHRINE_SOLAR4);
ModifyPlrVit(myplr, 2);
} else if (hour <= 18) {
if (hour <= 12) {
if (hour > 4) {
InitDiabloMsg(EMSG_SHRINE_SOLAR1);
ModifyPlrDex(myplr, 2);
}
} else {
InitDiabloMsg(EMSG_SHRINE_SOLAR2);
ModifyPlrStr(myplr, 2);
}
} else {
} else if (hour > 18) {
InitDiabloMsg(EMSG_SHRINE_SOLAR3);
ModifyPlrMag(myplr, 2);
} else if (hour > 12) {
InitDiabloMsg(EMSG_SHRINE_SOLAR2);
ModifyPlrStr(myplr, 2);
} else if (hour > 4) {
InitDiabloMsg(EMSG_SHRINE_SOLAR1);
ModifyPlrDex(myplr, 2);
}
CheckStats(myplr);
CheckStats(pnum);
} break;
case SHRINE_MURPHYS:
@ -4201,12 +4199,13 @@ void OperateShrine(int pnum, int i, int sType)
if (pnum != myplr)
return;
InitDiabloMsg(EMSG_SHRINE_MURPHYS);
BOOLEAN broke = FALSE;
BOOL broke = FALSE;
for (int j = 0; j < NUM_INVLOC; j++) {
if (plr[pnum].InvBody[j]._itype != ITYPE_NONE && random_(0, 3) == 0) {
if (plr[pnum].InvBody[j]._iDurability != DUR_INDESTRUCTIBLE) {
if (plr[pnum].InvBody[j]._iDurability) {
plr[pnum].InvBody[j]._iDurability /= 2;
ItemStruct *item = &plr[myplr].InvBody[j];
if (item->_itype != ITYPE_NONE && random_(0, 3) == 0) {
if (item->_iDurability != DUR_INDESTRUCTIBLE) {
if (item->_iDurability) {
item->_iDurability /= 2;
broke = TRUE;
break;
}
@ -4980,25 +4979,49 @@ void SyncL1Doors(int i)
object[i]._oMissFlag = FALSE;
return;
}
#ifdef HELLFIRE
else
#endif
object[i]._oMissFlag = TRUE;
x = object[i]._ox;
y = object[i]._oy;
object[i]._oMissFlag = TRUE;
object[i]._oSelFlag = 2;
if (object[i]._otype == OBJ_L1LDOOR) {
if (object[i]._oVar1 == 214)
ObjSetMicro(x, y, 408);
else
ObjSetMicro(x, y, 393);
dSpecial[x][y] = 7;
objects_set_door_piece(x - 1, y);
y--;
#ifdef HELLFIRE
if (currlevel < 17) {
#endif
if (object[i]._otype == OBJ_L1LDOOR) {
if (object[i]._oVar1 == 214)
ObjSetMicro(x, y, 408);
else
ObjSetMicro(x, y, 393);
dSpecial[x][y] = 7;
objects_set_door_piece(x - 1, y);
y--;
} else {
ObjSetMicro(x, y, 395);
#ifdef HELLFIRE
if (currlevel < 17)
#endif
dSpecial[x][y] = 8;
objects_set_door_piece(x, y - 1);
x--;
}
#ifdef HELLFIRE
} else {
ObjSetMicro(x, y, 395);
dSpecial[x][y] = 8;
objects_set_door_piece(x, y - 1);
x--;
if (object[i]._otype == OBJ_L1LDOOR) {
ObjSetMicro(x, y, 206);
dSpecial[x][y] = 1;
objects_set_door_piece(x - 1, y);
y--;
} else {
ObjSetMicro(x, y, 209);
dSpecial[x][y] = 2;
objects_set_door_piece(x, y - 1);
x--;
}
}
#endif
DoorSet(i, x, y);
}
@ -5149,14 +5172,15 @@ void SyncObjectAnim(int o)
void GetObjectStr(int i)
{
switch (object[i]._otype) {
case OBJ_CRUX1:
case OBJ_CRUX2:
case OBJ_CRUX3:
strcpy(infostr, "Crucified Skeleton");
break;
case OBJ_LEVER:
case OBJ_FLAMELVR:
strcpy(infostr, "Lever");
break;
case OBJ_CHEST1:
case OBJ_TCHEST1:
strcpy(infostr, "Small Chest");
break;
case OBJ_L1LDOOR:
case OBJ_L1RDOOR:
case OBJ_L2LDOOR:
@ -5185,7 +5209,10 @@ void GetObjectStr(int i)
case OBJ_BOOK2R:
strcpy(infostr, "Mythical Book");
break;
case OBJ_CHEST1:
case OBJ_TCHEST1:
strcpy(infostr, "Small Chest");
break;
case OBJ_CHEST2:
case OBJ_TCHEST2:
strcpy(infostr, "Chest");
@ -5195,37 +5222,32 @@ void GetObjectStr(int i)
case OBJ_SIGNCHEST:
strcpy(infostr, "Large Chest");
break;
case OBJ_CRUX1:
case OBJ_CRUX2:
case OBJ_CRUX3:
strcpy(infostr, "Crucified Skeleton");
break;
case OBJ_SARC:
strcpy(infostr, "Sarcophagus");
break;
case OBJ_BOOKSHELF:
strcpy(infostr, "Bookshelf");
break;
case OBJ_BOOKCASEL:
case OBJ_BOOKCASER:
strcpy(infostr, "Bookcase");
break;
case OBJ_BARREL:
case OBJ_BARRELEX:
if (currlevel > 16 && currlevel < 21) // for hive levels
strcpy(infostr, "Pod"); //Then a barrel is called a pod
else if (currlevel > 20 && currlevel < 25) // for crypt levels
strcpy(infostr, "Urn"); //Then a barrel is called an urn
if (currlevel >= 17 && currlevel <= 20) // for hive levels
strcpy(infostr, "Pod"); //Then a barrel is called a pod
else if (currlevel >= 21 && currlevel <= 24) // for crypt levels
strcpy(infostr, "Urn"); //Then a barrel is called an urn
else
strcpy(infostr, "Barrel");
break;
case OBJ_SKELBOOK:
strcpy(infostr, "Skeleton Tome");
break;
case OBJ_SHRINEL:
case OBJ_SHRINER:
sprintf(tempstr, "%s Shrine", shrinestrs[object[i]._oVar1]);
strcpy(infostr, tempstr);
break;
case OBJ_BOOKCASEL:
case OBJ_BOOKCASER:
strcpy(infostr, "Bookcase");
case OBJ_SKELBOOK:
strcpy(infostr, "Skeleton Tome");
break;
case OBJ_BOOKSTAND:
strcpy(infostr, "Library Book");
@ -5242,9 +5264,6 @@ void GetObjectStr(int i)
case OBJ_BLOODBOOK:
strcpy(infostr, "Book of Blood");
break;
case OBJ_PEDISTAL:
strcpy(infostr, "Pedestal of Blood");
break;
case OBJ_PURIFYINGFTN:
strcpy(infostr, "Purifying Spring");
break;
@ -5252,6 +5271,9 @@ void GetObjectStr(int i)
case OBJ_WARARMOR:
strcpy(infostr, "Armor");
break;
case OBJ_WARWEAP:
strcpy(infostr, "Weapon Rack");
break;
case OBJ_GOATSHRINE:
strcpy(infostr, "Goat Shrine");
break;
@ -5267,10 +5289,12 @@ void GetObjectStr(int i)
case OBJ_STEELTOME:
strcpy(infostr, "Steel Tome");
break;
case OBJ_PEDISTAL:
strcpy(infostr, "Pedestal of Blood");
break;
case OBJ_STORYBOOK:
strcpy(infostr, StoryBookName[object[i]._oVar3]);
break;
case OBJ_WARWEAP:
case OBJ_WEAPONRACK:
strcpy(infostr, "Weapon Rack");
break;

10
Source/stores.cpp
Unescape View File

@ -21,11 +21,7 @@ char stextsize;
int stextsmax;
ItemStruct storehold[48];
int gossipstart;
#ifdef HELLFIRE
ItemStruct witchitem[25];
#else
ItemStruct witchitem[20];
#endif
ItemStruct witchitem[WITCH_ITEMS];
BOOL stextscrl;
int numpremium;
ItemStruct healitem[20];
@ -71,7 +67,7 @@ void InitStores()
numpremium = 0;
premiumlevel = 1;
for (i = 0; i < 6; i++)
for (i = 0; i < SMITH_PREMIUM_ITEMS; i++)
premiumitem[i]._itype = ITYPE_NONE;
boyitem._itype = ITYPE_NONE;
@ -547,7 +543,7 @@ BOOL S_StartSPBuy()
int i;
storenumh = 0;
for (i = 0; i < 6; i++) {
for (i = 0; i < SMITH_PREMIUM_ITEMS; i++) {
if (premiumitem[i]._itype != ITYPE_NONE)
storenumh++;
}

6
Source/stores.h
Unescape View File

@ -17,11 +17,7 @@ extern ItemStruct premiumitem[SMITH_PREMIUM_ITEMS];
extern BYTE *pSTextBoxCels;
extern int premiumlevel;
extern int talker;
#ifdef HELLFIRE
extern ItemStruct witchitem[25];
#else
extern ItemStruct witchitem[20];
#endif
extern ItemStruct witchitem[WITCH_ITEMS];
extern int numpremium;
extern ItemStruct healitem[20];
extern ItemStruct golditem;

Write Preview
Loading…
Cancel
Save