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/520/head
Anders Jenbo 6 years ago
parent
96be58f870 edb2f774d4
commit
da03bae69d
23 changed files with 183 additions and 183 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. 30
      Source/automap.cpp
  2. 12
      Source/control.cpp
  3. 20
      Source/diablo.cpp
  4. 4
      Source/effects.cpp
  5. 2
      Source/engine.cpp
  6. 4
      Source/help.cpp
  7. 12
      Source/inv.cpp
  8. 28
      Source/items.cpp
  9. 4
      Source/lighting.cpp
  10. 2
      Source/loadsave.cpp
  11. 2
      Source/mainmenu.cpp
  12. 104
      Source/missiles.cpp
  13. 2
      Source/monstdat.cpp
  14. 24
      Source/monster.cpp
  15. 8
      Source/msg.cpp
  16. 2
      Source/multi.cpp
  17. 64
      Source/objects.cpp
  18. 2
      Source/palette.cpp
  19. 2
      Source/player.cpp
  20. 4
      Source/scrollrt.cpp
  21. 12
      Source/stores.cpp
  22. 4
      Source/themes.cpp
  23. 18
      Source/trigs.cpp

30
Source/automap.cpp
Unescape View File

@ -588,52 +588,52 @@ void SetAutomapView(int x, int y)
case 2:
if (solid) {
if (GetAutomapType(xx, yy + 1, FALSE) == 0x4007)
automapview[xx][yy + 1] = 1;
automapview[xx][yy + 1] = TRUE;
} else if (GetAutomapType(xx - 1, yy, FALSE) & 0x4000) {
automapview[xx - 1][yy] = 1;
automapview[xx - 1][yy] = TRUE;
}
break;
case 3:
if (solid) {
if (GetAutomapType(xx + 1, yy, FALSE) == 0x4007)
automapview[xx + 1][yy] = 1;
automapview[xx + 1][yy] = TRUE;
} else if (GetAutomapType(xx, yy - 1, FALSE) & 0x4000) {
automapview[xx][yy - 1] = 1;
automapview[xx][yy - 1] = TRUE;
}
break;
case 4:
if (solid) {
if (GetAutomapType(xx, yy + 1, FALSE) == 0x4007)
automapview[xx][yy + 1] = 1;
automapview[xx][yy + 1] = TRUE;
if (GetAutomapType(xx + 1, yy, FALSE) == 0x4007)
automapview[xx + 1][yy] = 1;
automapview[xx + 1][yy] = TRUE;
} else {
if (GetAutomapType(xx - 1, yy, FALSE) & 0x4000)
automapview[xx - 1][yy] = 1;
automapview[xx - 1][yy] = TRUE;
if (GetAutomapType(xx, yy - 1, FALSE) & 0x4000)
automapview[xx][yy - 1] = 1;
automapview[xx][yy - 1] = TRUE;
if (GetAutomapType(xx - 1, yy - 1, FALSE) & 0x4000)
automapview[xx - 1][yy - 1] = 1;
automapview[xx - 1][yy - 1] = TRUE;
}
break;
case 5:
if (solid) {
if (GetAutomapType(xx, yy - 1, FALSE) & 0x4000)
automapview[xx][yy - 1] = 1;
automapview[xx][yy - 1] = TRUE;
if (GetAutomapType(xx, yy + 1, FALSE) == 0x4007)
automapview[xx][yy + 1] = 1;
automapview[xx][yy + 1] = TRUE;
} else if (GetAutomapType(xx - 1, yy, FALSE) & 0x4000) {
automapview[xx - 1][yy] = 1;
automapview[xx - 1][yy] = TRUE;
}
break;
case 6:
if (solid) {
if (GetAutomapType(xx - 1, yy, FALSE) & 0x4000)
automapview[xx - 1][yy] = 1;
automapview[xx - 1][yy] = TRUE;
if (GetAutomapType(xx + 1, yy, FALSE) == 0x4007)
automapview[xx + 1][yy] = 1;
automapview[xx + 1][yy] = TRUE;
} else if (GetAutomapType(xx, yy - 1, FALSE) & 0x4000) {
automapview[xx][yy - 1] = 1;
automapview[xx][yy - 1] = TRUE;
}
break;
}

12
Source/control.cpp
Unescape View File

@ -759,7 +759,7 @@ void InitControlPan()
pPanelButtons = LoadFileInMem("CtrlPan\\Panel8bu.CEL", NULL);
for (i = 0; i < sizeof(panbtn) / sizeof(panbtn[0]); i++)
panbtn[i] = 0;
panbtndown = 0;
panbtndown = FALSE;
if (gbMaxPlayers == 1)
numpanbtns = 6;
else
@ -935,7 +935,7 @@ void DoAutoMap()
if (!automapflag)
StartAutomap();
else
automapflag = 0;
automapflag = FALSE;
} else {
InitDiabloMsg(EMSG_NO_AUTOMAP_IN_TOWN);
}
@ -1095,7 +1095,7 @@ void CheckBtnUp()
}
break;
case PANBTN_SPELLBOOK:
invflag = 0;
invflag = FALSE;
if (dropGoldFlag) {
dropGoldFlag = FALSE;
dropGoldValue = 0;
@ -1230,7 +1230,7 @@ void control_draw_info_str()
yo = 0;
lo = 1;
if (infostr[0]) {
control_print_info_str(0, infostr, 1, pnumlines);
control_print_info_str(0, infostr, TRUE, pnumlines);
yo = 1;
lo = 0;
}
@ -1910,9 +1910,9 @@ void control_drop_gold(char vkey)
if (vkey == VK_RETURN) {
if (dropGoldValue > 0)
control_remove_gold(myplr, initialDropGoldIndex);
dropGoldFlag = 0;
dropGoldFlag = FALSE;
} else if (vkey == VK_ESCAPE) {
dropGoldFlag = 0;
dropGoldFlag = FALSE;
dropGoldValue = 0;
} else if (vkey == VK_BACK) {
input[strlen(input) - 1] = '\0';

20
Source/diablo.cpp
Unescape View File

@ -226,7 +226,7 @@ void start_game(unsigned int uMsg)
InitLevelCursor();
sgnTimeoutCurs = 0;
sgbMouseDown = 0;
track_repeat_walk(0);
track_repeat_walk(FALSE);
}
void free_game()
@ -892,7 +892,7 @@ void PressKey(int vkey)
}
if (vkey == VK_ESCAPE) {
if (!PressEscKey()) {
track_repeat_walk(0);
track_repeat_walk(FALSE);
gamemenu_previous();
}
return;
@ -924,7 +924,7 @@ void PressKey(int vkey)
ClearPanel();
AddPanelString("No help available", TRUE); /// BUGFIX: message isn't displayed
AddPanelString("while in stores", TRUE);
track_repeat_walk(0);
track_repeat_walk(FALSE);
} else {
invflag = 0;
chrflag = FALSE;
@ -935,7 +935,7 @@ void PressKey(int vkey)
sfx_stop();
}
questlog = FALSE;
automapflag = 0;
automapflag = FALSE;
msgdelay = 0;
gamemenu_off();
DisplayHelp();
@ -1044,7 +1044,7 @@ void PressKey(int vkey)
SetCursorPos(MouseX - 160, MouseY);
}
helpflag = 0;
invflag = 0;
invflag = FALSE;
chrflag = FALSE;
sbookflag = FALSE;
spselflag = 0;
@ -1053,7 +1053,7 @@ void PressKey(int vkey)
sfx_stop();
}
questlog = FALSE;
automapflag = 0;
automapflag = FALSE;
msgdelay = 0;
gamemenu_off();
doom_close();
@ -1068,7 +1068,7 @@ void diablo_pause_game()
} else {
PauseMode = 2;
FreeMonsterSnd();
track_repeat_walk(0);
track_repeat_walk(FALSE);
}
force_redraw = 255;
}
@ -1155,19 +1155,19 @@ void PressChar(int vkey)
case 'S':
case 's':
if (!stextflag) {
invflag = 0;
invflag = FALSE;
if (!spselflag) {
DoSpeedBook();
} else {
spselflag = 0;
}
track_repeat_walk(0);
track_repeat_walk(FALSE);
}
return;
case 'B':
case 'b':
if (!stextflag) {
invflag = 0;
invflag = FALSE;
sbookflag = !sbookflag;
}
return;

4
Source/effects.cpp
Unescape View File

@ -1029,7 +1029,7 @@ BOOL calc_snd_position(int x, int y, int *plVolume, int *plPan)
void PlaySFX(int psfx)
{
psfx = RndSFX(psfx);
PlaySFX_priv(&sgSFX[psfx], 0, 0, 0);
PlaySFX_priv(&sgSFX[psfx], FALSE, 0, 0);
}
void PlaySFX_priv(TSFX *pSFX, BOOL loc, int x, int y)
@ -1137,7 +1137,7 @@ void PlaySfxLoc(int psfx, int x, int y)
pSnd->start_tc = 0;
}
PlaySFX_priv(&sgSFX[psfx], 1, x, y);
PlaySFX_priv(&sgSFX[psfx], TRUE, x, y);
}
void FreeMonsterSnd()

2
Source/engine.cpp
Unescape View File

@ -1203,7 +1203,7 @@ void Cl2DrawLight(int sx, int sy, BYTE *pCelBuff, int nCel, int nWidth)
void PlayInGameMovie(char *pszMovie)
{
PaletteFadeOut(8);
play_movie(pszMovie, 0);
play_movie(pszMovie, FALSE);
ClearScreenBuffer();
force_redraw = 255;
scrollrt_draw_game_screen(1);

4
Source/help.cpp
Unescape View File

@ -452,7 +452,7 @@ void DrawHelp()
DrawSTextHelp();
DrawQTextBack();
PrintSString(0, 2, 1, "Diablo Help", COL_GOLD, 0);
PrintSString(0, 2, TRUE, "Diablo Help", COL_GOLD, 0);
DrawSLine(5);
s = gszHelpText;
@ -530,7 +530,7 @@ void DrawHelp()
}
}
PrintSString(0, 23, 1, "Press ESC to end or the arrow keys to scroll.", COL_GOLD, 0);
PrintSString(0, 23, TRUE, "Press ESC to end or the arrow keys to scroll.", COL_GOLD, 0);
}
void DrawHelpLine(int always_0, int help_line_nr, char *text, char color)

12
Source/inv.cpp
Unescape View File

@ -107,7 +107,7 @@ void InitInv()
#endif
}
invflag = 0;
invflag = FALSE;
drawsbarflag = FALSE;
}
@ -810,7 +810,7 @@ void CheckInvPaste(int pnum, int mx, int my)
}
break;
case ILOC_AMULET:
NetSendCmdChItem(0, INVLOC_AMULET);
NetSendCmdChItem(FALSE, INVLOC_AMULET);
if (plr[pnum].InvBody[INVLOC_AMULET]._itype == ITYPE_NONE)
plr[pnum].InvBody[INVLOC_AMULET] = plr[pnum].HoldItem;
else
@ -1046,7 +1046,7 @@ void CheckInvPaste(int pnum, int mx, int my)
if (plr[pnum].HoldItem._itype == 11)
plr[pnum]._pGold = CalculateGold(pnum);
}
drawsbarflag = 1;
drawsbarflag = TRUE;
break;
}
CalcPlrInv(pnum, TRUE);
@ -1606,7 +1606,7 @@ void AutoGetItem(int pnum, int ii)
}
}
plr[pnum].HoldItem = item[ii];
RespawnItem(ii, 1);
RespawnItem(ii, TRUE);
NetSendCmdPItem(TRUE, CMD_RESPAWNITEM, item[ii]._ix, item[ii]._iy);
plr[pnum].HoldItem._itype = ITYPE_NONE;
}
@ -1806,7 +1806,7 @@ int InvPutItem(int pnum, int x, int y)
item[ii] = plr[pnum].HoldItem;
item[ii]._ix = x;
item[ii]._iy = y;
RespawnItem(ii, 1);
RespawnItem(ii, TRUE);
numitems++;
SetCursor_(CURSOR_HAND);
return ii;
@ -1885,7 +1885,7 @@ int SyncPutItem(int pnum, int x, int y, int idx, WORD icreateinfo, int iseed, in
item[ii]._ix = x;
item[ii]._iy = y;
RespawnItem(ii, 1);
RespawnItem(ii, TRUE);
numitems++;
return ii;
}

28
Source/items.cpp
Unescape View File

@ -2071,7 +2071,7 @@ void SetupAllItems(int ii, int idx, int iseed, int lvl, int uper, int onlygood,
iblvl = lvl + 4;
if (iblvl != -1) {
uid = CheckUnique(ii, iblvl, uper, recreate);
if (uid == -1) {
if (uid == UITYPE_INVALID) {
GetItemBonus(ii, idx, iblvl >> 1, iblvl, onlygood);
} else {
GetUniqueItem(ii, uid);
@ -2968,30 +2968,30 @@ void DrawUniqueInfo()
if ((!chrflag && !questlog) || SCREEN_WIDTH >= SPANEL_WIDTH * 3) {
uid = curruitem._iUid;
DrawUTextBack();
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, 2, 1, UniqueItemList[uid].UIName, 3);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, 2, TRUE, UniqueItemList[uid].UIName, 3);
DrawULine(5);
PrintItemPower(UniqueItemList[uid].UIPower1, &curruitem);
y = 6 - UniqueItemList[uid].UINumPL + 8;
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y, 1, tempstr, 0);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y, TRUE, tempstr, 0);
if (UniqueItemList[uid].UINumPL > 1) {
PrintItemPower(UniqueItemList[uid].UIPower2, &curruitem);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y + 2, 1, tempstr, 0);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y + 2, TRUE, tempstr, 0);
}
if (UniqueItemList[uid].UINumPL > 2) {
PrintItemPower(UniqueItemList[uid].UIPower3, &curruitem);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y + 4, 1, tempstr, 0);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y + 4, TRUE, tempstr, 0);
}
if (UniqueItemList[uid].UINumPL > 3) {
PrintItemPower(UniqueItemList[uid].UIPower4, &curruitem);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y + 6, 1, tempstr, 0);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y + 6, TRUE, tempstr, 0);
}
if (UniqueItemList[uid].UINumPL > 4) {
PrintItemPower(UniqueItemList[uid].UIPower5, &curruitem);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y + 8, 1, tempstr, 0);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y + 8, TRUE, tempstr, 0);
}
if (UniqueItemList[uid].UINumPL > 5) {
PrintItemPower(UniqueItemList[uid].UIPower6, &curruitem);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y + 10, 1, tempstr, 0);
PrintUString(0 + RIGHT_PANEL - SPANEL_WIDTH, y + 10, TRUE, tempstr, 0);
}
}
}
@ -3451,7 +3451,7 @@ void SpawnOnePremium(int i, int plvl)
SetRndSeed(item[0]._iSeed);
itype = RndPremiumItem(plvl >> 2, plvl) - 1;
GetItemAttrs(0, itype, plvl);
GetItemBonus(0, itype, plvl >> 1, plvl, 1);
GetItemBonus(0, itype, plvl >> 1, plvl, TRUE);
} while (item[0]._iIvalue > SMITH_MAX_PREMIUM_VALUE);
premiumitem[i] = item[0];
premiumitem[i]._iCreateInfo = plvl | 0x800;
@ -3597,7 +3597,7 @@ void SpawnWitch(int lvl)
if (maxlvl == -1 && item[0]._iMiscId == IMISC_STAFF)
maxlvl = 2 * lvl;
if (maxlvl != -1)
GetItemBonus(0, idata, maxlvl >> 1, maxlvl, 1);
GetItemBonus(0, idata, maxlvl >> 1, maxlvl, TRUE);
} while (item[0]._iIvalue > 140000);
witchitem[i] = item[0];
witchitem[i]._iCreateInfo = lvl | 0x2000;
@ -3638,7 +3638,7 @@ void SpawnBoy(int lvl)
SetRndSeed(item[0]._iSeed);
itype = RndBoyItem(lvl) - 1;
GetItemAttrs(0, itype, lvl);
GetItemBonus(0, itype, lvl, 2 * lvl, 1);
GetItemBonus(0, itype, lvl, 2 * lvl, TRUE);
} while (item[0]._iIvalue > 90000);
boyitem = item[0];
boyitem._iCreateInfo = lvl | 0x1000;
@ -3800,7 +3800,7 @@ void RecreatePremiumItem(int ii, int idx, int plvl, int iseed)
SetRndSeed(iseed);
itype = RndPremiumItem(plvl >> 2, plvl) - 1;
GetItemAttrs(ii, itype, plvl);
GetItemBonus(ii, itype, plvl >> 1, plvl, 1);
GetItemBonus(ii, itype, plvl >> 1, plvl, TRUE);
item[ii]._iSeed = iseed;
item[ii]._iCreateInfo = plvl | 0x800;
@ -3814,7 +3814,7 @@ void RecreateBoyItem(int ii, int idx, int lvl, int iseed)
SetRndSeed(iseed);
itype = RndBoyItem(lvl) - 1;
GetItemAttrs(ii, itype, lvl);
GetItemBonus(ii, itype, lvl, 2 * lvl, 1);
GetItemBonus(ii, itype, lvl, 2 * lvl, TRUE);
item[ii]._iSeed = iseed;
item[ii]._iCreateInfo = lvl | 0x1000;
item[ii]._iIdentified = TRUE;
@ -3836,7 +3836,7 @@ void RecreateWitchItem(int ii, int idx, int lvl, int iseed)
if (iblvl == -1 && item[ii]._iMiscId == IMISC_STAFF)
iblvl = 2 * lvl;
if (iblvl != -1)
GetItemBonus(ii, itype, iblvl >> 1, iblvl, 1);
GetItemBonus(ii, itype, iblvl >> 1, iblvl, TRUE);
}
item[ii]._iSeed = iseed;

4
Source/lighting.cpp
Unescape View File

@ -1285,8 +1285,8 @@ void lighting_color_cycling()
tbl[0] = tbl[1];
tbl++;
}
*tbl++ = col;
tbl += 224;
*tbl = col;
tbl += 225;
}
}

2
Source/loadsave.cpp
Unescape View File

@ -1690,7 +1690,7 @@ void LoadLevel()
AutomapZoomReset();
ResyncQuests();
SyncPortals();
dolighting = 1;
dolighting = TRUE;
for (i = 0; i < MAX_PLRS; i++) {
if (plr[i].plractive && currlevel == plr[i].plrlevel)

2
Source/mainmenu.cpp
Unescape View File

@ -159,7 +159,7 @@ BOOL mainmenu_multi_player()
void mainmenu_play_intro()
{
music_stop();
play_movie("gendata\\diablo1.smk", 1);
play_movie("gendata\\diablo1.smk", TRUE);
mainmenu_refresh_music();
}
#endif

104
Source/missiles.cpp
Unescape View File

@ -821,7 +821,7 @@ BOOL PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, BOOLEA
if (plr[pnum]._pHitPoints >> 6 <= 0) {
SyncPlrKill(pnum, earflag);
} else {
StartPlrHit(pnum, dam, 0);
StartPlrHit(pnum, dam, FALSE);
}
}
}
@ -935,7 +935,7 @@ BOOL Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, B
} else {
if (pnum == myplr)
NetSendCmdDamage(TRUE, p, dam);
StartPlrHit(p, dam, 0);
StartPlrHit(p, dam, FALSE);
}
}
return TRUE;
@ -1176,7 +1176,7 @@ void InitMissiles()
if (missile[mi]._mitype == MIS_INFRA) {
src = missile[mi]._misource;
if (src == myplr)
CalcPlrItemVals(src, 1);
CalcPlrItemVals(src, TRUE);
}
}
}
@ -2092,7 +2092,7 @@ void AddIdentify(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy
if (sbookflag)
sbookflag = FALSE;
if (!invflag) {
invflag = 1;
invflag = TRUE;
if (sgbControllerActive)
FocusOnInventory();
}
@ -2193,7 +2193,7 @@ void AddRepair(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy,
if (sbookflag)
sbookflag = FALSE;
if (!invflag) {
invflag = 1;
invflag = TRUE;
if (sgbControllerActive)
FocusOnInventory();
}
@ -2209,7 +2209,7 @@ void AddRecharge(int mi, int sx, int sy, int dx, int dy, int midir, char mienemy
if (sbookflag)
sbookflag = FALSE;
if (!invflag) {
invflag = 1;
invflag = TRUE;
if (sgbControllerActive)
FocusOnInventory();
}
@ -2583,7 +2583,7 @@ void MI_LArrow(int i)
maxd = random_(68, 10) + 1 + currlevel * 2;
}
missiledata[MIS_LARROW].mResist = MISR_LIGHTNING;
CheckMissileCol(i, mind, maxd, 0, missile[i]._mix, missile[i]._miy, 1);
CheckMissileCol(i, mind, maxd, FALSE, missile[i]._mix, missile[i]._miy, TRUE);
}
if (missile[i]._mitype == MIS_FARROW) {
if (p != -1) {
@ -2594,7 +2594,7 @@ void MI_LArrow(int i)
maxd = random_(68, 10) + 1 + currlevel * 2;
}
missiledata[MIS_FARROW].mResist = MISR_FIRE;
CheckMissileCol(i, mind, maxd, 0, missile[i]._mix, missile[i]._miy, 1);
CheckMissileCol(i, mind, maxd, FALSE, missile[i]._mix, missile[i]._miy, TRUE);
}
missiledata[missile[i]._mitype].mResist = rst;
} else {
@ -2619,7 +2619,7 @@ void MI_LArrow(int i)
if (missile[i]._mix != missile[i]._misx || missile[i]._miy != missile[i]._misy) {
rst = missiledata[missile[i]._mitype].mResist;
missiledata[missile[i]._mitype].mResist = 0;
CheckMissileCol(i, mind, maxd, 0, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, mind, maxd, FALSE, missile[i]._mix, missile[i]._miy, FALSE);
missiledata[missile[i]._mitype].mResist = rst;
}
if (!missile[i]._mirange) {
@ -2670,7 +2670,7 @@ void MI_Arrow(int i)
maxd = 2 * currlevel;
}
if (missile[i]._mix != missile[i]._misx || missile[i]._miy != missile[i]._misy)
CheckMissileCol(i, mind, maxd, 0, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, mind, maxd, FALSE, missile[i]._mix, missile[i]._miy, FALSE);
if (!missile[i]._mirange)
missile[i]._miDelFlag = TRUE;
PutMissile(i);
@ -2709,7 +2709,7 @@ void MI_Firebolt(int i)
d = currlevel + random_(78, 2 * currlevel);
}
if (missile[i]._mix != missile[i]._misx || missile[i]._miy != missile[i]._misy) {
CheckMissileCol(i, d, d, 0, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, d, d, FALSE, missile[i]._mix, missile[i]._miy, FALSE);
}
if (!missile[i]._mirange) {
missile[i]._miDelFlag = TRUE;
@ -2768,7 +2768,7 @@ void MI_Lightball(int i)
missile[i]._mityoff += missile[i]._miyvel;
GetMissilePos(i);
j = missile[i]._mirange;
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 0, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, FALSE, missile[i]._mix, missile[i]._miy, FALSE);
if (missile[i]._miHitFlag == TRUE)
missile[i]._mirange = j;
obj = dObject[tx][ty];
@ -2792,7 +2792,7 @@ void mi_null_33(int i)
missile[i]._mitxoff += missile[i]._mixvel;
missile[i]._mityoff += missile[i]._miyvel;
GetMissilePos(i);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 0, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, FALSE, missile[i]._mix, missile[i]._miy, FALSE);
if (!missile[i]._mirange)
missile[i]._miDelFlag = TRUE;
PutMissile(i);
@ -2804,7 +2804,7 @@ void MI_Acidpud(int i)
missile[i]._mirange--;
range = missile[i]._mirange;
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix, missile[i]._miy, FALSE);
missile[i]._mirange = range;
if (!range) {
if (missile[i]._mimfnum) {
@ -2831,7 +2831,7 @@ void MI_Firewall(int i)
missile[i]._miAnimFrame = 13;
missile[i]._miAnimAdd = -1;
}
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix, missile[i]._miy, 1);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix, missile[i]._miy, TRUE);
if (!missile[i]._mirange) {
missile[i]._miDelFlag = TRUE;
AddUnLight(missile[i]._mlid);
@ -2871,29 +2871,29 @@ void MI_Fireball(int i)
missile[i]._mityoff += missile[i]._miyvel;
GetMissilePos(i);
if (missile[i]._mix != missile[i]._misx || missile[i]._miy != missile[i]._misy)
CheckMissileCol(i, dam, dam, 0, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, dam, dam, FALSE, missile[i]._mix, missile[i]._miy, FALSE);
if (!missile[i]._mirange) {
mx = missile[i]._mix;
my = missile[i]._miy;
ChangeLight(missile[i]._mlid, missile[i]._mix, my, missile[i]._miAnimFrame);
if (!CheckBlock(px, py, mx, my))
CheckMissileCol(i, dam, dam, 0, mx, my, 1);
CheckMissileCol(i, dam, dam, FALSE, mx, my, TRUE);
if (!CheckBlock(px, py, mx, my + 1))
CheckMissileCol(i, dam, dam, 0, mx, my + 1, 1);
CheckMissileCol(i, dam, dam, FALSE, mx, my + 1, TRUE);
if (!CheckBlock(px, py, mx, my - 1))
CheckMissileCol(i, dam, dam, 0, mx, my - 1, 1);
CheckMissileCol(i, dam, dam, FALSE, mx, my - 1, TRUE);
if (!CheckBlock(px, py, mx + 1, my))
CheckMissileCol(i, dam, dam, 0, mx + 1, my, 1);
CheckMissileCol(i, dam, dam, FALSE, mx + 1, my, TRUE);
if (!CheckBlock(px, py, mx + 1, my - 1))
CheckMissileCol(i, dam, dam, 0, mx + 1, my - 1, 1);
CheckMissileCol(i, dam, dam, FALSE, mx + 1, my - 1, TRUE);
if (!CheckBlock(px, py, mx + 1, my + 1))
CheckMissileCol(i, dam, dam, 0, mx + 1, my + 1, 1);
CheckMissileCol(i, dam, dam, FALSE, mx + 1, my + 1, TRUE);
if (!CheckBlock(px, py, mx - 1, my))
CheckMissileCol(i, dam, dam, 0, mx - 1, my, 1);
CheckMissileCol(i, dam, dam, FALSE, mx - 1, my, TRUE);
if (!CheckBlock(px, py, mx - 1, my + 1))
CheckMissileCol(i, dam, dam, 0, mx - 1, my + 1, 1);
CheckMissileCol(i, dam, dam, FALSE, mx - 1, my + 1, TRUE);
if (!CheckBlock(px, py, mx - 1, my - 1))
CheckMissileCol(i, dam, dam, 0, mx - 1, my - 1, 1);
CheckMissileCol(i, dam, dam, FALSE, mx - 1, my - 1, TRUE);
if (!TransList[dTransVal[mx][my]]
|| (missile[i]._mixvel < 0 && ((TransList[dTransVal[mx][my + 1]] && nSolidTable[dPiece[mx][my + 1]]) || (TransList[dTransVal[mx][my - 1]] && nSolidTable[dPiece[mx][my - 1]])))) {
missile[i]._mix++;
@ -3018,7 +3018,7 @@ void MI_Lightning(int i)
missile[i]._mirange--;
j = missile[i]._mirange;
if (missile[i]._mix != missile[i]._misx || missile[i]._miy != missile[i]._misy)
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix, missile[i]._miy, FALSE);
if (missile[i]._miHitFlag == TRUE)
missile[i]._mirange = j;
if (!missile[i]._mirange) {
@ -3068,12 +3068,12 @@ void MI_Flash(int i)
plr[missile[i]._misource]._pInvincible = TRUE;
}
missile[i]._mirange--;
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix - 1, missile[i]._miy, 1);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix, missile[i]._miy, 1);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix + 1, missile[i]._miy, 1);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix - 1, missile[i]._miy + 1, 1);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix, missile[i]._miy + 1, 1);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix + 1, missile[i]._miy + 1, 1);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix - 1, missile[i]._miy, TRUE);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix, missile[i]._miy, TRUE);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix + 1, missile[i]._miy, TRUE);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix - 1, missile[i]._miy + 1, TRUE);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix, missile[i]._miy + 1, TRUE);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix + 1, missile[i]._miy + 1, TRUE);
if (!missile[i]._mirange) {
missile[i]._miDelFlag = TRUE;
if (missile[i]._micaster == 0) {
@ -3091,9 +3091,9 @@ void MI_Flash2(int i)
plr[missile[i]._misource]._pInvincible = TRUE;
}
missile[i]._mirange--;
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix - 1, missile[i]._miy - 1, 1);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix, missile[i]._miy - 1, 1);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix + 1, missile[i]._miy - 1, 1);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix - 1, missile[i]._miy - 1, TRUE);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix, missile[i]._miy - 1, TRUE);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix + 1, missile[i]._miy - 1, TRUE);
if (!missile[i]._mirange) {
missile[i]._miDelFlag = TRUE;
if (missile[i]._micaster == 0) {
@ -3228,7 +3228,7 @@ void MI_Firemove(int i)
missile[i]._mityoff += missile[i]._miyvel;
GetMissilePos(i);
j = missile[i]._mirange;
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 0, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, FALSE, missile[i]._mix, missile[i]._miy, FALSE);
if (missile[i]._miHitFlag == TRUE)
missile[i]._mirange = j;
if (!missile[i]._mirange) {
@ -3386,7 +3386,7 @@ void MI_Weapexp(int i)
maxd = plr[id]._pILMaxDam;
missiledata[missile[i]._mitype].mResist = MISR_LIGHTNING;
}
CheckMissileCol(i, mind, maxd, 0, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, mind, maxd, FALSE, missile[i]._mix, missile[i]._miy, FALSE);
if (!missile[i]._miVar1) {
missile[i]._mlid = AddLight(missile[i]._mix, missile[i]._miy, 9);
} else {
@ -3502,7 +3502,7 @@ void MI_Boom(int i)
{
missile[i]._mirange--;
if (!missile[i]._miVar1)
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 0, missile[i]._mix, missile[i]._miy, 1);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, FALSE, missile[i]._mix, missile[i]._miy, TRUE);
if (missile[i]._miHitFlag == TRUE)
missile[i]._miVar1 = 1;
if (!missile[i]._mirange)
@ -3764,7 +3764,7 @@ void MI_Flame(int i)
missile[i]._mirange--;
missile[i]._miVar2--;
k = missile[i]._mirange;
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix, missile[i]._miy, FALSE);
if (missile[i]._mirange == 0 && missile[i]._miHitFlag == TRUE)
missile[i]._mirange = k;
if (!missile[i]._miVar2)
@ -3835,7 +3835,7 @@ void MI_Cbolt(int i)
missile[i]._mitxoff += missile[i]._mixvel;
missile[i]._mityoff += missile[i]._miyvel;
GetMissilePos(i);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 0, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, missile[i]._midam, missile[i]._midam, FALSE, missile[i]._mix, missile[i]._miy, FALSE);
if (missile[i]._miHitFlag == TRUE) {
missile[i]._miVar1 = 8;
missile[i]._mimfnum = 0;
@ -3865,7 +3865,7 @@ void MI_Hbolt(int i)
GetMissilePos(i);
dam = missile[i]._midam;
if (missile[i]._mix != missile[i]._misx || missile[i]._miy != missile[i]._misy) {
CheckMissileCol(i, dam, dam, 0, missile[i]._mix, missile[i]._miy, 0);
CheckMissileCol(i, dam, dam, FALSE, missile[i]._mix, missile[i]._miy, FALSE);
}
if (!missile[i]._mirange) {
missile[i]._mitxoff -= missile[i]._mixvel;
@ -3905,23 +3905,23 @@ void MI_Element(int i)
py = plr[id].WorldY;
ChangeLight(missile[i]._mlid, cx, cy, missile[i]._miAnimFrame);
if (!CheckBlock(px, py, cx, cy))
CheckMissileCol(i, dam, dam, 1, cx, cy, 1);
CheckMissileCol(i, dam, dam, TRUE, cx, cy, TRUE);
if (!CheckBlock(px, py, cx, cy + 1))
CheckMissileCol(i, dam, dam, 1, cx, cy + 1, 1);
CheckMissileCol(i, dam, dam, TRUE, cx, cy + 1, TRUE);
if (!CheckBlock(px, py, cx, cy - 1))
CheckMissileCol(i, dam, dam, 1, cx, cy - 1, 1);
CheckMissileCol(i, dam, dam, TRUE, cx, cy - 1, TRUE);
if (!CheckBlock(px, py, cx + 1, cy))
CheckMissileCol(i, dam, dam, 1, cx + 1, cy, 1); /* check x/y */
CheckMissileCol(i, dam, dam, TRUE, cx + 1, cy, TRUE); /* check x/y */
if (!CheckBlock(px, py, cx + 1, cy - 1))
CheckMissileCol(i, dam, dam, 1, cx + 1, cy - 1, 1);
CheckMissileCol(i, dam, dam, TRUE, cx + 1, cy - 1, TRUE);
if (!CheckBlock(px, py, cx + 1, cy + 1))
CheckMissileCol(i, dam, dam, 1, cx + 1, cy + 1, 1);
CheckMissileCol(i, dam, dam, TRUE, cx + 1, cy + 1, TRUE);
if (!CheckBlock(px, py, cx - 1, cy))
CheckMissileCol(i, dam, dam, 1, cx - 1, cy, 1);
CheckMissileCol(i, dam, dam, TRUE, cx - 1, cy, TRUE);
if (!CheckBlock(px, py, cx - 1, cy + 1))
CheckMissileCol(i, dam, dam, 1, cx - 1, cy + 1, 1);
CheckMissileCol(i, dam, dam, TRUE, cx - 1, cy + 1, TRUE);
if (!CheckBlock(px, py, cx - 1, cy - 1))
CheckMissileCol(i, dam, dam, 1, cx - 1, cy - 1, 1);
CheckMissileCol(i, dam, dam, TRUE, cx - 1, cy - 1, TRUE);
if (!missile[i]._mirange) {
missile[i]._miDelFlag = TRUE;
AddUnLight(missile[i]._mlid);
@ -3932,7 +3932,7 @@ void MI_Element(int i)
GetMissilePos(i);
cx = missile[i]._mix;
cy = missile[i]._miy;
CheckMissileCol(i, dam, dam, 0, cx, cy, 0);
CheckMissileCol(i, dam, dam, FALSE, cx, cy, FALSE);
if (!missile[i]._miVar3 && cx == missile[i]._miVar4 && cy == missile[i]._miVar5)
missile[i]._miVar3 = 1;
if (missile[i]._miVar3 == 1) {
@ -3984,7 +3984,7 @@ void MI_Bonespirit(int i)
GetMissilePos(i);
cx = missile[i]._mix;
cy = missile[i]._miy;
CheckMissileCol(i, dam, dam, FALSE, cx, cy, 0);
CheckMissileCol(i, dam, dam, FALSE, cx, cy, FALSE);
if (missile[i]._miVar3 == 0 && cx == missile[i]._miVar4 && cy == missile[i]._miVar5)
missile[i]._miVar3 = 1;
if (missile[i]._miVar3 == 1) {

2
Source/monstdat.cpp
Unescape View File

@ -222,7 +222,7 @@ BYTE MonstAvailTbl[] = {
2, // Storm Rider
2, // Storm Lord
2, // Maelstorm
2, // Devil Kin Brute
0, // Devil Kin Brute
2, // Winged-Demon
2, // Gargoyle
2, // Blood Claw

24
Source/monster.cpp
Unescape View File

@ -1651,7 +1651,7 @@ void MonstStartKill(int i, int pnum, BOOL sendmsg)
monster[i]._mhitpoints = 0;
SetRndSeed(monster[i]._mRndSeed);
if (QuestStatus(QTYPE_GARB) && monster[i].mName == UniqMonst[UMT_GARBUD].mName) {
CreateTypeItem(monster[i]._mx + 1, monster[i]._my + 1, TRUE, 4, FALSE, TRUE, FALSE);
CreateTypeItem(monster[i]._mx + 1, monster[i]._my + 1, TRUE, 4, 0, TRUE, FALSE);
} else if (i > 3) {
SpawnItem(i, monster[i]._mx, monster[i]._my, sendmsg);
}
@ -2151,7 +2151,7 @@ void M_TryH2HHit(int i, int pnum, int Hit, int MinDam, int MaxDam)
SyncPlrKill(pnum, 0);
return;
}
StartPlrHit(pnum, dam, 0);
StartPlrHit(pnum, dam, FALSE);
if (monster[i]._mFlags & MFLAG_KNOCKBACK) {
if (plr[pnum]._pmode != PM_GOTHIT)
StartPlrHit(pnum, 0, TRUE);
@ -2404,7 +2404,7 @@ int M_DoTalk(int i)
&& !(Monst->_mFlags & MFLAG_QUEST_COMPLETE)) {
quests[QTYPE_ZHAR]._qactive = 2;
quests[QTYPE_ZHAR]._qlog = TRUE;
CreateTypeItem(Monst->_mx + 1, Monst->_my + 1, FALSE, 0, 24, TRUE, 0);
CreateTypeItem(Monst->_mx + 1, Monst->_my + 1, FALSE, 0, 24, TRUE, FALSE);
Monst->_mFlags |= MFLAG_QUEST_COMPLETE;
}
if (Monst->mName == UniqMonst[UMT_SNOTSPIL].mName) {
@ -2539,13 +2539,13 @@ void DoEnding()
#ifndef SPAWN
if (plr[myplr]._pClass == PC_WARRIOR) {
play_movie("gendata\\DiabVic2.smk", 0);
play_movie("gendata\\DiabVic2.smk", FALSE);
} else if (plr[myplr]._pClass == PC_SORCERER) {
play_movie("gendata\\DiabVic1.smk", 0);
play_movie("gendata\\DiabVic1.smk", FALSE);
} else {
play_movie("gendata\\DiabVic3.smk", 0);
play_movie("gendata\\DiabVic3.smk", FALSE);
}
play_movie("gendata\\Diabend.smk", 0);
play_movie("gendata\\Diabend.smk", FALSE);
bMusicOn = gbMusicOn;
gbMusicOn = TRUE;
@ -2555,7 +2555,7 @@ void DoEnding()
music_start(TMUSIC_L2);
loop_movie = TRUE;
play_movie("gendata\\loopdend.smk", 1);
play_movie("gendata\\loopdend.smk", TRUE);
loop_movie = FALSE;
music_stop();
@ -5083,7 +5083,7 @@ void PrintMonstHistory(int mt)
}
}
}
pinfoflag = 1;
pinfoflag = TRUE;
}
void PrintUniqueHistory()
@ -5152,7 +5152,7 @@ void MissToMonst(int i, int x, int y)
M_TryH2HHit(m, dPlayer[oldx][oldy] - 1, 500, Monst->mMinDamage2, Monst->mMaxDamage2);
if (pnum == dPlayer[oldx][oldy] - 1 && (Monst->MType->mtype < MT_NSNAKE || Monst->MType->mtype > MT_GSNAKE)) {
if (plr[pnum]._pmode != 7 && plr[pnum]._pmode != 8)
StartPlrHit(pnum, 0, 1);
StartPlrHit(pnum, 0, TRUE);
newx = oldx + offset_x[Monst->_mdir];
newy = oldy + offset_y[Monst->_mdir];
if (PosOkPlayer(pnum, newx, newy)) {
@ -5327,7 +5327,7 @@ int M_SpawnSkel(int x, int y, int dir)
if (IsSkel(Monsters[i].mtype))
j++;
}
skel = AddMonster(x, y, dir, i - 1, 1);
skel = AddMonster(x, y, dir, i - 1, TRUE);
if (skel != -1)
M_StartSpStand(skel, dir);
@ -5422,7 +5422,7 @@ int PreSpawnSkeleton()
if (IsSkel(Monsters[i].mtype))
j++;
}
skel = AddMonster(0, 0, 0, i - 1, 0);
skel = AddMonster(0, 0, 0, i - 1, FALSE);
if (skel != -1)
M_StartStand(skel, 0);

8
Source/msg.cpp
Unescape View File

@ -579,7 +579,7 @@ void DeltaLoadLevel()
item[ii]._ix = x;
item[ii]._iy = y;
dItem[x][y] = ii + 1;
RespawnItem(ii, 0);
RespawnItem(ii, FALSE);
numitems++;
}
}
@ -1259,13 +1259,13 @@ void DeltaImportJunk(BYTE *src)
if (*src == 0xFF) {
memset(&sgJunk.portal[i], 0xFF, sizeof(DPortal));
src++;
SetPortalStats(i, 0, 0, 0, 0, 0);
SetPortalStats(i, FALSE, 0, 0, 0, 0);
} else {
memcpy(&sgJunk.portal[i], src, sizeof(DPortal));
src += sizeof(DPortal);
SetPortalStats(
i,
1,
TRUE,
sgJunk.portal[i].x,
sgJunk.portal[i].y,
sgJunk.portal[i].level,
@ -1664,7 +1664,7 @@ void delta_put_item(TCmdPItem *pI, int x, int y, BYTE bLevel)
void check_update_plr(int pnum)
{
if (gbMaxPlayers != 1 && pnum == myplr)
pfile_update(1);
pfile_update(TRUE);
}
DWORD On_SYNCPUTITEM(TCmd *pCmd, int pnum)

2
Source/multi.cpp
Unescape View File

@ -943,7 +943,7 @@ void recv_plrinfo(int pnum, TCmdPlrInfoHdr *p, BOOL recv)
sgwPackPlrOffsetTbl[pnum] = 0;
multi_player_left_msg(pnum, 0);
plr[pnum]._pGFXLoad = 0;
UnPackPlayer(&netplr[pnum], pnum, 1);
UnPackPlayer(&netplr[pnum], pnum, TRUE);
if (!recv) {
#ifdef _DEBUG

64
Source/objects.cpp
Unescape View File

@ -1531,7 +1531,7 @@ void Obj_Circle(int i)
if (quests[QTYPE_VB]._qactive == 2)
quests[QTYPE_VB]._qvar1 = 4;
AddMissile(plr[myplr].WorldX, plr[myplr].WorldY, 35, 46, plr[myplr]._pdir, MIS_RNDTELEPORT, 0, myplr, 0, 0);
track_repeat_walk(0);
track_repeat_walk(FALSE);
sgbMouseDown = 0;
ClrPlrPath(myplr);
StartStand(myplr, 0);
@ -2545,12 +2545,12 @@ void OperateChest(int pnum, int i, BOOL sendmsg)
SetRndSeed(object[i]._oRndSeed);
if (setlevel) {
for (j = 0; j < object[i]._oVar1; j++) {
CreateRndItem(object[i]._ox, object[i]._oy, TRUE, sendmsg, 0);
CreateRndItem(object[i]._ox, object[i]._oy, TRUE, sendmsg, FALSE);
}
} else {
for (j = 0; j < object[i]._oVar1; j++) {
if (object[i]._oVar2)
CreateRndItem(object[i]._ox, object[i]._oy, 0, sendmsg, 0);
CreateRndItem(object[i]._ox, object[i]._oy, FALSE, sendmsg, FALSE);
else
CreateRndUseful(pnum, object[i]._ox, object[i]._oy, sendmsg);
}
@ -2709,7 +2709,7 @@ void OperateSarc(int pnum, int i, BOOL sendmsg)
object[i]._oAnimDelay = 3;
SetRndSeed(object[i]._oRndSeed);
if (object[i]._oVar1 <= 2)
CreateRndItem(object[i]._ox, object[i]._oy, 0, sendmsg, 0);
CreateRndItem(object[i]._ox, object[i]._oy, FALSE, sendmsg, FALSE);
if (object[i]._oVar1 >= 8)
SpawnSkeleton(object[i]._oVar2, object[i]._ox, object[i]._oy);
if (pnum == myplr)
@ -3203,11 +3203,11 @@ void OperateShrine(int pnum, int i, int sType)
if (pnum != myplr)
return;
if (2 * currlevel < 7) {
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_FULLMANA, 0, 1);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_FULLHEAL, 0, 1);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_FULLMANA, FALSE, TRUE);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_FULLHEAL, FALSE, TRUE);
} else {
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_FULLREJUV, 0, 1);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_FULLREJUV, 0, 1);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_FULLREJUV, FALSE, TRUE);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_FULLREJUV, FALSE, TRUE);
}
plr[pnum]._pMana = plr[pnum]._pMaxMana;
plr[pnum]._pManaBase = plr[pnum]._pMaxManaBase;
@ -3328,7 +3328,7 @@ void OperateShrine(int pnum, int i, int sType)
for (yy = 0; yy < DMAXY; yy++) {
for (xx = 0; xx < DMAXX; xx++) {
automapview[xx][yy] = 1;
automapview[xx][yy] = TRUE;
}
}
InitDiabloMsg(EMSG_SHRINE_SECLUDED);
@ -3432,9 +3432,9 @@ void OperateSkelBook(int pnum, int i, BOOL sendmsg)
if (!deltaload) {
SetRndSeed(object[i]._oRndSeed);
if (random_(161, 5))
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, 21, sendmsg, 0);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, 21, sendmsg, FALSE);
else
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, 24, sendmsg, 0);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, 24, sendmsg, FALSE);
if (pnum == myplr)
NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i);
}
@ -3450,7 +3450,7 @@ void OperateBookCase(int pnum, int i, BOOL sendmsg)
object[i]._oSelFlag = 0;
if (!deltaload) {
SetRndSeed(object[i]._oRndSeed);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_BOOK, sendmsg, 0);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_BOOK, sendmsg, FALSE);
if (QuestStatus(QTYPE_ZHAR)
&& monster[MAX_PLRS].mName == UniqMonst[UMT_ZHAR].mName
&& monster[MAX_PLRS]._msquelch == UCHAR_MAX
@ -3472,7 +3472,7 @@ void OperateDecap(int pnum, int i, BOOL sendmsg)
object[i]._oSelFlag = 0;
if (!deltaload) {
SetRndSeed(object[i]._oRndSeed);
CreateRndItem(object[i]._ox, object[i]._oy, 0, sendmsg, 0);
CreateRndItem(object[i]._ox, object[i]._oy, FALSE, sendmsg, FALSE);
if (pnum == myplr)
NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i);
}
@ -3490,13 +3490,13 @@ void OperateArmorStand(int pnum, int i, BOOL sendmsg)
SetRndSeed(object[i]._oRndSeed);
uniqueRnd = random_(0, 2);
if (currlevel <= 5) {
CreateTypeItem(object[i]._ox, object[i]._oy, TRUE, ITYPE_LARMOR, 0, sendmsg, 0);
CreateTypeItem(object[i]._ox, object[i]._oy, TRUE, ITYPE_LARMOR, 0, sendmsg, FALSE);
} else if (currlevel >= 6 && currlevel <= 9) {
CreateTypeItem(object[i]._ox, object[i]._oy, uniqueRnd, ITYPE_MARMOR, 0, sendmsg, 0);
CreateTypeItem(object[i]._ox, object[i]._oy, uniqueRnd, ITYPE_MARMOR, 0, sendmsg, FALSE);
} else if (currlevel >= 10 && currlevel <= 12) {
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_HARMOR, 0, sendmsg, 0);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_HARMOR, 0, sendmsg, FALSE);
} else if (currlevel >= 13 && currlevel <= 16) {
CreateTypeItem(object[i]._ox, object[i]._oy, TRUE, ITYPE_HARMOR, 0, sendmsg, 0);
CreateTypeItem(object[i]._ox, object[i]._oy, TRUE, ITYPE_HARMOR, 0, sendmsg, FALSE);
}
if (pnum == myplr)
NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i);
@ -3699,9 +3699,9 @@ void OperateWeaponRack(int pnum, int i, BOOL sendmsg)
return;
if (leveltype > 1)
CreateTypeItem(object[i]._ox, object[i]._oy, TRUE, weaponType, 0, sendmsg, 0);
CreateTypeItem(object[i]._ox, object[i]._oy, TRUE, weaponType, 0, sendmsg, FALSE);
else
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, weaponType, 0, sendmsg, 0);
CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, weaponType, 0, sendmsg, FALSE);
if (pnum == myplr)
NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i);
}
@ -3872,9 +3872,9 @@ void SyncOpL1Door(int pnum, int cmd, int i)
do_sync = TRUE;
if (do_sync) {
if (object[i]._otype == OBJ_L1LDOOR)
OperateL1LDoor(-1, i, 0);
OperateL1LDoor(-1, i, FALSE);
if (object[i]._otype == OBJ_L1RDOOR)
OperateL1RDoor(-1, i, 0);
OperateL1RDoor(-1, i, FALSE);
}
}
@ -3895,9 +3895,9 @@ void SyncOpL2Door(int pnum, int cmd, int i)
do_sync = TRUE;
if (do_sync) {
if (object[i]._otype == OBJ_L2LDOOR)
OperateL2LDoor(-1, i, 0);
OperateL2LDoor(-1, i, FALSE);
if (object[i]._otype == OBJ_L2RDOOR)
OperateL2RDoor(-1, i, 0);
OperateL2RDoor(-1, i, FALSE);
}
}
@ -3918,9 +3918,9 @@ void SyncOpL3Door(int pnum, int cmd, int i)
do_sync = TRUE;
if (do_sync) {
if (object[i]._otype == OBJ_L3LDOOR)
OperateL2LDoor(-1, i, 0);
OperateL2LDoor(-1, i, FALSE);
if (object[i]._otype == OBJ_L3RDOOR)
OperateL2RDoor(-1, i, 0);
OperateL2RDoor(-1, i, FALSE);
}
}
@ -3972,11 +3972,11 @@ void SyncOpObject(int pnum, int cmd, int i)
OperateBookCase(pnum, i, FALSE);
break;
case OBJ_DECAP:
OperateDecap(pnum, i, 0);
OperateDecap(pnum, i, FALSE);
break;
case OBJ_ARMORSTAND:
case OBJ_WARARMOR:
OperateArmorStand(pnum, i, 0);
OperateArmorStand(pnum, i, FALSE);
break;
case OBJ_GOATSHRINE:
OperateGoatShrine(pnum, i, LS_GSHRINE);
@ -4081,9 +4081,9 @@ void BreakBarrel(int pnum, int i, int dam, BOOL forcebreak, int sendmsg)
for (yp = object[i]._oy - 1; yp <= object[i]._oy + 1; yp++) {
for (xp = object[i]._ox - 1; xp <= object[i]._ox + 1; xp++) {
if (dMonster[xp][yp] > 0)
MonsterTrapHit(dMonster[xp][yp] - 1, 1, 4, 0, 1, 0);
MonsterTrapHit(dMonster[xp][yp] - 1, 1, 4, 0, 1, FALSE);
if (dPlayer[xp][yp] > 0)
PlayerMHit(dPlayer[xp][yp] - 1, -1, 0, 8, 16, 1, 0, 0);
PlayerMHit(dPlayer[xp][yp] - 1, -1, 0, 8, 16, 1, FALSE, 0);
if (dObject[xp][yp] > 0) {
oi = dObject[xp][yp] - 1;
if (object[oi]._otype == OBJ_BARRELEX && object[oi]._oBreak != -1)
@ -4098,7 +4098,7 @@ void BreakBarrel(int pnum, int i, int dam, BOOL forcebreak, int sendmsg)
if (!object[i]._oVar3)
CreateRndUseful(pnum, object[i]._ox, object[i]._oy, sendmsg);
else
CreateRndItem(object[i]._ox, object[i]._oy, 0, sendmsg, 0);
CreateRndItem(object[i]._ox, object[i]._oy, FALSE, sendmsg, FALSE);
}
if (object[i]._oVar2 >= 8)
SpawnSkeleton(object[i]._oVar4, object[i]._ox, object[i]._oy);
@ -4127,7 +4127,7 @@ void BreakObject(int pnum, int oi)
break;
case OBJ_BARREL:
case OBJ_BARRELEX:
BreakBarrel(pnum, oi, objdam, 0, 1);
BreakBarrel(pnum, oi, objdam, FALSE, TRUE);
break;
}
}
@ -4135,7 +4135,7 @@ void BreakObject(int pnum, int oi)
void SyncBreakObj(int pnum, int oi)
{
if (object[oi]._otype >= OBJ_BARREL && object[oi]._otype <= OBJ_BARRELEX)
BreakBarrel(pnum, oi, 0, TRUE, 0);
BreakBarrel(pnum, oi, 0, TRUE, FALSE);
}
void SyncL1Doors(int i)

2
Source/palette.cpp
Unescape View File

@ -88,7 +88,7 @@ void LoadPalette(char *pszFileName)
assert(pszFileName);
WOpenFile(pszFileName, &pBuf, 0);
WOpenFile(pszFileName, &pBuf, FALSE);
WReadFile(pBuf, (char *)PalData, sizeof(PalData), pszFileName);
WCloseFile(pBuf);

2
Source/player.cpp
Unescape View File

@ -1145,7 +1145,7 @@ void StartWalkStand(int pnum)
plr[pnum]._pxoff = 0;
plr[pnum]._pyoff = 0;
CheckEFlag(pnum, 0);
CheckEFlag(pnum, FALSE);
if (pnum == myplr) {
ScrollInfo._sxoff = 0;

4
Source/scrollrt.cpp
Unescape View File

@ -633,7 +633,7 @@ static void scrollrt_draw_dungeon(int sx, int sy, int dx, int dy, int eflag)
}
if (MissilePreFlag) {
DrawMissile(sx, sy, dx, dy, 1);
DrawMissile(sx, sy, dx, dy, TRUE);
}
if (light_table_index < lightmax && bDead != 0) {
@ -668,7 +668,7 @@ static void scrollrt_draw_dungeon(int sx, int sy, int dx, int dy, int eflag)
if (dMonster[sx][sy] > 0) {
DrawMonsterHelper(sx, sy, 0, dx, dy, eflag);
}
DrawMissile(sx, sy, dx, dy, 0);
DrawMissile(sx, sy, dx, dy, FALSE);
DrawObject(sx, sy, dx, dy, 0);
DrawItem(sx, sy, dx, dy, 0);

12
Source/stores.cpp
Unescape View File

@ -1410,7 +1410,7 @@ void StartStore(char s)
for (t = s;; t = STORE_SMITH) {
sbookflag = FALSE;
invflag = 0;
invflag = FALSE;
chrflag = FALSE;
questlog = FALSE;
dropGoldFlag = FALSE;
@ -1884,7 +1884,7 @@ void S_SBuyEnter()
done = FALSE;
for (i = 0; i < 40 && !done; i++) {
done = AutoPlace(myplr, i, cursW / 28, cursH / 28, 0);
done = AutoPlace(myplr, i, cursW / 28, cursH / 28, FALSE);
}
if (done)
StartStore(STORE_CONFIRM);
@ -1945,7 +1945,7 @@ void S_SPBuyEnter()
SetCursor_(plr[myplr].HoldItem._iCurs + CURSOR_FIRSTITEM);
done = FALSE;
for (i = 0; i < 40 && !done; i++) {
done = AutoPlace(myplr, i, cursW / 28, cursH / 28, 0);
done = AutoPlace(myplr, i, cursW / 28, cursH / 28, FALSE);
}
if (done)
StartStore(STORE_CONFIRM);
@ -2196,7 +2196,7 @@ void S_WBuyEnter()
done = FALSE;
for (i = 0; i < 40 && !done; i++) {
done = SpecialAutoPlace(myplr, i, cursW / 28, cursH / 28, 0);
done = SpecialAutoPlace(myplr, i, cursW / 28, cursH / 28, FALSE);
}
if (done)
@ -2363,7 +2363,7 @@ void S_BBuyEnter()
SetCursor_(plr[myplr].HoldItem._iCurs + CURSOR_FIRSTITEM);
done = FALSE;
for (i = 0; i < 40 && !done; i++) {
done = AutoPlace(myplr, i, cursW / 28, cursH / 28, 0);
done = AutoPlace(myplr, i, cursW / 28, cursH / 28, FALSE);
}
if (done)
StartStore(STORE_CONFIRM);
@ -2494,7 +2494,7 @@ void S_HBuyEnter()
done = FALSE;
i = 0;
for (i = 0; i < 40 && !done; i++) {
done = SpecialAutoPlace(myplr, i, cursW / 28, cursH / 28, 0);
done = SpecialAutoPlace(myplr, i, cursW / 28, cursH / 28, FALSE);
}
if (done)
StartStore(STORE_CONFIRM);

4
Source/themes.cpp
Unescape View File

@ -500,7 +500,7 @@ void PlaceThemeMonsts(int t, int f)
for (xp = 0; xp < MAXDUNX; xp++) {
if (dTransVal[xp][yp] == themes[t].ttval && !nSolidTable[dPiece[xp][yp]] && dItem[xp][yp] == 0 && dObject[xp][yp] == 0) {
if (random_(0, f) == 0) {
AddMonster(xp, yp, random_(0, 8), mtype, 1);
AddMonster(xp, yp, random_(0, 8), mtype, TRUE);
}
}
}
@ -858,7 +858,7 @@ void Theme_GoatShrine(int t)
for (yy = themey - 1; yy <= themey + 1; yy++) {
for (xx = themex - 1; xx <= themex + 1; xx++) {
if (dTransVal[xx][yy] == themes[t].ttval && !nSolidTable[dPiece[xx][yy]] && (xx != themex || yy != themey)) {
AddMonster(xx, yy, DIR_SW, themeVar1, 1);
AddMonster(xx, yy, DIR_SW, themeVar1, TRUE);
}
}
}

18
Source/trigs.cpp
Unescape View File

@ -91,7 +91,7 @@ int L4PentaList[33] = {
void InitNoTriggers()
{
numtrigs = 0;
trigflag = 0;
trigflag = FALSE;
}
#endif
@ -180,7 +180,7 @@ void InitL1Triggers()
}
}
}
trigflag = 0;
trigflag = FALSE;
}
#ifndef SPAWN
@ -214,7 +214,7 @@ void InitL2Triggers()
}
}
}
trigflag = 0;
trigflag = FALSE;
}
void InitL3Triggers()
@ -246,7 +246,7 @@ void InitL3Triggers()
}
}
}
trigflag = 0;
trigflag = FALSE;
}
void InitL4Triggers()
@ -290,12 +290,12 @@ void InitL4Triggers()
}
}
}
trigflag = 0;
trigflag = FALSE;
}
void InitSKingTriggers()
{
trigflag = 0;
trigflag = FALSE;
numtrigs = 1;
trigs[0]._tx = 82;
trigs[0]._ty = 42;
@ -304,7 +304,7 @@ void InitSKingTriggers()
void InitSChambTriggers()
{
trigflag = 0;
trigflag = FALSE;
numtrigs = 1;
trigs[0]._tx = 70;
trigs[0]._ty = 39;
@ -313,7 +313,7 @@ void InitSChambTriggers()
void InitPWaterTriggers()
{
trigflag = 0;
trigflag = FALSE;
numtrigs = 1;
trigs[0]._tx = 30;
trigs[0]._ty = 83;
@ -322,7 +322,7 @@ void InitPWaterTriggers()
void InitVPTriggers()
{
trigflag = 0;
trigflag = FALSE;
numtrigs = 1;
trigs[0]._tx = 35;
trigs[0]._ty = 32;

Write Preview
Loading…
Cancel
Save