diff --git a/3rdParty/Storm/Source/storm.h b/3rdParty/Storm/Source/storm.h index bb41ebd9..55792a6c 100644 --- a/3rdParty/Storm/Source/storm.h +++ b/3rdParty/Storm/Source/storm.h @@ -113,7 +113,7 @@ bool SNetDestroy(); * playerid: The player ID for the player to be dropped. * flags: * - * Returns TRUE if the function was called successfully and FALSE otherwise. + * Returns true if the function was called successfully and false otherwise. */ bool SNetDropPlayer(int playerid, DWORD flags); @@ -126,7 +126,7 @@ bool SNetDropPlayer(int playerid, DWORD flags); * dst: The destination buffer for the data. * length: The maximum size of the destination buffer. * - * Returns TRUE if the function was called successfully and FALSE otherwise. + * Returns true if the function was called successfully and false otherwise. */ bool SNetGetGameInfo(int type, void *dst, unsigned int length); @@ -137,7 +137,7 @@ bool SNetGetGameInfo(int type, void *dst, unsigned int length); * * turns: A pointer to an integer that will receive the value. * - * Returns TRUE if the function was called successfully and FALSE otherwise. + * Returns true if the function was called successfully and false otherwise. */ bool SNetGetTurnsInTransit( @@ -178,7 +178,7 @@ bool SNetJoinGame(int id, char *gameName, char *gamePassword, char *playerName, * * type: The leave type. It doesn't appear to be important, no documentation available. * - * Returns TRUE if the function was called successfully and FALSE otherwise. + * Returns true if the function was called successfully and false otherwise. */ bool SNetLeaveGame(int type); @@ -201,7 +201,7 @@ typedef void(*SEVTHANDLER)(struct _SNETEVENT *); * data: A pointer to the data. * databytes: The amount of bytes that the data pointer contains. * - * Returns TRUE if the function was called successfully and FALSE otherwise. + * Returns true if the function was called successfully and false otherwise. */ bool SNetSendMessage(int playerID, void *data, unsigned int databytes); @@ -222,7 +222,7 @@ bool SNetSendMessage(int playerID, void *data, unsigned int databytes); * data: A pointer to the data. * databytes: The amount of bytes that the data pointer contains. * - * Returns TRUE if the function was called successfully and FALSE otherwise. + * Returns true if the function was called successfully and false otherwise. */ bool SNetSendTurn(char *data, unsigned int databytes); @@ -249,7 +249,7 @@ bool WINAPI SFileCloseFile(HANDLE hFile); * pdwHeight: An optional variable that receives the image height. * pdwBpp: An optional variable that receives the image bits per pixel. * - * Returns TRUE if the image was supported and loaded correctly, FALSE otherwise. + * Returns true if the image was supported and loaded correctly, false otherwise. */ bool SBmpLoadImage( diff --git a/Source/automap.cpp b/Source/automap.cpp index c32c73c2..0b5afb34 100644 --- a/Source/automap.cpp +++ b/Source/automap.cpp @@ -382,7 +382,7 @@ WORD GetAutomapType(int x, int y, bool view) WORD rv; if (view && x == -1 && y >= 0 && y < DMAXY && automapview[0][y]) { - if (GetAutomapType(0, y, FALSE) & (MAPFLAG_DIRT << 8)) { + if (GetAutomapType(0, y, false) & (MAPFLAG_DIRT << 8)) { return 0; } else { return MAPFLAG_DIRT << 8; @@ -390,7 +390,7 @@ WORD GetAutomapType(int x, int y, bool view) } if (view && y == -1 && x >= 0 && x < DMAXY && automapview[x][0]) { - if (GetAutomapType(x, 0, FALSE) & (MAPFLAG_DIRT << 8)) { + if (GetAutomapType(x, 0, false) & (MAPFLAG_DIRT << 8)) { return 0; } else { return MAPFLAG_DIRT << 8; @@ -409,8 +409,8 @@ WORD GetAutomapType(int x, int y, bool view) rv = automaptype[(BYTE)dungeon[x][y]]; if (rv == 7) { - if ((GetAutomapType(x - 1, y, FALSE) >> 8) & MAPFLAG_HORZARCH) { - if ((GetAutomapType(x, y - 1, FALSE) >> 8) & MAPFLAG_VERTARCH) { + if ((GetAutomapType(x - 1, y, false) >> 8) & MAPFLAG_HORZARCH) { + if ((GetAutomapType(x, y - 1, false) >> 8) & MAPFLAG_VERTARCH) { rv = 1; } } @@ -468,7 +468,7 @@ Sint32 AmLine4; void InitAutomapOnce() { - automapflag = FALSE; + automapflag = false; AutoMapScale = 50; AmLine64 = 32; AmLine32 = 16; @@ -532,7 +532,7 @@ void StartAutomap() { AutoMapXOfs = 0; AutoMapYOfs = 0; - automapflag = TRUE; + automapflag = true; } void AutomapUp() @@ -653,7 +653,7 @@ void DrawAutomap(CelOutputBuffer out) int y; for (j = 0; j < cells; j++) { - WORD maptype = GetAutomapType(mapx + j, mapy - j, TRUE); + WORD maptype = GetAutomapType(mapx + j, mapy - j, true); if (maptype != 0) DrawAutomapTile(out, x, sy, maptype); x += AmLine64; @@ -662,7 +662,7 @@ void DrawAutomap(CelOutputBuffer out) x = sx - AmLine32; y = sy + AmLine16; for (j = 0; j <= cells; j++) { - WORD maptype = GetAutomapType(mapx + j, mapy - j, TRUE); + WORD maptype = GetAutomapType(mapx + j, mapy - j, true); if (maptype != 0) DrawAutomapTile(out, x, y, maptype); x += AmLine64; @@ -693,61 +693,61 @@ void SetAutomapView(Sint32 x, Sint32 y) return; } - automapview[xx][yy] = TRUE; + automapview[xx][yy] = true; - maptype = GetAutomapType(xx, yy, FALSE); + maptype = GetAutomapType(xx, yy, false); solid = maptype & 0x4000; switch (maptype & MAPFLAG_TYPE) { case 2: if (solid) { - if (GetAutomapType(xx, yy + 1, FALSE) == 0x4007) - automapview[xx][yy + 1] = TRUE; - } else if (GetAutomapType(xx - 1, yy, FALSE) & 0x4000) { - automapview[xx - 1][yy] = TRUE; + if (GetAutomapType(xx, yy + 1, false) == 0x4007) + automapview[xx][yy + 1] = true; + } else if (GetAutomapType(xx - 1, yy, false) & 0x4000) { + automapview[xx - 1][yy] = true; } break; case 3: if (solid) { - if (GetAutomapType(xx + 1, yy, FALSE) == 0x4007) - automapview[xx + 1][yy] = TRUE; - } else if (GetAutomapType(xx, yy - 1, FALSE) & 0x4000) { - automapview[xx][yy - 1] = TRUE; + if (GetAutomapType(xx + 1, yy, false) == 0x4007) + automapview[xx + 1][yy] = true; + } else if (GetAutomapType(xx, yy - 1, false) & 0x4000) { + automapview[xx][yy - 1] = true; } break; case 4: if (solid) { - if (GetAutomapType(xx, yy + 1, FALSE) == 0x4007) - automapview[xx][yy + 1] = TRUE; - if (GetAutomapType(xx + 1, yy, FALSE) == 0x4007) - automapview[xx + 1][yy] = TRUE; + if (GetAutomapType(xx, yy + 1, false) == 0x4007) + automapview[xx][yy + 1] = true; + if (GetAutomapType(xx + 1, yy, false) == 0x4007) + automapview[xx + 1][yy] = true; } else { - if (GetAutomapType(xx - 1, yy, FALSE) & 0x4000) - automapview[xx - 1][yy] = TRUE; - if (GetAutomapType(xx, yy - 1, FALSE) & 0x4000) - automapview[xx][yy - 1] = TRUE; - if (GetAutomapType(xx - 1, yy - 1, FALSE) & 0x4000) - automapview[xx - 1][yy - 1] = TRUE; + if (GetAutomapType(xx - 1, yy, false) & 0x4000) + automapview[xx - 1][yy] = true; + if (GetAutomapType(xx, yy - 1, false) & 0x4000) + automapview[xx][yy - 1] = true; + if (GetAutomapType(xx - 1, yy - 1, false) & 0x4000) + automapview[xx - 1][yy - 1] = true; } break; case 5: if (solid) { - if (GetAutomapType(xx, yy - 1, FALSE) & 0x4000) - automapview[xx][yy - 1] = TRUE; - if (GetAutomapType(xx, yy + 1, FALSE) == 0x4007) - automapview[xx][yy + 1] = TRUE; - } else if (GetAutomapType(xx - 1, yy, FALSE) & 0x4000) { - automapview[xx - 1][yy] = TRUE; + if (GetAutomapType(xx, yy - 1, false) & 0x4000) + automapview[xx][yy - 1] = true; + if (GetAutomapType(xx, yy + 1, false) == 0x4007) + automapview[xx][yy + 1] = true; + } else if (GetAutomapType(xx - 1, yy, false) & 0x4000) { + automapview[xx - 1][yy] = true; } break; case 6: if (solid) { - if (GetAutomapType(xx - 1, yy, FALSE) & 0x4000) - automapview[xx - 1][yy] = TRUE; - if (GetAutomapType(xx + 1, yy, FALSE) == 0x4007) - automapview[xx + 1][yy] = TRUE; - } else if (GetAutomapType(xx, yy - 1, FALSE) & 0x4000) { - automapview[xx][yy - 1] = TRUE; + if (GetAutomapType(xx - 1, yy, false) & 0x4000) + automapview[xx - 1][yy] = true; + if (GetAutomapType(xx + 1, yy, false) == 0x4007) + automapview[xx + 1][yy] = true; + } else if (GetAutomapType(xx, yy - 1, false) & 0x4000) { + automapview[xx][yy - 1] = true; } break; } diff --git a/Source/control.cpp b/Source/control.cpp index a23f514b..0d5734d5 100644 --- a/Source/control.cpp +++ b/Source/control.cpp @@ -199,14 +199,14 @@ char SpellITbl[] = { /** Maps from panel_button_id to the position and dimensions of a panel button. */ int PanBtnPos[8][5] = { // clang-format off - { 9, 9, 71, 19, TRUE }, // char button - { 9, 35, 71, 19, FALSE }, // quests button - { 9, 75, 71, 19, TRUE }, // map button - { 9, 101, 71, 19, FALSE }, // menu button - { 560, 9, 71, 19, TRUE }, // inv button - { 560, 35, 71, 19, FALSE }, // spells button - { 87, 91, 33, 32, TRUE }, // chat button - { 527, 91, 33, 32, TRUE }, // friendly fire button + { 9, 9, 71, 19, true }, // char button + { 9, 35, 71, 19, false }, // quests button + { 9, 75, 71, 19, true }, // map button + { 9, 101, 71, 19, false }, // menu button + { 560, 9, 71, 19, true }, // inv button + { 560, 35, 71, 19, false }, // spells button + { 87, 91, 33, 32, true }, // chat button + { 527, 91, 33, 32, true }, // friendly fire button // clang-format on }; /** Maps from panel_button_id to hotkey name. */ @@ -329,7 +329,7 @@ static void DrawSpell(CelOutputBuffer out) // BUGFIX: Move the next line into the if statement to avoid OOB (SPL_INVALID is -1) (fixed) if (st == RSPLTYPE_SPELL && spl != SPL_INVALID) { tlvl = plr[myplr]._pISplLvlAdd + plr[myplr]._pSplLvl[spl]; - if (!CheckSpell(myplr, spl, RSPLTYPE_SPELL, TRUE)) + if (!CheckSpell(myplr, spl, RSPLTYPE_SPELL, true)) st = RSPLTYPE_INVALID; if (tlvl <= 0) st = RSPLTYPE_INVALID; @@ -413,13 +413,13 @@ void DrawSpellList(CelOutputBuffer out) sprintf(infostr, "%s Spell", spelldata[pSpell].sNameText); if (pSpell == SPL_HBOLT) { sprintf(tempstr, "Damages undead only"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (s == 0) sprintf(tempstr, "Spell Level 0 - Unusable"); else sprintf(tempstr, "Spell Level %i", s); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case RSPLTYPE_SCROLL: sprintf(infostr, "Scroll of %s", spelldata[pSpell].sNameText); @@ -442,7 +442,7 @@ void DrawSpellList(CelOutputBuffer out) strcpy(tempstr, "1 Scroll"); else sprintf(tempstr, "%i Scrolls", v); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case RSPLTYPE_CHARGES: sprintf(infostr, "Staff of %s", spelldata[pSpell].sNameText); @@ -450,7 +450,7 @@ void DrawSpellList(CelOutputBuffer out) strcpy(tempstr, "1 Charge"); else sprintf(tempstr, "%i Charges", plr[myplr].InvBody[INVLOC_HAND_LEFT]._iCharges); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case RSPLTYPE_INVALID: break; @@ -459,7 +459,7 @@ void DrawSpellList(CelOutputBuffer out) if (plr[myplr]._pSplHotKey[t] == pSpell && plr[myplr]._pSplTHotKey[t] == pSplType) { DrawSpellCel(out, x, y, pSpellCels, t + SPLICONLAST + 5, SPLICONLENGTH); sprintf(tempstr, "Spell Hotkey #F%i", t + 5); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } } } @@ -480,7 +480,7 @@ void DrawSpellList(CelOutputBuffer out) void SetSpell() { - spselflag = FALSE; + spselflag = false; if (pSpell != SPL_INVALID) { ClearPanel(); plr[myplr]._pRSpell = pSpell; @@ -593,7 +593,7 @@ void AddPanelString(const char *str, bool just) void ClearPanel() { pnumlines = 0; - pinfoflag = FALSE; + pinfoflag = false; } void DrawPanelBox(CelOutputBuffer out, int x, int y, int w, int h, int sx, int sy) @@ -781,7 +781,7 @@ void InitControlPan() CelDrawUnsafeTo(pLifeBuff, 0, 87, pStatusPanel, 1, 88); CelDrawUnsafeTo(pManaBuff, 0, 87, pStatusPanel, 2, 88); MemFreeDbg(pStatusPanel); - talkflag = FALSE; + talkflag = false; if (gbIsMultiplayer) { BYTE *pTalkPanel = LoadFileInMem("CtrlPan\\TalkPanl.CEL", NULL); CelDrawUnsafeTo(pBtmBuff, 0, (PANEL_HEIGHT + 16) * 2 - 1, pTalkPanel, 1, PANEL_WIDTH); @@ -791,36 +791,36 @@ void InitControlPan() sgbPlrTalkTbl = 0; sgszTalkMsg[0] = '\0'; for (i = 0; i < MAX_PLRS; i++) - whisper[i] = TRUE; + whisper[i] = true; for (i = 0; i < sizeof(talkbtndown) / sizeof(talkbtndown[0]); i++) - talkbtndown[i] = FALSE; + talkbtndown[i] = false; } - panelflag = FALSE; - lvlbtndown = FALSE; + panelflag = false; + lvlbtndown = false; pPanelButtons = LoadFileInMem("CtrlPan\\Panel8bu.CEL", NULL); for (i = 0; i < sizeof(panbtn) / sizeof(panbtn[0]); i++) - panbtn[i] = FALSE; - panbtndown = FALSE; + panbtn[i] = false; + panbtndown = false; if (!gbIsMultiplayer) numpanbtns = 6; else numpanbtns = 8; pChrButtons = LoadFileInMem("Data\\CharBut.CEL", NULL); for (i = 0; i < sizeof(chrbtn) / sizeof(chrbtn[0]); i++) - chrbtn[i] = FALSE; - chrbtnactive = FALSE; + chrbtn[i] = false; + chrbtnactive = false; pDurIcons = LoadFileInMem("Items\\DurIcons.CEL", NULL); strcpy(infostr, ""); ClearPanel(); - drawhpflag = TRUE; - drawmanaflag = TRUE; - chrflag = FALSE; - spselflag = FALSE; + drawhpflag = true; + drawmanaflag = true; + chrflag = false; + spselflag = false; pSpellBkCel = LoadFileInMem("Data\\SpellBk.CEL", NULL); pSBkBtnCel = LoadFileInMem("Data\\SpellBkB.CEL", NULL); pSBkIconCels = LoadFileInMem("Data\\SpellI2.CEL", NULL); sbooktab = 0; - sbookflag = FALSE; + sbookflag = false; if (plr[myplr]._pClass == PC_WARRIOR) { SpellPages[0][0] = SPL_REPAIR; } else if (plr[myplr]._pClass == PC_ROGUE) { @@ -836,7 +836,7 @@ void InitControlPan() } pQLogCel = LoadFileInMem("Data\\Quest.CEL", NULL); pGBoxBuff = LoadFileInMem("CtrlPan\\Golddrop.cel", NULL); - dropGoldFlag = FALSE; + dropGoldFlag = false; dropGoldValue = 0; initialDropGoldValue = 0; initialDropGoldIndex = 0; @@ -875,7 +875,7 @@ void DoSpeedBook() { int xo, yo, X, Y, i, j; - spselflag = TRUE; + spselflag = true; xo = PANEL_X + 12 + SPLICONLENGTH * 10; yo = PANEL_Y - 17; X = xo + SPLICONLENGTH / 2; @@ -937,9 +937,9 @@ void DoPanBtn() int y = PanBtnPos[i][1] + PANEL_TOP + PanBtnPos[i][3]; if (MouseX >= PanBtnPos[i][0] + PANEL_LEFT && MouseX <= x) { if (MouseY >= PanBtnPos[i][1] + PANEL_TOP && MouseY <= y) { - panbtn[i] = TRUE; - drawbtnflag = TRUE; - panbtndown = TRUE; + panbtn[i] = true; + drawbtnflag = true; + panbtndown = true; } } } @@ -957,9 +957,9 @@ void DoPanBtn() void control_set_button_down(int btn_id) { - panbtn[btn_id] = TRUE; - drawbtnflag = TRUE; - panbtndown = TRUE; + panbtn[btn_id] = true; + drawbtnflag = true; + panbtndown = true; } void control_check_btn_press() @@ -990,7 +990,7 @@ void DoAutoMap() if (!automapflag) StartAutomap(); else - automapflag = FALSE; + automapflag = false; } else { InitDiabloMsg(EMSG_NO_AUTOMAP_IN_TOWN); } @@ -1004,7 +1004,7 @@ void CheckPanelInfo() { int i, c, s, xend, yend; - panelflag = FALSE; + panelflag = false; ClearPanel(); for (i = 0; i < numpanbtns; i++) { xend = PanBtnPos[i][0] + PANEL_LEFT + PanBtnPos[i][2]; @@ -1020,30 +1020,30 @@ void CheckPanelInfo() } if (PanBtnHotKey[i] != NULL) { sprintf(tempstr, "Hotkey: %s", PanBtnHotKey[i]); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } infoclr = COL_WHITE; - panelflag = TRUE; - pinfoflag = TRUE; + panelflag = true; + pinfoflag = true; } } if (!spselflag && MouseX >= 565 + PANEL_LEFT && MouseX < 621 + PANEL_LEFT && MouseY >= 64 + PANEL_TOP && MouseY < 120 + PANEL_TOP) { strcpy(infostr, "Select current spell button"); infoclr = COL_WHITE; - panelflag = TRUE; - pinfoflag = TRUE; + panelflag = true; + pinfoflag = true; strcpy(tempstr, "Hotkey: 's'"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); spell_id v = plr[myplr]._pRSpell; if (v != SPL_INVALID) { switch (plr[myplr]._pRSplType) { case RSPLTYPE_SKILL: sprintf(tempstr, "%s Skill", spelldata[v].sSkillText); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case RSPLTYPE_SPELL: sprintf(tempstr, "%s Spell", spelldata[v].sNameText); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); c = plr[myplr]._pISplLvlAdd + plr[myplr]._pSplLvl[v]; if (c < 0) c = 0; @@ -1051,11 +1051,11 @@ void CheckPanelInfo() sprintf(tempstr, "Spell Level 0 - Unusable"); else sprintf(tempstr, "Spell Level %i", c); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case RSPLTYPE_SCROLL: sprintf(tempstr, "Scroll of %s", spelldata[v].sNameText); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); s = 0; for (i = 0; i < plr[myplr]._pNumInv; i++) { if (!plr[myplr].InvList[i].isEmpty() @@ -1075,16 +1075,16 @@ void CheckPanelInfo() strcpy(tempstr, "1 Scroll"); else sprintf(tempstr, "%i Scrolls", s); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case RSPLTYPE_CHARGES: sprintf(tempstr, "Staff of %s", spelldata[v].sNameText); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); if (plr[myplr].InvBody[INVLOC_HAND_LEFT]._iCharges == 1) strcpy(tempstr, "1 Charge"); else sprintf(tempstr, "%i Charges", plr[myplr].InvBody[INVLOC_HAND_LEFT]._iCharges); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case RSPLTYPE_INVALID: break; @@ -1104,16 +1104,16 @@ void CheckBtnUp() int i; bool gamemenuOff; - gamemenuOff = TRUE; - drawbtnflag = TRUE; - panbtndown = FALSE; + gamemenuOff = true; + drawbtnflag = true; + panbtndown = false; for (i = 0; i < 8; i++) { if (!panbtn[i]) { continue; } - panbtn[i] = FALSE; + panbtn[i] = false; if (MouseX < PanBtnPos[i][0] + PANEL_LEFT || MouseX > PanBtnPos[i][0] + PANEL_LEFT + PanBtnPos[i][2] @@ -1124,36 +1124,36 @@ void CheckBtnUp() switch (i) { case PANBTN_CHARINFO: - questlog = FALSE; + questlog = false; chrflag = !chrflag; break; case PANBTN_QLOG: - chrflag = FALSE; + chrflag = false; if (!questlog) StartQuestlog(); else - questlog = FALSE; + questlog = false; break; case PANBTN_AUTOMAP: DoAutoMap(); break; case PANBTN_MAINMENU: - qtextflag = FALSE; + qtextflag = false; gamemenu_handle_previous(); - gamemenuOff = FALSE; + gamemenuOff = false; break; case PANBTN_INVENTORY: - sbookflag = FALSE; + sbookflag = false; invflag = !invflag; if (dropGoldFlag) { - dropGoldFlag = FALSE; + dropGoldFlag = false; dropGoldValue = 0; } break; case PANBTN_SPELLBOOK: - invflag = FALSE; + invflag = false; if (dropGoldFlag) { - dropGoldFlag = FALSE; + dropGoldFlag = false; dropGoldValue = 0; } sbookflag = !sbookflag; @@ -1205,10 +1205,10 @@ bool control_WriteStringToBuffer(BYTE *str) str++; k += fontkern[fontframe[ichar]]; if (k >= 125) - return FALSE; + return false; } - return TRUE; + return true; } static void CPrintString(CelOutputBuffer out, int y, const char *str, bool center, int lines) @@ -1220,7 +1220,7 @@ static void CPrintString(CelOutputBuffer out, int y, const char *str, bool cente lineOffset = 0; sx = 177 + PANEL_X; sy = lineOffsets[lines][y] + PANEL_Y; - if (center == TRUE) { + if (center == true) { strWidth = 0; tmp = str; while (*tmp) { @@ -1252,7 +1252,7 @@ static void PrintInfo(CelOutputBuffer out) yo = 0; lo = 1; if (infostr[0] != '\0') { - CPrintString(out, 0, infostr, TRUE, pnumlines); + CPrintString(out, 0, infostr, true, pnumlines); yo = 1; lo = 0; } @@ -1281,8 +1281,8 @@ void DrawInfoBox(CelOutputBuffer out) sprintf(infostr, "%i gold %s", nGold, get_pieces_str(nGold)); } else if (!plr[myplr].HoldItem._iStatFlag) { ClearPanel(); - AddPanelString("Requirements not met", TRUE); - pinfoflag = TRUE; + AddPanelString("Requirements not met", true); + pinfoflag = true; } else { if (plr[myplr].HoldItem._iIdentified) strcpy(infostr, plr[myplr].HoldItem._iIName); @@ -1318,9 +1318,9 @@ void DrawInfoBox(CelOutputBuffer out) strcpy(infostr, plr[pcursplr]._pName); ClearPanel(); sprintf(tempstr, "%s, Level: %i", ClassStrTbl[plr[pcursplr]._pClass], plr[pcursplr]._pLevel); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); sprintf(tempstr, "Hit Points %i of %i", plr[pcursplr]._pHitPoints >> 6, plr[pcursplr]._pMaxHP >> 6); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } } if (infostr[0] != '\0' || pnumlines != 0) @@ -1593,14 +1593,14 @@ void DrawChr(CelOutputBuffer out) void CheckLvlBtn() { if (!lvlbtndown && MouseX >= 40 + PANEL_LEFT && MouseX <= 81 + PANEL_LEFT && MouseY >= -39 + PANEL_TOP && MouseY <= -17 + PANEL_TOP) - lvlbtndown = TRUE; + lvlbtndown = true; } void ReleaseLvlBtn() { if (MouseX >= 40 + PANEL_LEFT && MouseX <= 81 + PANEL_LEFT && MouseY >= -39 + PANEL_TOP && MouseY <= -17 + PANEL_TOP) - chrflag = TRUE; - lvlbtndown = FALSE; + chrflag = true; + lvlbtndown = false; } void DrawLevelUpIcon(CelOutputBuffer out) @@ -1647,8 +1647,8 @@ void CheckChrBtns() && MouseX <= x && MouseY >= ChrBtnsRect[i].y && MouseY <= y) { - chrbtn[i] = TRUE; - chrbtnactive = TRUE; + chrbtn[i] = true; + chrbtnactive = true; } } } @@ -1665,10 +1665,10 @@ void ReleaseChrBtns(bool addAllStatPoints) { int i; - chrbtnactive = FALSE; + chrbtnactive = false; for (i = 0; i < 4; ++i) { if (chrbtn[i]) { - chrbtn[i] = FALSE; + chrbtn[i] = false; if (MouseX >= ChrBtnsRect[i].x && MouseX <= ChrBtnsRect[i].x + ChrBtnsRect[i].w && MouseY >= ChrBtnsRect[i].y @@ -1678,22 +1678,22 @@ void ReleaseChrBtns(bool addAllStatPoints) switch (i) { case 0: statPointsToAdd = CapStatPointsToAdd(statPointsToAdd, player, attribute_id::ATTRIB_STR); - NetSendCmdParam1(TRUE, CMD_ADDSTR, statPointsToAdd); + NetSendCmdParam1(true, CMD_ADDSTR, statPointsToAdd); player._pStatPts -= statPointsToAdd; break; case 1: statPointsToAdd = CapStatPointsToAdd(statPointsToAdd, player, attribute_id::ATTRIB_MAG); - NetSendCmdParam1(TRUE, CMD_ADDMAG, statPointsToAdd); + NetSendCmdParam1(true, CMD_ADDMAG, statPointsToAdd); player._pStatPts -= statPointsToAdd; break; case 2: statPointsToAdd = CapStatPointsToAdd(statPointsToAdd, player, attribute_id::ATTRIB_DEX); - NetSendCmdParam1(TRUE, CMD_ADDDEX, statPointsToAdd); + NetSendCmdParam1(true, CMD_ADDDEX, statPointsToAdd); player._pStatPts -= statPointsToAdd; break; case 3: statPointsToAdd = CapStatPointsToAdd(statPointsToAdd, player, attribute_id::ATTRIB_VIT); - NetSendCmdParam1(TRUE, CMD_ADDVIT, statPointsToAdd); + NetSendCmdParam1(true, CMD_ADDVIT, statPointsToAdd); player._pStatPts -= statPointsToAdd; break; } @@ -1837,7 +1837,7 @@ char GetSBookTrans(int ii, bool townok) st = RSPLTYPE_SKILL; } if (st == RSPLTYPE_SPELL) { - if (!CheckSpell(myplr, ii, RSPLTYPE_SPELL, TRUE)) { + if (!CheckSpell(myplr, ii, RSPLTYPE_SPELL, true)) { st = RSPLTYPE_INVALID; } if ((char)(plr[myplr]._pSplLvl[ii] + plr[myplr]._pISplLvlAdd) <= 0) { @@ -1873,15 +1873,15 @@ void DrawSpellBook(CelOutputBuffer out) for (i = 1; i < 8; i++) { sn = SpellPages[sbooktab][i - 1]; if (sn != -1 && spl & GetSpellBitmask(sn)) { - st = GetSBookTrans(sn, TRUE); + st = GetSBookTrans(sn, true); SetSpellTrans(st); DrawSpellCel(out, RIGHT_PANEL_X + 11, yp, pSBkIconCels, SpellITbl[sn], 37); if (sn == plr[myplr]._pRSpell && st == plr[myplr]._pRSplType) { SetSpellTrans(RSPLTYPE_SKILL); DrawSpellCel(out, RIGHT_PANEL_X + 11, yp, pSBkIconCels, SPLICONLAST, 37); } - PrintSBookStr(out, 10, yp - 23, FALSE, spelldata[sn].sNameText, COL_WHITE); - switch (GetSBookTrans(sn, FALSE)) { + PrintSBookStr(out, 10, yp - 23, false, spelldata[sn].sNameText, COL_WHITE); + switch (GetSBookTrans(sn, false)) { case RSPLTYPE_SKILL: strcpy(tempstr, "Skill"); break; @@ -1899,7 +1899,7 @@ void DrawSpellBook(CelOutputBuffer out) if (sn == SPL_BONESPIRIT) { sprintf(tempstr, "Mana: %i Dam: 1/3 tgt hp", mana); } - PrintSBookStr(out, 10, yp - 1, FALSE, tempstr, COL_WHITE); + PrintSBookStr(out, 10, yp - 1, false, tempstr, COL_WHITE); lvl = plr[myplr]._pSplLvl[sn] + plr[myplr]._pISplLvlAdd; if (lvl < 0) { lvl = 0; @@ -1911,7 +1911,7 @@ void DrawSpellBook(CelOutputBuffer out) } break; } - PrintSBookStr(out, 10, yp - 12, FALSE, tempstr, COL_WHITE); + PrintSBookStr(out, 10, yp - 12, false, tempstr, COL_WHITE); } yp += 43; } @@ -1982,7 +1982,7 @@ void control_drop_gold(char vkey) char input[6]; if (plr[myplr]._pHitPoints >> 6 <= 0) { - dropGoldFlag = FALSE; + dropGoldFlag = false; dropGoldValue = 0; return; } @@ -1992,9 +1992,9 @@ void control_drop_gold(char vkey) if (vkey == DVL_VK_RETURN) { if (dropGoldValue > 0) control_remove_gold(myplr, initialDropGoldIndex); - dropGoldFlag = FALSE; + dropGoldFlag = false; } else if (vkey == DVL_VK_ESCAPE) { - dropGoldFlag = FALSE; + dropGoldFlag = false; dropGoldValue = 0; } else if (vkey == DVL_VK_BACK) { input[strlen(input) - 1] = '\0'; @@ -2035,7 +2035,7 @@ void control_remove_gold(int pnum, int gold_index) SetPlrHandItem(&plr[pnum].HoldItem, IDI_GOLD); GetGoldSeed(pnum, &plr[pnum].HoldItem); plr[pnum].HoldItem._ivalue = dropGoldValue; - plr[pnum].HoldItem._iStatFlag = TRUE; + plr[pnum].HoldItem._iStatFlag = true; control_set_gold_curs(pnum); plr[pnum]._pGold = CalculateGold(pnum); dropGoldValue = 0; @@ -2137,24 +2137,24 @@ bool control_check_talk_btn() int i; if (!talkflag) - return FALSE; + return false; if (MouseX < 172 + PANEL_LEFT) - return FALSE; + return false; if (MouseY < 69 + PANEL_TOP) - return FALSE; + return false; if (MouseX > 233 + PANEL_LEFT) - return FALSE; + return false; if (MouseY > 123 + PANEL_TOP) - return FALSE; + return false; for (i = 0; i < sizeof(talkbtndown) / sizeof(talkbtndown[0]); i++) { - talkbtndown[i] = FALSE; + talkbtndown[i] = false; } - talkbtndown[(MouseY - (69 + PANEL_TOP)) / 18] = TRUE; + talkbtndown[(MouseY - (69 + PANEL_TOP)) / 18] = true; - return TRUE; + return true; } void control_release_talk_btn() @@ -2163,7 +2163,7 @@ void control_release_talk_btn() if (talkflag) { for (i = 0; i < sizeof(talkbtndown) / sizeof(talkbtndown[0]); i++) - talkbtndown[i] = FALSE; + talkbtndown[i] = false; if (MouseX >= 172 + PANEL_LEFT && MouseY >= 69 + PANEL_TOP && MouseX <= 233 + PANEL_LEFT && MouseY <= 123 + PANEL_TOP) { off = (MouseY - (69 + PANEL_TOP)) / 18; @@ -2197,10 +2197,10 @@ void control_type_message() return; } - talkflag = TRUE; + talkflag = true; sgszTalkMsg[0] = '\0'; for (i = 0; i < 3; i++) { - talkbtndown[i] = FALSE; + talkbtndown[i] = false; } sgbPlrTalkTbl = PANEL_HEIGHT + 16; force_redraw = 255; @@ -2209,7 +2209,7 @@ void control_type_message() void control_reset_talk() { - talkflag = FALSE; + talkflag = false; sgbPlrTalkTbl = 0; force_redraw = 255; } @@ -2248,20 +2248,20 @@ bool control_talk_last_key(int vkey) int result; if (!gbIsMultiplayer) - return FALSE; + return false; if (!talkflag) - return FALSE; + return false; if ((DWORD)vkey < DVL_VK_SPACE) - return FALSE; + return false; result = strlen(sgszTalkMsg); if (result < 78) { sgszTalkMsg[result] = vkey; sgszTalkMsg[result + 1] = '\0'; } - return TRUE; + return true; } static void control_up_down(int v) @@ -2284,7 +2284,7 @@ bool control_presskeys(int vkey) if (gbIsMultiplayer) { if (!talkflag) { - ret = FALSE; + ret = false; } else { if (vkey == DVL_VK_SPACE) { } else if (vkey == DVL_VK_ESCAPE) { @@ -2300,12 +2300,12 @@ bool control_presskeys(int vkey) } else if (vkey == DVL_VK_UP) { control_up_down(-1); } else { - return FALSE; + return false; } - ret = TRUE; + ret = true; } } else { - ret = FALSE; + ret = false; } return ret; } diff --git a/Source/cursor.cpp b/Source/cursor.cpp index 59608a11..79b7288d 100644 --- a/Source/cursor.cpp +++ b/Source/cursor.cpp @@ -171,11 +171,11 @@ void CheckTown() || (cursmx == missile[mx]._mix - 2 && cursmy == missile[mx]._miy - 2) || (cursmx == missile[mx]._mix - 1 && cursmy == missile[mx]._miy - 2) || (cursmx == missile[mx]._mix && cursmy == missile[mx]._miy)) { - trigflag = TRUE; + trigflag = true; ClearPanel(); strcpy(infostr, "Town Portal"); sprintf(tempstr, "from %s", plr[missile[mx]._misource]._pName); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); cursmx = missile[mx]._mix; cursmy = missile[mx]._miy; } @@ -197,14 +197,14 @@ void CheckRportal() || cursmx == missile[mx]._mix - 2 && cursmy == missile[mx]._miy - 2 || cursmx == missile[mx]._mix - 1 && cursmy == missile[mx]._miy - 2 || cursmx == missile[mx]._mix && cursmy == missile[mx]._miy) { - trigflag = TRUE; + trigflag = true; ClearPanel(); strcpy(infostr, "Portal to"); if (!setlevel) strcpy(tempstr, "The Unholy Altar"); else strcpy(tempstr, "level 15"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); cursmx = missile[mx]._mix; cursmy = missile[mx]._miy; } @@ -321,13 +321,13 @@ void CheckCursMove() pcursobj = -1; pcursitem = -1; if (pcursinvitem != -1) { - drawsbarflag = TRUE; + drawsbarflag = true; } pcursinvitem = -1; pcursplr = -1; - uitemflag = FALSE; - panelflag = FALSE; - trigflag = FALSE; + uitemflag = false; + panelflag = false; + trigflag = false; if (plr[myplr]._pInvincible) { return; diff --git a/Source/debug.cpp b/Source/debug.cpp index cf420e8d..2b770be3 100644 --- a/Source/debug.cpp +++ b/Source/debug.cpp @@ -8,7 +8,7 @@ namespace devilution { #ifdef _DEBUG -bool update_seed_check = FALSE; +bool update_seed_check = false; #define DEBUGSEEDS 4096 int seed_index; @@ -180,11 +180,11 @@ void PrintDebugMonster(int m) sprintf(dstr, "Mode = %i, Var1 = %i", monster[m]._mmode, monster[m]._mVar1); NetSendCmdString(1 << myplr, dstr); - bActive = FALSE; + bActive = false; for (i = 0; i < nummonsters; i++) { if (monstactive[i] == m) - bActive = TRUE; + bActive = true; } sprintf(dstr, "Active List = %i, Squelch = %i", bActive, monster[m]._msquelch); diff --git a/Source/diablo.cpp b/Source/diablo.cpp index 3041f54d..4d6a3220 100644 --- a/Source/diablo.cpp +++ b/Source/diablo.cpp @@ -175,7 +175,7 @@ static void diablo_parse_flags(int argc, char **argv) } else if (strcasecmp("-j", argv[i]) == 0) { debug_mode_key_j = SDL_atoi(argv[++i]); } else if (strcasecmp("-l", argv[i]) == 0) { - setlevel = FALSE; + setlevel = false; leveldebug = true; leveltype = (dungeon_type)SDL_atoi(argv[++i]); currlevel = SDL_atoi(argv[++i]); @@ -223,9 +223,9 @@ void FreeGameMem() static void start_game(interface_mode uMsg) { - zoomflag = TRUE; + zoomflag = true; CalcViewportGeometry(); - cineflag = FALSE; + cineflag = false; InitCursor(); InitLightTable(); #ifdef _DEBUG @@ -239,7 +239,7 @@ static void start_game(interface_mode uMsg) InitLevelCursor(); sgnTimeoutCurs = CURSOR_NONE; sgbMouseDown = CLICK_NONE; - track_repeat_walk(FALSE); + track_repeat_walk(false); } static void free_game() @@ -300,28 +300,28 @@ static void run_game_loop(interface_mode uMsg) WNDPROC saveProc; MSG msg; - nthread_ignore_mutex(TRUE); + nthread_ignore_mutex(true); start_game(uMsg); assert(ghMainWnd); saveProc = SetWindowProc(GM_Game); control_update_life_mana(); run_delta_info(); - gbRunGame = TRUE; - gbProcessPlayers = TRUE; - gbRunGameResult = TRUE; + gbRunGame = true; + gbProcessPlayers = true; + gbRunGameResult = true; force_redraw = 255; DrawAndBlit(); LoadPWaterPalette(); PaletteFadeIn(8); force_redraw = 255; - gbGameLoopStartup = TRUE; - nthread_ignore_mutex(FALSE); + gbGameLoopStartup = true; + nthread_ignore_mutex(false); while (gbRunGame) { while (FetchMessage(&msg)) { if (msg.message == DVL_WM_QUIT) { - gbRunGameResult = FALSE; - gbRunGame = FALSE; + gbRunGameResult = false; + gbRunGame = false; break; } TranslateMessage(&msg); @@ -338,7 +338,7 @@ static void run_game_loop(interface_mode uMsg) diablo_color_cyc_logic(); multi_process_network_packets(); game_loop(gbGameLoopStartup); - gbGameLoopStartup = FALSE; + gbGameLoopStartup = false; DrawAndBlit(); } @@ -351,13 +351,13 @@ static void run_game_loop(interface_mode uMsg) NewCursor(CURSOR_NONE); ClearScreenBuffer(); force_redraw = 255; - scrollrt_draw_game_screen(TRUE); + scrollrt_draw_game_screen(true); saveProc = SetWindowProc(saveProc); assert(saveProc == GM_Game); free_game(); if (cineflag) { - cineflag = FALSE; + cineflag = false; DoEnding(); } } @@ -366,10 +366,10 @@ bool StartGame(bool bNewGame, bool bSinglePlayer) { bool fExitProgram; - gbSelectProvider = TRUE; + gbSelectProvider = true; do { - fExitProgram = FALSE; + fExitProgram = false; gbLoadGame = false; if (!NetInit(bSinglePlayer, &fExitProgram)) { @@ -381,7 +381,7 @@ bool StartGame(bool bNewGame, bool bSinglePlayer) // before starting the game. UiDestroy(); - gbSelectProvider = FALSE; + gbSelectProvider = false; if (bNewGame || !gbValidSaveFile) { InitLevels(); @@ -570,7 +570,7 @@ static void diablo_init() init_create_window(); was_window_init = true; - SFileEnableDirectAccess(TRUE); + SFileEnableDirectAccess(true); init_archives(); was_archives_init = true; @@ -600,14 +600,14 @@ static void diablo_splash() if (!gbShowIntro) return; - play_movie("gendata\\logo.smk", TRUE); + play_movie("gendata\\logo.smk", true); if (gbIsHellfire && sgOptions.Hellfire.bIntro) { - play_movie("gendata\\Hellfire.smk", TRUE); + play_movie("gendata\\Hellfire.smk", true); sgOptions.Hellfire.bIntro = false; } if (!gbIsHellfire && !gbIsSpawn && sgOptions.Diablo.bIntro) { - play_movie("gendata\\diablo1.smk", TRUE); + play_movie("gendata\\diablo1.smk", true); sgOptions.Diablo.bIntro = false; } @@ -659,68 +659,68 @@ static bool LeftMouseCmd(bool bShift) if (leveltype == DTYPE_TOWN) { if (pcursitem != -1 && pcurs == CURSOR_HAND) - NetSendCmdLocParam1(TRUE, invflag ? CMD_GOTOGETITEM : CMD_GOTOAGETITEM, cursmx, cursmy, pcursitem); + NetSendCmdLocParam1(true, invflag ? CMD_GOTOGETITEM : CMD_GOTOAGETITEM, cursmx, cursmy, pcursitem); if (pcursmonst != -1) - NetSendCmdLocParam1(TRUE, CMD_TALKXY, cursmx, cursmy, pcursmonst); + NetSendCmdLocParam1(true, CMD_TALKXY, cursmx, cursmy, pcursmonst); if (pcursitem == -1 && pcursmonst == -1 && pcursplr == -1) - return TRUE; + return true; } else { bNear = abs(plr[myplr]._px - cursmx) < 2 && abs(plr[myplr]._py - cursmy) < 2; if (pcursitem != -1 && pcurs == CURSOR_HAND && !bShift) { - NetSendCmdLocParam1(TRUE, invflag ? CMD_GOTOGETITEM : CMD_GOTOAGETITEM, cursmx, cursmy, pcursitem); + NetSendCmdLocParam1(true, invflag ? CMD_GOTOGETITEM : CMD_GOTOAGETITEM, cursmx, cursmy, pcursitem); } else if (pcursobj != -1 && (!bShift || (bNear && object[pcursobj]._oBreak == 1))) { - NetSendCmdLocParam1(TRUE, pcurs == CURSOR_DISARM ? CMD_DISARMXY : CMD_OPOBJXY, cursmx, cursmy, pcursobj); + NetSendCmdLocParam1(true, pcurs == CURSOR_DISARM ? CMD_DISARMXY : CMD_OPOBJXY, cursmx, cursmy, pcursobj); } else if (plr[myplr]._pwtype == WT_RANGED) { if (bShift) { - NetSendCmdLoc(TRUE, CMD_RATTACKXY, cursmx, cursmy); + NetSendCmdLoc(true, CMD_RATTACKXY, cursmx, cursmy); } else if (pcursmonst != -1) { if (CanTalkToMonst(pcursmonst)) { - NetSendCmdParam1(TRUE, CMD_ATTACKID, pcursmonst); + NetSendCmdParam1(true, CMD_ATTACKID, pcursmonst); } else { - NetSendCmdParam1(TRUE, CMD_RATTACKID, pcursmonst); + NetSendCmdParam1(true, CMD_RATTACKID, pcursmonst); } } else if (pcursplr != -1 && !gbFriendlyMode) { - NetSendCmdParam1(TRUE, CMD_RATTACKPID, pcursplr); + NetSendCmdParam1(true, CMD_RATTACKPID, pcursplr); } } else { if (bShift) { if (pcursmonst != -1) { if (CanTalkToMonst(pcursmonst)) { - NetSendCmdParam1(TRUE, CMD_ATTACKID, pcursmonst); + NetSendCmdParam1(true, CMD_ATTACKID, pcursmonst); } else { - NetSendCmdLoc(TRUE, CMD_SATTACKXY, cursmx, cursmy); + NetSendCmdLoc(true, CMD_SATTACKXY, cursmx, cursmy); } } else { - NetSendCmdLoc(TRUE, CMD_SATTACKXY, cursmx, cursmy); + NetSendCmdLoc(true, CMD_SATTACKXY, cursmx, cursmy); } } else if (pcursmonst != -1) { - NetSendCmdParam1(TRUE, CMD_ATTACKID, pcursmonst); + NetSendCmdParam1(true, CMD_ATTACKID, pcursmonst); } else if (pcursplr != -1 && !gbFriendlyMode) { - NetSendCmdParam1(TRUE, CMD_ATTACKPID, pcursplr); + NetSendCmdParam1(true, CMD_ATTACKPID, pcursplr); } } if (!bShift && pcursitem == -1 && pcursobj == -1 && pcursmonst == -1 && pcursplr == -1) - return TRUE; + return true; } - return FALSE; + return false; } bool TryIconCurs() { if (pcurs == CURSOR_RESURRECT) { - NetSendCmdParam1(TRUE, CMD_RESURRECT, pcursplr); - return TRUE; + NetSendCmdParam1(true, CMD_RESURRECT, pcursplr); + return true; } if (pcurs == CURSOR_HEALOTHER) { - NetSendCmdParam1(TRUE, CMD_HEALOTHER, pcursplr); - return TRUE; + NetSendCmdParam1(true, CMD_HEALOTHER, pcursplr); + return true; } if (pcurs == CURSOR_TELEKINESIS) { DoTelekinesis(); - return TRUE; + return true; } if (pcurs == CURSOR_IDENTIFY) { @@ -728,7 +728,7 @@ bool TryIconCurs() CheckIdentify(myplr, pcursinvitem); else NewCursor(CURSOR_HAND); - return TRUE; + return true; } if (pcurs == CURSOR_REPAIR) { @@ -736,7 +736,7 @@ bool TryIconCurs() DoRepair(myplr, pcursinvitem); else NewCursor(CURSOR_HAND); - return TRUE; + return true; } if (pcurs == CURSOR_RECHARGE) { @@ -744,7 +744,7 @@ bool TryIconCurs() DoRecharge(myplr, pcursinvitem); else NewCursor(CURSOR_HAND); - return TRUE; + return true; } if (pcurs == CURSOR_OIL) { @@ -752,60 +752,60 @@ bool TryIconCurs() DoOil(myplr, pcursinvitem); else NewCursor(CURSOR_HAND); - return TRUE; + return true; } if (pcurs == CURSOR_TELEPORT) { if (pcursmonst != -1) - NetSendCmdParam3(TRUE, CMD_TSPELLID, pcursmonst, plr[myplr]._pTSpell, GetSpellLevel(myplr, plr[myplr]._pTSpell)); + NetSendCmdParam3(true, CMD_TSPELLID, pcursmonst, plr[myplr]._pTSpell, GetSpellLevel(myplr, plr[myplr]._pTSpell)); else if (pcursplr != -1) - NetSendCmdParam3(TRUE, CMD_TSPELLPID, pcursplr, plr[myplr]._pTSpell, GetSpellLevel(myplr, plr[myplr]._pTSpell)); + NetSendCmdParam3(true, CMD_TSPELLPID, pcursplr, plr[myplr]._pTSpell, GetSpellLevel(myplr, plr[myplr]._pTSpell)); else - NetSendCmdLocParam2(TRUE, CMD_TSPELLXY, cursmx, cursmy, plr[myplr]._pTSpell, GetSpellLevel(myplr, plr[myplr]._pTSpell)); + NetSendCmdLocParam2(true, CMD_TSPELLXY, cursmx, cursmy, plr[myplr]._pTSpell, GetSpellLevel(myplr, plr[myplr]._pTSpell)); NewCursor(CURSOR_HAND); - return TRUE; + return true; } if (pcurs == CURSOR_DISARM && pcursobj == -1) { NewCursor(CURSOR_HAND); - return TRUE; + return true; } - return FALSE; + return false; } static bool LeftMouseDown(int wParam) { - if (gmenu_left_mouse(TRUE)) - return FALSE; + if (gmenu_left_mouse(true)) + return false; if (control_check_talk_btn()) - return FALSE; + return false; if (sgnTimeoutCurs != CURSOR_NONE) - return FALSE; + return false; if (deathflag) { control_check_btn_press(); - return FALSE; + return false; } if (PauseMode == 2) { - return FALSE; + return false; } if (doomflag) { doom_close(); - return FALSE; + return false; } if (spselflag) { SetSpell(); - return FALSE; + return false; } if (stextflag != STORE_NONE) { CheckStoreBtn(); - return FALSE; + return false; } bool isShiftHeld = wParam & DVL_MK_SHIFT; @@ -815,7 +815,7 @@ static bool LeftMouseDown(int wParam) if (questlog && MouseX > 32 && MouseX < 288 && MouseY > 32 && MouseY < 308) { QuestlogESC(); } else if (qtextflag) { - qtextflag = FALSE; + qtextflag = false; stream_stop(); } else if (chrflag && MouseX < SPANEL_WIDTH && MouseY < SPANEL_HEIGHT) { CheckChrBtns(); @@ -826,7 +826,7 @@ static bool LeftMouseDown(int wParam) CheckSBook(); } else if (pcurs >= CURSOR_FIRSTITEM) { if (TryInvPut()) { - NetSendCmdPItem(TRUE, CMD_PUTITEM, cursmx, cursmy); + NetSendCmdPItem(true, CMD_PUTITEM, cursmx, cursmy); NewCursor(CURSOR_HAND); } } else { @@ -844,12 +844,12 @@ static bool LeftMouseDown(int wParam) NewCursor(CURSOR_HAND); } - return FALSE; + return false; } static void LeftMouseUp(int wParam) { - gmenu_left_mouse(FALSE); + gmenu_left_mouse(false); control_release_talk_btn(); bool isShiftHeld = wParam & (DVL_MK_SHIFT | DVL_MK_LBUTTON); if (panbtndown) @@ -893,7 +893,7 @@ void diablo_pause_game() } else { PauseMode = 2; sound_stop(); - track_repeat_walk(FALSE); + track_repeat_walk(false); } force_redraw = 255; } @@ -913,9 +913,9 @@ static void diablo_hotkey_msg(DWORD dwMsg) static bool PressSysKey(int wParam) { if (gmenu_is_active() || wParam != DVL_VK_F10) - return FALSE; + return false; diablo_hotkey_msg(1); - return TRUE; + return true; } static void ReleaseKey(int vkey) @@ -933,10 +933,10 @@ static void ClosePanels() SetCursorPos(MouseX - 160, MouseY); } } - invflag = FALSE; - chrflag = FALSE; - sbookflag = FALSE; - questlog = FALSE; + invflag = false; + chrflag = false; + sbookflag = false; + questlog = false; } bool PressEscKey() @@ -949,12 +949,12 @@ bool PressEscKey() } if (helpflag) { - helpflag = FALSE; + helpflag = false; rv = true; } if (qtextflag) { - qtextflag = FALSE; + qtextflag = false; stream_stop(); rv = true; } @@ -980,7 +980,7 @@ bool PressEscKey() } if (spselflag) { - spselflag = FALSE; + spselflag = false; rv = true; } @@ -1026,7 +1026,7 @@ static void PressKey(int vkey) } if (vkey == DVL_VK_ESCAPE) { if (!PressEscKey()) { - track_repeat_walk(FALSE); + track_repeat_walk(false); gamemenu_on(); } return; @@ -1057,23 +1057,23 @@ static void PressKey(int vkey) } } else if (vkey == DVL_VK_F1) { if (helpflag) { - helpflag = FALSE; + helpflag = false; } else if (stextflag != STORE_NONE) { ClearPanel(); - AddPanelString("No help available", TRUE); /// BUGFIX: message isn't displayed - AddPanelString("while in stores", TRUE); - track_repeat_walk(FALSE); + AddPanelString("No help available", true); /// BUGFIX: message isn't displayed + AddPanelString("while in stores", true); + track_repeat_walk(false); } else { - invflag = FALSE; - chrflag = FALSE; - sbookflag = FALSE; - spselflag = FALSE; + invflag = false; + chrflag = false; + sbookflag = false; + spselflag = false; if (qtextflag && leveltype == DTYPE_TOWN) { - qtextflag = FALSE; + qtextflag = false; stream_stop(); } - questlog = FALSE; - automapflag = FALSE; + questlog = false; + automapflag = false; msgdelay = 0; gamemenu_off(); DisplayHelp(); @@ -1180,13 +1180,13 @@ static void PressKey(int vkey) DoAutoMap(); } else if (vkey == DVL_VK_SPACE) { ClosePanels(); - helpflag = FALSE; - spselflag = FALSE; + helpflag = false; + spselflag = false; if (qtextflag && leveltype == DTYPE_TOWN) { - qtextflag = FALSE; + qtextflag = false; stream_stop(); } - automapflag = FALSE; + automapflag = false; msgdelay = 0; gamemenu_off(); doom_close(); @@ -1241,7 +1241,7 @@ static void PressChar(WPARAM vkey) } } } - sbookflag = FALSE; + sbookflag = false; } return; case 'C': @@ -1259,7 +1259,7 @@ static void PressChar(WPARAM vkey) } } } - questlog = FALSE; + questlog = false; } return; case 'Q': @@ -1268,7 +1268,7 @@ static void PressChar(WPARAM vkey) if (!questlog) { StartQuestlog(); } else { - questlog = FALSE; + questlog = false; } if (!invflag && !sbookflag && PANELS_COVER) { if (!questlog) { // We closed the quest log @@ -1281,7 +1281,7 @@ static void PressChar(WPARAM vkey) } } } - chrflag = FALSE; + chrflag = false; } return; case 'Z': @@ -1292,16 +1292,16 @@ static void PressChar(WPARAM vkey) case 'S': case 's': if (stextflag == STORE_NONE) { - chrflag = FALSE; - questlog = FALSE; - invflag = FALSE; - sbookflag = FALSE; + chrflag = false; + questlog = false; + invflag = false; + sbookflag = false; if (!spselflag) { DoSpeedBook(); } else { - spselflag = FALSE; + spselflag = false; } - track_repeat_walk(FALSE); + track_repeat_walk(false); } return; case 'B': @@ -1319,7 +1319,7 @@ static void PressChar(WPARAM vkey) } } } - invflag = FALSE; + invflag = false; } return; case '+': @@ -1394,7 +1394,7 @@ static void PressChar(WPARAM vkey) case '8': #ifdef _DEBUG if (debug_mode_key_inverted_v || debug_mode_key_w) { - NetSendCmd(TRUE, CMD_CHEAT_EXPERIENCE); + NetSendCmd(true, CMD_CHEAT_EXPERIENCE); return; } #endif @@ -1444,10 +1444,10 @@ static void PressChar(WPARAM vkey) } return; case 'D': - PrintDebugPlayer(TRUE); + PrintDebugPlayer(true); return; case 'd': - PrintDebugPlayer(FALSE); + PrintDebugPlayer(false); return; case 'L': case 'l': @@ -1552,8 +1552,8 @@ void GM_Game(UINT uMsg, WPARAM wParam, LPARAM lParam) break; case DVL_WM_SYSCOMMAND: if (wParam == DVL_SC_CLOSE) { - gbRunGame = FALSE; - gbRunGameResult = FALSE; + gbRunGame = false; + gbRunGameResult = false; return; } break; @@ -1573,7 +1573,7 @@ void GM_Game(UINT uMsg, WPARAM wParam, LPARAM lParam) if (sgbMouseDown == CLICK_LEFT) { sgbMouseDown = CLICK_NONE; LeftMouseUp(wParam); - track_repeat_walk(FALSE); + track_repeat_walk(false); } return; case DVL_WM_RBUTTONDOWN: @@ -1591,7 +1591,7 @@ void GM_Game(UINT uMsg, WPARAM wParam, LPARAM lParam) return; case DVL_WM_CAPTURECHANGED: sgbMouseDown = CLICK_NONE; - track_repeat_walk(FALSE); + track_repeat_walk(false); break; case WM_DIABNEXTLVL: case WM_DIABPREVLVL: @@ -1603,11 +1603,11 @@ void GM_Game(UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_DIABRETOWN: if (gbIsMultiplayer) pfile_write_hero(); - nthread_ignore_mutex(TRUE); + nthread_ignore_mutex(true); PaletteFadeOut(8); sound_stop(); music_stop(); - track_repeat_walk(FALSE); + track_repeat_walk(false); sgbMouseDown = CLICK_NONE; ShowProgress((interface_mode)uMsg); force_redraw = 255; @@ -1615,8 +1615,8 @@ void GM_Game(UINT uMsg, WPARAM wParam, LPARAM lParam) LoadPWaterPalette(); if (gbRunGame) PaletteFadeIn(8); - nthread_ignore_mutex(FALSE); - gbGameLoopStartup = TRUE; + nthread_ignore_mutex(false); + gbGameLoopStartup = true; return; } @@ -1840,7 +1840,7 @@ void LoadGameLevel(bool firstflag, int lvldir) InitMultiView(); IncProgress(); - visited = FALSE; + visited = false; int players = gbIsMultiplayer ? MAX_PLRS : 1; for (i = 0; i < players; i++) { if (plr[i].plractive) @@ -2039,12 +2039,12 @@ static void timeout_cursor(bool bTimeout) sgnTimeoutCurs = pcurs; multi_net_ping(); ClearPanel(); - AddPanelString("-- Network timeout --", TRUE); - AddPanelString("-- Waiting for players --", TRUE); + AddPanelString("-- Network timeout --", true); + AddPanelString("-- Waiting for players --", true); NewCursor(CURSOR_HOURGLASS); force_redraw = 255; } - scrollrt_draw_game_screen(TRUE); + scrollrt_draw_game_screen(true); } else if (sgnTimeoutCurs != CURSOR_NONE) { NewCursor(sgnTimeoutCurs); sgnTimeoutCurs = CURSOR_NONE; @@ -2064,10 +2064,10 @@ void game_loop(bool bStartup) while (i--) { if (!multi_handle_delta()) { - timeout_cursor(TRUE); + timeout_cursor(true); break; } else { - timeout_cursor(FALSE); + timeout_cursor(false); game_logic(); } if (!gbRunGame || !gbIsMultiplayer || !nthread_has_500ms_passed()) diff --git a/Source/doom.cpp b/Source/doom.cpp index 84ed957b..d3261239 100644 --- a/Source/doom.cpp +++ b/Source/doom.cpp @@ -54,17 +54,17 @@ static bool doom_alloc_cel() { doom_cleanup(); pDoomCel = DiabloAllocPtr(0x39000); - return pDoomCel ? TRUE : FALSE; + return pDoomCel ? true : false; } static bool doom_load_graphics() { bool ret; - ret = FALSE; + ret = false; strcpy(tempstr, "Items\\Map\\MapZtown.CEL"); if (LoadFileWithMem(tempstr, pDoomCel)) - ret = TRUE; + ret = true; return ret; } @@ -73,7 +73,7 @@ void doom_init() if (doom_alloc_cel()) { doom_quest_time = doom_get_frame_from_time() == 31 ? 31 : 0; if (doom_load_graphics()) { - doomflag = TRUE; + doomflag = true; } else { doom_close(); } @@ -82,7 +82,7 @@ void doom_init() void doom_close() { - doomflag = FALSE; + doomflag = false; doom_cleanup(); } diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp index 05059a6f..a412e8e4 100644 --- a/Source/drlg_l1.cpp +++ b/Source/drlg_l1.cpp @@ -861,14 +861,14 @@ static void DRLG_L1Shadows() for (i = 0; i < 37; i++) { if (SPATS[i].strig == sd[0][0]) { - patflag = TRUE; + patflag = true; if (SPATS[i].s1 && SPATS[i].s1 != sd[1][1]) - patflag = FALSE; + patflag = false; if (SPATS[i].s2 && SPATS[i].s2 != sd[0][1]) - patflag = FALSE; + patflag = false; if (SPATS[i].s3 && SPATS[i].s3 != sd[1][0]) - patflag = FALSE; - if (patflag == TRUE) { + patflag = false; + if (patflag == true) { if (SPATS[i].nv1 && !L5dflags[x - 1][y - 1]) dungeon[x - 1][y - 1] = SPATS[i].nv1; if (SPATS[i].nv2 && !L5dflags[x][y - 1]) @@ -951,52 +951,52 @@ static int DRLG_PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, in for (i = 0; i < numt; i++) { sx = random_(0, DMAXX - sw); sy = random_(0, DMAXY - sh); - abort = FALSE; + abort = false; found = 0; - while (abort == FALSE) { - abort = TRUE; + while (abort == false) { + abort = true; if (cx != -1 && sx >= cx - sw && sx <= cx + 12) { sx++; - abort = FALSE; + abort = false; } if (cy != -1 && sy >= cy - sh && sy <= cy + 12) { sy++; - abort = FALSE; + abort = false; } switch (noquad) { case 0: if (sx < cx && sy < cy) - abort = FALSE; + abort = false; break; case 1: if (sx > cx && sy < cy) - abort = FALSE; + abort = false; break; case 2: if (sx < cx && sy > cy) - abort = FALSE; + abort = false; break; case 3: if (sx > cx && sy > cy) - abort = FALSE; + abort = false; break; } ii = 2; - for (yy = 0; yy < sh && abort == TRUE; yy++) { - for (xx = 0; xx < sw && abort == TRUE; xx++) { + for (yy = 0; yy < sh && abort == true; yy++) { + for (xx = 0; xx < sw && abort == true; xx++) { if (miniset[ii] && dungeon[xx + sx][sy + yy] != miniset[ii]) - abort = FALSE; + abort = false; if (L5dflags[xx + sx][sy + yy]) - abort = FALSE; + abort = false; ii++; } } - if (abort == FALSE) { + if (abort == false) { if (++sx == DMAXX - sw) { sx = 0; if (++sy == DMAXY - sh) @@ -1028,7 +1028,7 @@ static int DRLG_PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, in quests[Q_PWATER]._qty = 2 * sy + 22; } - if (setview == TRUE) { + if (setview == true) { ViewX = 2 * sx + 19; ViewY = 2 * sy + 20; } @@ -1113,18 +1113,18 @@ static void DRLG_L1Pass3() static void DRLG_LoadL1SP() { - L5setloadflag = FALSE; + L5setloadflag = false; if (QuestStatus(Q_BUTCHER)) { L5pSetPiece = LoadFileInMem("Levels\\L1Data\\rnd6.DUN", NULL); - L5setloadflag = TRUE; + L5setloadflag = true; } if (QuestStatus(Q_SKELKING) && !gbIsMultiplayer) { L5pSetPiece = LoadFileInMem("Levels\\L1Data\\SKngDO.DUN", NULL); - L5setloadflag = TRUE; + L5setloadflag = true; } if (QuestStatus(Q_LTBANNER)) { L5pSetPiece = LoadFileInMem("Levels\\L1Data\\Banner2.DUN", NULL); - L5setloadflag = TRUE; + L5setloadflag = true; } } @@ -1341,13 +1341,13 @@ static bool L5checkRoom(int x, int y, int width, int height) for (j = 0; j < height; j++) { for (i = 0; i < width; i++) { if (i + x < 0 || i + x >= DMAXX || j + y < 0 || j + y >= DMAXY) - return FALSE; + return false; if (dungeon[i + x][j + y]) - return FALSE; + return false; } } - return TRUE; + return true; } static void L5roomGen(int x, int y, int w, int h, int dir) @@ -1367,17 +1367,17 @@ static void L5roomGen(int x, int y, int w, int h, int dir) cx1 = x - cw; ran = L5checkRoom(cx1 - 1, cy1 - 1, ch + 2, cw + 1); /// BUGFIX: swap args 3 and 4 ("ch+2" and "cw+1") num++; - } while (ran == FALSE && num < 20); + } while (ran == false && num < 20); - if (ran == TRUE) + if (ran == true) L5drawRoom(cx1, cy1, cw, ch); cx2 = x + w; ran2 = L5checkRoom(cx2, cy1 - 1, cw + 1, ch + 2); - if (ran2 == TRUE) + if (ran2 == true) L5drawRoom(cx2, cy1, cw, ch); - if (ran == TRUE) + if (ran == true) L5roomGen(cx1, cy1, cw, ch, 1); - if (ran2 == TRUE) + if (ran2 == true) L5roomGen(cx2, cy1, cw, ch, 1); return; } @@ -1389,17 +1389,17 @@ static void L5roomGen(int x, int y, int w, int h, int dir) ry = y - height; ran = L5checkRoom(rx - 1, ry - 1, width + 2, height + 1); num++; - } while (ran == FALSE && num < 20); + } while (ran == false && num < 20); - if (ran == TRUE) + if (ran == true) L5drawRoom(rx, ry, width, height); ry2 = y + h; ran2 = L5checkRoom(rx - 1, ry2, width + 2, height + 1); - if (ran2 == TRUE) + if (ran2 == true) L5drawRoom(rx, ry2, width, height); - if (ran == TRUE) + if (ran == true) L5roomGen(rx, ry, width, height, 0); - if (ran2 == TRUE) + if (ran2 == true) L5roomGen(rx, ry2, width, height, 0); } @@ -1559,15 +1559,15 @@ static int L5HWallOk(int i, int j) break; } - wallok = FALSE; + wallok = false; if (dungeon[i + x][j] >= 3 && dungeon[i + x][j] <= 7) - wallok = TRUE; + wallok = true; if (dungeon[i + x][j] >= 16 && dungeon[i + x][j] <= 24) - wallok = TRUE; + wallok = true; if (dungeon[i + x][j] == 22) - wallok = FALSE; + wallok = false; if (x == 1) - wallok = FALSE; + wallok = false; if (wallok) return x; @@ -1585,15 +1585,15 @@ static int L5VWallOk(int i, int j) break; } - wallok = FALSE; + wallok = false; if (dungeon[i][j + y] >= 3 && dungeon[i][j + y] <= 7) - wallok = TRUE; + wallok = true; if (dungeon[i][j + y] >= 16 && dungeon[i][j + y] <= 24) - wallok = TRUE; + wallok = true; if (dungeon[i][j + y] == 22) - wallok = FALSE; + wallok = false; if (y == 1) - wallok = FALSE; + wallok = false; if (wallok) return y; @@ -1745,7 +1745,7 @@ static void DRLG_L5GChamber(int sx, int sy, bool topflag, bool bottomflag, bool { int i, j; - if (topflag == TRUE) { + if (topflag == true) { dungeon[sx + 2][sy] = 12; dungeon[sx + 3][sy] = 12; dungeon[sx + 4][sy] = 3; @@ -1753,7 +1753,7 @@ static void DRLG_L5GChamber(int sx, int sy, bool topflag, bool bottomflag, bool dungeon[sx + 8][sy] = 12; dungeon[sx + 9][sy] = 2; } - if (bottomflag == TRUE) { + if (bottomflag == true) { sy += 11; dungeon[sx + 2][sy] = 10; dungeon[sx + 3][sy] = 12; @@ -1765,7 +1765,7 @@ static void DRLG_L5GChamber(int sx, int sy, bool topflag, bool bottomflag, bool } sy -= 11; } - if (leftflag == TRUE) { + if (leftflag == true) { dungeon[sx][sy + 2] = 11; dungeon[sx][sy + 3] = 11; dungeon[sx][sy + 4] = 3; @@ -1773,7 +1773,7 @@ static void DRLG_L5GChamber(int sx, int sy, bool topflag, bool bottomflag, bool dungeon[sx][sy + 8] = 11; dungeon[sx][sy + 9] = 1; } - if (rightflag == TRUE) { + if (rightflag == true) { sx += 11; dungeon[sx][sy + 2] = 14; dungeon[sx][sy + 3] = 11; @@ -1949,37 +1949,37 @@ void drlg_l1_crypt_rndset(const BYTE *miniset, int rndper) for (sy = 0; sy < DMAXY - sh; sy++) { for (sx = 0; sx < DMAXX - sw; sx++) { - found = TRUE; + found = true; ii = 2; - for (yy = 0; yy < sh && found == TRUE; yy++) { - for (xx = 0; xx < sw && found == TRUE; xx++) { + for (yy = 0; yy < sh && found == true; yy++) { + for (xx = 0; xx < sw && found == true; xx++) { if (miniset[ii] != 0 && dungeon[xx + sx][yy + sy] != miniset[ii]) { - found = FALSE; + found = false; } if (dflags[xx + sx][yy + sy] != 0) { - found = FALSE; + found = false; } ii++; } } kk = sw * sh + 2; - if (miniset[kk] >= 84 && miniset[kk] <= 100 && found == TRUE) { + if (miniset[kk] >= 84 && miniset[kk] <= 100 && found == true) { // BUGFIX: accesses to dungeon can go out of bounds (fixed) // BUGFIX: Comparisons vs 100 should use same tile as comparisons vs 84 (fixed) if (sx > 0 && dungeon[sx - 1][sy] >= 84 && dungeon[sx - 1][sy] <= 100) { - found = FALSE; + found = false; } if (sx < DMAXX - 1 && dungeon[sx + 1][sy] >= 84 && dungeon[sx + 1][sy] <= 100) { - found = FALSE; + found = false; } if (sy < DMAXY - 1 && dungeon[sx][sy + 1] >= 84 && dungeon[sx][sy + 1] <= 100) { - found = FALSE; + found = false; } if (sy > 0 && dungeon[sx][sy - 1] >= 84 && dungeon[sx][sy - 1] <= 100) { - found = FALSE; + found = false; } } - if (found == TRUE && random_(0, 100) < rndper) { + if (found == true && random_(0, 100) < rndper) { for (yy = 0; yy < sh; yy++) { for (xx = 0; xx < sw; xx++) { if (miniset[kk] != 0) { @@ -2540,25 +2540,25 @@ static void DRLG_L5(int entry) L5ClearFlags(); DRLG_L5FloodTVal(); - doneflag = TRUE; + doneflag = true; if (QuestStatus(Q_PWATER)) { if (entry == ENTRY_MAIN) { - if (DRLG_PlaceMiniSet(PWATERIN, 1, 1, 0, 0, TRUE, -1, 0) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(PWATERIN, 1, 1, 0, 0, true, -1, 0) < 0) + doneflag = false; } else { - if (DRLG_PlaceMiniSet(PWATERIN, 1, 1, 0, 0, FALSE, -1, 0) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(PWATERIN, 1, 1, 0, 0, false, -1, 0) < 0) + doneflag = false; ViewY--; } } if (QuestStatus(Q_LTBANNER)) { if (entry == ENTRY_MAIN) { - if (DRLG_PlaceMiniSet(STAIRSUP, 1, 1, 0, 0, TRUE, -1, 0) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(STAIRSUP, 1, 1, 0, 0, true, -1, 0) < 0) + doneflag = false; } else { - if (DRLG_PlaceMiniSet(STAIRSUP, 1, 1, 0, 0, FALSE, -1, 0) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(STAIRSUP, 1, 1, 0, 0, false, -1, 0) < 0) + doneflag = false; if (entry == ENTRY_PREV) { ViewX = 2 * setpc_x + 20; ViewY = 2 * setpc_y + 28; @@ -2569,82 +2569,82 @@ static void DRLG_L5(int entry) } else if (entry == ENTRY_MAIN) { if (currlevel < 21) { if (!plr[myplr].pOriginalCathedral) { - if (DRLG_PlaceMiniSet(STAIRSUP, 1, 1, 0, 0, TRUE, -1, 0) < 0) - doneflag = FALSE; - if (DRLG_PlaceMiniSet(STAIRSDOWN, 1, 1, 0, 0, FALSE, -1, 1) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(STAIRSUP, 1, 1, 0, 0, true, -1, 0) < 0) + doneflag = false; + if (DRLG_PlaceMiniSet(STAIRSDOWN, 1, 1, 0, 0, false, -1, 1) < 0) + doneflag = false; } else { - if (DRLG_PlaceMiniSet(L5STAIRSUP, 1, 1, 0, 0, TRUE, -1, 0) < 0) - doneflag = FALSE; - else if (DRLG_PlaceMiniSet(STAIRSDOWN, 1, 1, 0, 0, FALSE, -1, 1) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(L5STAIRSUP, 1, 1, 0, 0, true, -1, 0) < 0) + doneflag = false; + else if (DRLG_PlaceMiniSet(STAIRSDOWN, 1, 1, 0, 0, false, -1, 1) < 0) + doneflag = false; } } else if (currlevel == 21) { - if (DRLG_PlaceMiniSet(L5STAIRSTOWN, 1, 1, 0, 0, FALSE, -1, 6) < 0) - doneflag = FALSE; - if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, FALSE, -1, 1) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(L5STAIRSTOWN, 1, 1, 0, 0, false, -1, 6) < 0) + doneflag = false; + if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, false, -1, 1) < 0) + doneflag = false; ViewY++; } else { - if (DRLG_PlaceMiniSet(L5STAIRSUPHF, 1, 1, 0, 0, TRUE, -1, 0) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(L5STAIRSUPHF, 1, 1, 0, 0, true, -1, 0) < 0) + doneflag = false; if (currlevel != 24) { - if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, FALSE, -1, 1) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, false, -1, 1) < 0) + doneflag = false; } ViewY++; } } else if (!plr[myplr].pOriginalCathedral && entry == ENTRY_PREV) { if (currlevel < 21) { - if (DRLG_PlaceMiniSet(STAIRSUP, 1, 1, 0, 0, FALSE, -1, 0) < 0) - doneflag = FALSE; - if (DRLG_PlaceMiniSet(STAIRSDOWN, 1, 1, 0, 0, TRUE, -1, 1) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(STAIRSUP, 1, 1, 0, 0, false, -1, 0) < 0) + doneflag = false; + if (DRLG_PlaceMiniSet(STAIRSDOWN, 1, 1, 0, 0, true, -1, 1) < 0) + doneflag = false; ViewY--; } else if (currlevel == 21) { - if (DRLG_PlaceMiniSet(L5STAIRSTOWN, 1, 1, 0, 0, FALSE, -1, 6) < 0) - doneflag = FALSE; - if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, TRUE, -1, 1) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(L5STAIRSTOWN, 1, 1, 0, 0, false, -1, 6) < 0) + doneflag = false; + if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, true, -1, 1) < 0) + doneflag = false; ViewY += 3; } else { - if (DRLG_PlaceMiniSet(L5STAIRSUPHF, 1, 1, 0, 0, TRUE, -1, 0) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(L5STAIRSUPHF, 1, 1, 0, 0, true, -1, 0) < 0) + doneflag = false; if (currlevel != 24) { - if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, TRUE, -1, 1) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, true, -1, 1) < 0) + doneflag = false; } ViewY += 3; } } else { if (currlevel < 21) { if (!plr[myplr].pOriginalCathedral) { - if (DRLG_PlaceMiniSet(STAIRSUP, 1, 1, 0, 0, FALSE, -1, 0) < 0) - doneflag = FALSE; - if (DRLG_PlaceMiniSet(STAIRSDOWN, 1, 1, 0, 0, FALSE, -1, 1) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(STAIRSUP, 1, 1, 0, 0, false, -1, 0) < 0) + doneflag = false; + if (DRLG_PlaceMiniSet(STAIRSDOWN, 1, 1, 0, 0, false, -1, 1) < 0) + doneflag = false; } else { - if (DRLG_PlaceMiniSet(L5STAIRSUP, 1, 1, 0, 0, FALSE, -1, 0) < 0) - doneflag = FALSE; - else if (DRLG_PlaceMiniSet(STAIRSDOWN, 1, 1, 0, 0, TRUE, -1, 1) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(L5STAIRSUP, 1, 1, 0, 0, false, -1, 0) < 0) + doneflag = false; + else if (DRLG_PlaceMiniSet(STAIRSDOWN, 1, 1, 0, 0, true, -1, 1) < 0) + doneflag = false; ViewY--; } } else if (currlevel == 21) { - if (DRLG_PlaceMiniSet(L5STAIRSTOWN, 1, 1, 0, 0, TRUE, -1, 6) < 0) - doneflag = FALSE; - if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, FALSE, -1, 1) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(L5STAIRSTOWN, 1, 1, 0, 0, true, -1, 6) < 0) + doneflag = false; + if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, false, -1, 1) < 0) + doneflag = false; } else { - if (DRLG_PlaceMiniSet(L5STAIRSUPHF, 1, 1, 0, 0, TRUE, -1, 0) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(L5STAIRSUPHF, 1, 1, 0, 0, true, -1, 0) < 0) + doneflag = false; if (currlevel != 24) { - if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, FALSE, -1, 1) < 0) - doneflag = FALSE; + if (DRLG_PlaceMiniSet(L5STAIRSDOWN, 1, 1, 0, 0, false, -1, 1) < 0) + doneflag = false; } } } - } while (doneflag == FALSE); + } while (doneflag == false); for (j = 0; j < DMAXY; j++) { for (i = 0; i < DMAXX; i++) { @@ -2720,7 +2720,7 @@ static void DRLG_L5(int entry) if (currlevel < 21) { DRLG_L1Shadows(); - DRLG_PlaceMiniSet(LAMPS, 5, 10, 0, 0, FALSE, -1, 4); + DRLG_PlaceMiniSet(LAMPS, 5, 10, 0, 0, false, -1, 4); DRLG_L1Floor(); } diff --git a/Source/drlg_l2.cpp b/Source/drlg_l2.cpp index aea3a64f..38629b34 100644 --- a/Source/drlg_l2.cpp +++ b/Source/drlg_l2.cpp @@ -1620,30 +1620,30 @@ static bool DRLG_L2PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, for (i = 0; i < numt; i++) { sx = random_(0, DMAXX - sw); sy = random_(0, DMAXY - sh); - found = FALSE; + found = false; for (bailcnt = 0; !found && bailcnt < 200; bailcnt++) { - found = TRUE; + found = true; if (sx >= nSx1 && sx <= nSx2 && sy >= nSy1 && sy <= nSy2) { - found = FALSE; + found = false; } if (cx != -1 && sx >= cx - sw && sx <= cx + 12) { sx = random_(0, DMAXX - sw); sy = random_(0, DMAXY - sh); - found = FALSE; + found = false; } if (cy != -1 && sy >= cy - sh && sy <= cy + 12) { sx = random_(0, DMAXX - sw); sy = random_(0, DMAXY - sh); - found = FALSE; + found = false; } ii = 2; - for (yy = 0; yy < sh && found == TRUE; yy++) { - for (xx = 0; xx < sw && found == TRUE; xx++) { + for (yy = 0; yy < sh && found == true; yy++) { + for (xx = 0; xx < sw && found == true; xx++) { if (miniset[ii] != 0 && dungeon[xx + sx][yy + sy] != miniset[ii]) { - found = FALSE; + found = false; } if (dflags[xx + sx][yy + sy] != 0) { - found = FALSE; + found = false; } ii++; } @@ -1660,7 +1660,7 @@ static bool DRLG_L2PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, } } if (bailcnt >= 200) { - return FALSE; + return false; } ii = sw * sh + 2; for (yy = 0; yy < sh; yy++) { @@ -1673,7 +1673,7 @@ static bool DRLG_L2PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, } } - if (setview == TRUE) { + if (setview == true) { ViewX = 2 * sx + 21; ViewY = 2 * sy + 22; } @@ -1686,7 +1686,7 @@ static bool DRLG_L2PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, LvlViewY = 2 * sy + 22; } - return TRUE; + return true; } static void DRLG_L2PlaceRndSet(const BYTE *miniset, int rndper) @@ -1699,34 +1699,34 @@ static void DRLG_L2PlaceRndSet(const BYTE *miniset, int rndper) for (sy = 0; sy < DMAXY - sh; sy++) { for (sx = 0; sx < DMAXX - sw; sx++) { - found = TRUE; + found = true; ii = 2; if (sx >= nSx1 && sx <= nSx2 && sy >= nSy1 && sy <= nSy2) { - found = FALSE; + found = false; } - for (yy = 0; yy < sh && found == TRUE; yy++) { - for (xx = 0; xx < sw && found == TRUE; xx++) { + for (yy = 0; yy < sh && found == true; yy++) { + for (xx = 0; xx < sw && found == true; xx++) { if (miniset[ii] != 0 && dungeon[xx + sx][yy + sy] != miniset[ii]) { - found = FALSE; + found = false; } if (dflags[xx + sx][yy + sy] != 0) { - found = FALSE; + found = false; } ii++; } } kk = sw * sh + 2; - if (found == TRUE) { - for (yy = std::max(sy - sh, 0); yy < std::min(sy + 2 * sh, DMAXY) && found == TRUE; yy++) { + if (found == true) { + for (yy = std::max(sy - sh, 0); yy < std::min(sy + 2 * sh, DMAXY) && found == true; yy++) { for (xx = std::max(sx - sw, 0); xx < std::min(sx + 2 * sw, DMAXX); xx++) { // BUGFIX: yy and xx can go out of bounds (fixed) if (dungeon[xx][yy] == miniset[kk]) { - found = FALSE; + found = false; } } } } - if (found == TRUE && random_(0, 100) < rndper) { + if (found == true && random_(0, 100) < rndper) { for (yy = 0; yy < sh; yy++) { for (xx = 0; xx < sw; xx++) { if (miniset[kk] != 0) { @@ -1792,17 +1792,17 @@ static void DRLG_L2Shadows() sd[1][1] = BSTYPESL2[dungeon[x - 1][y - 1]]; for (i = 0; i < 2; i++) { if (SPATSL2[i].strig == sd[0][0]) { - patflag = TRUE; + patflag = true; if (SPATSL2[i].s1 != 0 && SPATSL2[i].s1 != sd[1][1]) { - patflag = FALSE; + patflag = false; } if (SPATSL2[i].s2 != 0 && SPATSL2[i].s2 != sd[0][1]) { - patflag = FALSE; + patflag = false; } if (SPATSL2[i].s3 != 0 && SPATSL2[i].s3 != sd[1][0]) { - patflag = FALSE; + patflag = false; } - if (patflag == TRUE) { + if (patflag == true) { if (SPATSL2[i].nv1 != 0) { dungeon[x - 1][y - 1] = SPATSL2[i].nv1; } @@ -1833,19 +1833,19 @@ void InitDungeon() static void DRLG_LoadL2SP() { - setloadflag = FALSE; + setloadflag = false; if (QuestStatus(Q_BLIND)) { pSetPiece = LoadFileInMem("Levels\\L2Data\\Blind1.DUN", NULL); pSetPiece[26] = 154; // Close outer wall pSetPiece[200] = 154; // Close outer wall - setloadflag = TRUE; + setloadflag = true; } else if (QuestStatus(Q_BLOOD)) { pSetPiece = LoadFileInMem("Levels\\L2Data\\Blood1.DUN", NULL); - setloadflag = TRUE; + setloadflag = true; } else if (QuestStatus(Q_SCHAMB)) { pSetPiece = LoadFileInMem("Levels\\L2Data\\Bonestr2.DUN", NULL); - setloadflag = TRUE; + setloadflag = true; } } @@ -1897,7 +1897,7 @@ static void DefineRoom(int nX1, int nY1, int nX2, int nY2, bool ForceHW) RoomList[nRoomCnt].nRoomy1 = nY1; RoomList[nRoomCnt].nRoomy2 = nY2; - if (ForceHW == TRUE) { + if (ForceHW == true) { for (i = nX1; i < nX2; i++) { /// BUGFIX: Should loop j between nY1 and nY2 instead of always using nY1. while (i < nY2) { @@ -1924,22 +1924,22 @@ static void CreateDoorType(int nX, int nY) { bool fDoneflag; - fDoneflag = FALSE; + fDoneflag = false; if (predungeon[nX - 1][nY] == 68) { - fDoneflag = TRUE; + fDoneflag = true; } if (predungeon[nX + 1][nY] == 68) { - fDoneflag = TRUE; + fDoneflag = true; } if (predungeon[nX][nY - 1] == 68) { - fDoneflag = TRUE; + fDoneflag = true; } if (predungeon[nX][nY + 1] == 68) { - fDoneflag = TRUE; + fDoneflag = true; } if (predungeon[nX][nY] == 66 || predungeon[nX][nY] == 67 || predungeon[nX][nY] == 65 || predungeon[nX][nY] == 69) { - fDoneflag = TRUE; + fDoneflag = true; } if (!fDoneflag) { @@ -2023,7 +2023,7 @@ static void CreateRoom(int nX1, int nY1, int nX2, int nY2, int nRDest, int nHDir nRh = nAh; } - if (ForceHW == TRUE) { + if (ForceHW == true) { nRw = nW; nRh = nH; } @@ -2067,7 +2067,7 @@ static void CreateRoom(int nX1, int nY1, int nX2, int nY2, int nRDest, int nHDir } DefineRoom(nRx1, nRy1, nRx2, nRy2, ForceHW); - if (ForceHW == TRUE) { + if (ForceHW == true) { nSx1 = nRx1 + 2; nSy1 = nRy1 + 2; nSx2 = nRx2; @@ -2141,7 +2141,7 @@ static void ConnectHall(int nX1, int nY1, int nX2, int nY2, int nHd) int nCurrd, nDx, nDy, nRp, nOrigX1, nOrigY1, fMinusFlag, fPlusFlag; bool fDoneflag, fInroom; - fDoneflag = FALSE; + fDoneflag = false; fMinusFlag = random_(0, 100); fPlusFlag = random_(0, 100); nOrigX1 = nX1; @@ -2152,7 +2152,7 @@ static void ConnectHall(int nX1, int nY1, int nX2, int nY2, int nHd) nX2 -= Dir_Xadd[nCurrd]; nY2 -= Dir_Yadd[nCurrd]; predungeon[nX2][nY2] = 44; - fInroom = FALSE; + fInroom = false; while (!fDoneflag) { if (nX1 >= 38 && nCurrd == 2) { @@ -2201,13 +2201,13 @@ static void ConnectHall(int nX1, int nY1, int nX2, int nY2, int nHd) } } predungeon[nX1][nY1] = 44; - fInroom = FALSE; + fInroom = false; } else { if (!fInroom && predungeon[nX1][nY1] == 35) { CreateDoorType(nX1, nY1); } if (predungeon[nX1][nY1] != 44) { - fInroom = TRUE; + fInroom = true; } } nDx = abs(nX2 - nX1); @@ -2280,7 +2280,7 @@ static void ConnectHall(int nX1, int nY1, int nX2, int nY2, int nHd) } } if (nX1 == nX2 && nY1 == nY2) { - fDoneflag = TRUE; + fDoneflag = true; } } } @@ -2384,16 +2384,16 @@ static void L2TileFix() static bool DL2_Cont(bool x1f, bool y1f, bool x2f, bool y2f) { if (x1f && x2f && y1f && y2f) { - return FALSE; + return false; } if (x1f && x2f && (y1f || y2f)) { - return TRUE; + return true; } if (y1f && y2f && (x1f || x2f)) { - return TRUE; + return true; } - return FALSE; + return false; } static int DL2_NumNoChar() @@ -2478,34 +2478,34 @@ static bool DL2_FillVoids() if (predungeon[xx][yy] != 35) { continue; } - xf1 = xf2 = yf1 = yf2 = FALSE; + xf1 = xf2 = yf1 = yf2 = false; if (predungeon[xx - 1][yy] == 32 && predungeon[xx + 1][yy] == 46) { if (predungeon[xx + 1][yy - 1] == 46 && predungeon[xx + 1][yy + 1] == 46 && predungeon[xx - 1][yy - 1] == 32 && predungeon[xx - 1][yy + 1] == 32) { - xf1 = yf1 = yf2 = TRUE; + xf1 = yf1 = yf2 = true; } } else if (predungeon[xx + 1][yy] == 32 && predungeon[xx - 1][yy] == 46) { if (predungeon[xx - 1][yy - 1] == 46 && predungeon[xx - 1][yy + 1] == 46 && predungeon[xx + 1][yy - 1] == 32 && predungeon[xx + 1][yy + 1] == 32) { - xf2 = yf1 = yf2 = TRUE; + xf2 = yf1 = yf2 = true; } } else if (predungeon[xx][yy - 1] == 32 && predungeon[xx][yy + 1] == 46) { if (predungeon[xx - 1][yy + 1] == 46 && predungeon[xx + 1][yy + 1] == 46 && predungeon[xx - 1][yy - 1] == 32 && predungeon[xx + 1][yy - 1] == 32) { - yf1 = xf1 = xf2 = TRUE; + yf1 = xf1 = xf2 = true; } } else if (predungeon[xx][yy + 1] == 32 && predungeon[xx][yy - 1] == 46) { if (predungeon[xx - 1][yy - 1] == 46 && predungeon[xx + 1][yy - 1] == 46 && predungeon[xx - 1][yy + 1] == 32 && predungeon[xx + 1][yy + 1] == 32) { - yf2 = xf1 = xf2 = TRUE; + yf2 = xf1 = xf2 = true; } } if (DL2_Cont(xf1, yf1, xf2, yf2)) { @@ -2532,14 +2532,14 @@ static bool DL2_FillVoids() if (!xf1) { while (yf1 || yf2) { if (y1 == 0) { - yf1 = FALSE; + yf1 = false; } if (y2 == DMAXY - 1) { - yf2 = FALSE; + yf2 = false; } if (y2 - y1 >= 14) { - yf1 = FALSE; - yf2 = FALSE; + yf1 = false; + yf2 = false; } if (yf1) { y1--; @@ -2548,10 +2548,10 @@ static bool DL2_FillVoids() y2++; } if (predungeon[x2][y1] != 32) { - yf1 = FALSE; + yf1 = false; } if (predungeon[x2][y2] != 32) { - yf2 = FALSE; + yf2 = false; } } y1 += 2; @@ -2559,14 +2559,14 @@ static bool DL2_FillVoids() if (y2 - y1 > 5) { while (xf2) { if (x2 == 39) { - xf2 = FALSE; + xf2 = false; } if (x2 - x1 >= 12) { - xf2 = FALSE; + xf2 = false; } for (jj = y1; jj <= y2; jj++) { if (predungeon[x2][jj] != 32) { - xf2 = FALSE; + xf2 = false; } } if (xf2) { @@ -2582,14 +2582,14 @@ static bool DL2_FillVoids() } else if (!xf2) { while (yf1 || yf2) { if (y1 == 0) { - yf1 = FALSE; + yf1 = false; } if (y2 == DMAXY - 1) { - yf2 = FALSE; + yf2 = false; } if (y2 - y1 >= 14) { - yf1 = FALSE; - yf2 = FALSE; + yf1 = false; + yf2 = false; } if (yf1) { y1--; @@ -2598,10 +2598,10 @@ static bool DL2_FillVoids() y2++; } if (predungeon[x1][y1] != 32) { - yf1 = FALSE; + yf1 = false; } if (predungeon[x1][y2] != 32) { - yf2 = FALSE; + yf2 = false; } } y1 += 2; @@ -2609,14 +2609,14 @@ static bool DL2_FillVoids() if (y2 - y1 > 5) { while (xf1) { if (x1 == 0) { - xf1 = FALSE; + xf1 = false; } if (x2 - x1 >= 12) { - xf1 = FALSE; + xf1 = false; } for (jj = y1; jj <= y2; jj++) { if (predungeon[x1][jj] != 32) { - xf1 = FALSE; + xf1 = false; } } if (xf1) { @@ -2632,14 +2632,14 @@ static bool DL2_FillVoids() } else if (!yf1) { while (xf1 || xf2) { if (x1 == 0) { - xf1 = FALSE; + xf1 = false; } if (x2 == DMAXX - 1) { - xf2 = FALSE; + xf2 = false; } if (x2 - x1 >= 14) { - xf1 = FALSE; - xf2 = FALSE; + xf1 = false; + xf2 = false; } if (xf1) { x1--; @@ -2648,10 +2648,10 @@ static bool DL2_FillVoids() x2++; } if (predungeon[x1][y2] != 32) { - xf1 = FALSE; + xf1 = false; } if (predungeon[x2][y2] != 32) { - xf2 = FALSE; + xf2 = false; } } x1 += 2; @@ -2659,14 +2659,14 @@ static bool DL2_FillVoids() if (x2 - x1 > 5) { while (yf2) { if (y2 == DMAXY - 1) { - yf2 = FALSE; + yf2 = false; } if (y2 - y1 >= 12) { - yf2 = FALSE; + yf2 = false; } for (ii = x1; ii <= x2; ii++) { if (predungeon[ii][y2] != 32) { - yf2 = FALSE; + yf2 = false; } } if (yf2) { @@ -2682,14 +2682,14 @@ static bool DL2_FillVoids() } else if (!yf2) { while (xf1 || xf2) { if (x1 == 0) { - xf1 = FALSE; + xf1 = false; } if (x2 == DMAXX - 1) { - xf2 = FALSE; + xf2 = false; } if (x2 - x1 >= 14) { - xf1 = FALSE; - xf2 = FALSE; + xf1 = false; + xf2 = false; } if (xf1) { x1--; @@ -2698,10 +2698,10 @@ static bool DL2_FillVoids() x2++; } if (predungeon[x1][y1] != 32) { - xf1 = FALSE; + xf1 = false; } if (predungeon[x2][y1] != 32) { - xf2 = FALSE; + xf2 = false; } } x1 += 2; @@ -2709,14 +2709,14 @@ static bool DL2_FillVoids() if (x2 - x1 > 5) { while (yf1) { if (y1 == 0) { - yf1 = FALSE; + yf1 = false; } if (y2 - y1 >= 12) { - yf1 = FALSE; + yf1 = false; } for (ii = x1; ii <= x2; ii++) { if (predungeon[ii][y1] != 32) { - yf1 = FALSE; + yf1 = false; } } if (yf1) { @@ -2744,26 +2744,26 @@ static bool CreateDungeon() ForceW = 0; ForceH = 0; - ForceHW = FALSE; + ForceHW = false; switch (currlevel) { case 5: if (quests[Q_BLOOD]._qactive != QUEST_NOTAVAIL) { - ForceHW = TRUE; + ForceHW = true; ForceH = 20; ForceW = 14; } break; case 6: if (quests[Q_SCHAMB]._qactive != QUEST_NOTAVAIL) { - ForceHW = TRUE; + ForceHW = true; ForceW = 10; ForceH = 10; } break; case 7: if (quests[Q_BLIND]._qactive != QUEST_NOTAVAIL) { - ForceHW = TRUE; + ForceHW = true; ForceW = 15; ForceH = 15; } @@ -2824,7 +2824,7 @@ static bool CreateDungeon() } if (!DL2_FillVoids()) { - return FALSE; + return false; } for (j = 0; j < DMAXY; j++) { @@ -2833,7 +2833,7 @@ static bool CreateDungeon() } } - return TRUE; + return true; } static void DRLG_L2Pass3() @@ -3028,7 +3028,7 @@ void L2LockoutFix() continue; } if ((dungeon[i][j] == 2 || dungeon[i][j] == 5) && dungeon[i][j - 1] == 3 && dungeon[i][j + 1] == 3) { - doorok = FALSE; + doorok = false; while (1) { if (dungeon[i][j] != 2 && dungeon[i][j] != 5) { break; @@ -3037,7 +3037,7 @@ void L2LockoutFix() break; } if (dungeon[i][j] == 5) { - doorok = TRUE; + doorok = true; } i++; } @@ -3053,7 +3053,7 @@ void L2LockoutFix() continue; } if ((dungeon[j][i] == 1 || dungeon[j][i] == 4) && dungeon[j - 1][i] == 3 && dungeon[j + 1][i] == 3) { - doorok = FALSE; + doorok = false; while (1) { if (dungeon[j][i] != 1 && dungeon[j][i] != 4) { break; @@ -3062,7 +3062,7 @@ void L2LockoutFix() break; } if (dungeon[j][i] == 4) { - doorok = TRUE; + doorok = true; } i++; } @@ -3095,7 +3095,7 @@ static void DRLG_L2(int entry) int i, j; bool doneflag; - doneflag = FALSE; + doneflag = false; while (!doneflag) { nRoomCnt = 0; InitDungeon(); @@ -3110,29 +3110,29 @@ static void DRLG_L2(int entry) DRLG_L2FloodTVal(); DRLG_L2TransFix(); if (entry == ENTRY_MAIN) { - doneflag = DRLG_L2PlaceMiniSet(USTAIRS, 1, 1, -1, -1, TRUE, 0); + doneflag = DRLG_L2PlaceMiniSet(USTAIRS, 1, 1, -1, -1, true, 0); if (doneflag) { - doneflag = DRLG_L2PlaceMiniSet(DSTAIRS, 1, 1, -1, -1, FALSE, 1); + doneflag = DRLG_L2PlaceMiniSet(DSTAIRS, 1, 1, -1, -1, false, 1); if (doneflag && currlevel == 5) { - doneflag = DRLG_L2PlaceMiniSet(WARPSTAIRS, 1, 1, -1, -1, FALSE, 6); + doneflag = DRLG_L2PlaceMiniSet(WARPSTAIRS, 1, 1, -1, -1, false, 6); } } ViewY -= 2; } else if (entry == ENTRY_PREV) { - doneflag = DRLG_L2PlaceMiniSet(USTAIRS, 1, 1, -1, -1, FALSE, 0); + doneflag = DRLG_L2PlaceMiniSet(USTAIRS, 1, 1, -1, -1, false, 0); if (doneflag) { - doneflag = DRLG_L2PlaceMiniSet(DSTAIRS, 1, 1, -1, -1, TRUE, 1); + doneflag = DRLG_L2PlaceMiniSet(DSTAIRS, 1, 1, -1, -1, true, 1); if (doneflag && currlevel == 5) { - doneflag = DRLG_L2PlaceMiniSet(WARPSTAIRS, 1, 1, -1, -1, FALSE, 6); + doneflag = DRLG_L2PlaceMiniSet(WARPSTAIRS, 1, 1, -1, -1, false, 6); } } ViewX--; } else { - doneflag = DRLG_L2PlaceMiniSet(USTAIRS, 1, 1, -1, -1, FALSE, 0); + doneflag = DRLG_L2PlaceMiniSet(USTAIRS, 1, 1, -1, -1, false, 0); if (doneflag) { - doneflag = DRLG_L2PlaceMiniSet(DSTAIRS, 1, 1, -1, -1, FALSE, 1); + doneflag = DRLG_L2PlaceMiniSet(DSTAIRS, 1, 1, -1, -1, false, 1); if (doneflag && currlevel == 5) { - doneflag = DRLG_L2PlaceMiniSet(WARPSTAIRS, 1, 1, -1, -1, TRUE, 6); + doneflag = DRLG_L2PlaceMiniSet(WARPSTAIRS, 1, 1, -1, -1, true, 6); } } ViewY -= 2; diff --git a/Source/drlg_l3.cpp b/Source/drlg_l3.cpp index f463090d..8d6adc87 100644 --- a/Source/drlg_l3.cpp +++ b/Source/drlg_l3.cpp @@ -855,7 +855,7 @@ static bool DRLG_L3FillRoom(int x1, int y1, int x2, int y2) int i, j, v; if (x1 <= 1 || x2 >= 34 || y1 <= 1 || y2 >= 38) { - return FALSE; + return false; } v = 0; @@ -866,7 +866,7 @@ static bool DRLG_L3FillRoom(int x1, int y1, int x2, int y2) } if (v != 0) { - return FALSE; + return false; } for (j = y1 + 1; j < y2; j++) { @@ -891,7 +891,7 @@ static bool DRLG_L3FillRoom(int x1, int y1, int x2, int y2) } } - return TRUE; + return true; } static void DRLG_L3CreateBlock(int x, int y, int obs, int dir) @@ -959,7 +959,7 @@ static void DRLG_L3CreateBlock(int x, int y, int obs, int dir) y2 = y1 + blksizey; } - if (DRLG_L3FillRoom(x1, y1, x2, y2) == TRUE) { + if (DRLG_L3FillRoom(x1, y1, x2, y2) == true) { contflag = random_(0, 4); if (contflag != 0 && dir != 2) { DRLG_L3CreateBlock(x1, y1, blksizey, 0); @@ -1178,13 +1178,13 @@ static void DRLG_L3River() bool bail; rivercnt = 0; - bail = FALSE; + bail = false; trys = 0; /// BUGFIX: pdir is uninitialized, add code `pdir = -1;`(fixed) pdir = -1; while (trys < 200 && rivercnt < 4) { - bail = FALSE; + bail = false; while (!bail && trys < 200) { trys++; rx = 0; @@ -1330,7 +1330,7 @@ static void DRLG_L3River() if (pdir == 3) { river[2][riveramt - 1] = 21; } - bail = TRUE; + bail = true; } // BUGFIX: Check `ry + 2 < DMAXY` (fixed) if (dir == 1 && ry + 2 < DMAXY && dungeon[rx][ry + 1] == 2 && dungeon[rx][ry + 2] == 8) { @@ -1343,7 +1343,7 @@ static void DRLG_L3River() if (pdir == 3) { river[2][riveramt - 1] = 19; } - bail = TRUE; + bail = true; } // BUGFIX: Check `rx + 2 < DMAXX` (fixed) if (dir == 2 && rx + 2 < DMAXX && dungeon[rx + 1][ry] == 4 && dungeon[rx + 2][ry] == 8) { @@ -1356,7 +1356,7 @@ static void DRLG_L3River() if (pdir == 1) { river[2][riveramt - 1] = 21; } - bail = TRUE; + bail = true; } // BUGFIX: Check `rx >= 2` (fixed) if (dir == 3 && rx >= 2 && dungeon[rx - 1][ry] == 9 && dungeon[rx - 2][ry] == 8) { @@ -1369,13 +1369,13 @@ static void DRLG_L3River() if (pdir == 1) { river[2][riveramt - 1] = 22; } - bail = TRUE; + bail = true; } } - if (bail == TRUE && riveramt < 7) { - bail = FALSE; + if (bail == true && riveramt < 7) { + bail = false; } - if (bail == TRUE) { + if (bail == true) { found = 0; lpcnt = 0; while (found == 0 && lpcnt < 30) { @@ -1415,7 +1415,7 @@ static void DRLG_L3River() dungeon[river[0][bridge]][river[1][bridge]] = river[2][bridge]; } } else { - bail = FALSE; + bail = false; } } } @@ -1429,48 +1429,48 @@ static bool DRLG_L3SpawnEdge(int x, int y, int *totarea) static BYTE spawntable[15] = { 0x00, 0x0A, 0x43, 0x05, 0x2c, 0x06, 0x09, 0x00, 0x00, 0x1c, 0x83, 0x06, 0x09, 0x0A, 0x05 }; if (*totarea > 40) { - return TRUE; + return true; } if (x < 0 || y < 0 || x >= DMAXX || y >= DMAXY) { - return TRUE; + return true; } if (dungeon[x][y] & 0x80) { - return FALSE; + return false; } if (dungeon[x][y] > 15) { - return TRUE; + return true; } i = dungeon[x][y]; dungeon[x][y] |= 0x80; *totarea += 1; - if (spawntable[i] & 8 && DRLG_L3SpawnEdge(x, y - 1, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 8 && DRLG_L3SpawnEdge(x, y - 1, totarea) == true) { + return true; } - if (spawntable[i] & 4 && DRLG_L3SpawnEdge(x, y + 1, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 4 && DRLG_L3SpawnEdge(x, y + 1, totarea) == true) { + return true; } - if (spawntable[i] & 2 && DRLG_L3SpawnEdge(x + 1, y, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 2 && DRLG_L3SpawnEdge(x + 1, y, totarea) == true) { + return true; } - if (spawntable[i] & 1 && DRLG_L3SpawnEdge(x - 1, y, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 1 && DRLG_L3SpawnEdge(x - 1, y, totarea) == true) { + return true; } - if (spawntable[i] & 0x80 && DRLG_L3Spawn(x, y - 1, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 0x80 && DRLG_L3Spawn(x, y - 1, totarea) == true) { + return true; } - if (spawntable[i] & 0x40 && DRLG_L3Spawn(x, y + 1, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 0x40 && DRLG_L3Spawn(x, y + 1, totarea) == true) { + return true; } - if (spawntable[i] & 0x20 && DRLG_L3Spawn(x + 1, y, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 0x20 && DRLG_L3Spawn(x + 1, y, totarea) == true) { + return true; } - if (spawntable[i] & 0x10 && DRLG_L3Spawn(x - 1, y, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 0x10 && DRLG_L3Spawn(x - 1, y, totarea) == true) { + return true; } - return FALSE; + return false; } static bool DRLG_L3Spawn(int x, int y, int *totarea) @@ -1479,16 +1479,16 @@ static bool DRLG_L3Spawn(int x, int y, int *totarea) static BYTE spawntable[15] = { 0x00, 0x0A, 0x03, 0x05, 0x0C, 0x06, 0x09, 0x00, 0x00, 0x0C, 0x03, 0x06, 0x09, 0x0A, 0x05 }; if (*totarea > 40) { - return TRUE; + return true; } if (x < 0 || y < 0 || x >= DMAXX || y >= DMAXY) { - return TRUE; + return true; } if (dungeon[x][y] & 0x80) { - return FALSE; + return false; } if (dungeon[x][y] > 15) { - return TRUE; + return true; } i = dungeon[x][y]; @@ -1496,40 +1496,40 @@ static bool DRLG_L3Spawn(int x, int y, int *totarea) *totarea += 1; if (i != 8) { - if (spawntable[i] & 8 && DRLG_L3SpawnEdge(x, y - 1, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 8 && DRLG_L3SpawnEdge(x, y - 1, totarea) == true) { + return true; } - if (spawntable[i] & 4 && DRLG_L3SpawnEdge(x, y + 1, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 4 && DRLG_L3SpawnEdge(x, y + 1, totarea) == true) { + return true; } - if (spawntable[i] & 2 && DRLG_L3SpawnEdge(x + 1, y, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 2 && DRLG_L3SpawnEdge(x + 1, y, totarea) == true) { + return true; } - if (spawntable[i] & 1 && DRLG_L3SpawnEdge(x - 1, y, totarea) == TRUE) { - return TRUE; + if (spawntable[i] & 1 && DRLG_L3SpawnEdge(x - 1, y, totarea) == true) { + return true; } } else { - if (DRLG_L3Spawn(x + 1, y, totarea) == TRUE) { - return TRUE; + if (DRLG_L3Spawn(x + 1, y, totarea) == true) { + return true; } - if (DRLG_L3Spawn(x - 1, y, totarea) == TRUE) { - return TRUE; + if (DRLG_L3Spawn(x - 1, y, totarea) == true) { + return true; } - if (DRLG_L3Spawn(x, y + 1, totarea) == TRUE) { - return TRUE; + if (DRLG_L3Spawn(x, y + 1, totarea) == true) { + return true; } - if (DRLG_L3Spawn(x, y - 1, totarea) == TRUE) { - return TRUE; + if (DRLG_L3Spawn(x, y - 1, totarea) == true) { + return true; } } - return FALSE; + return false; } /** * Flood fills dirt and wall tiles looking for * an area of at most 40 tiles and disconnected from the map edge. - * If it finds one, converts it to lava tiles and sets lavapool to TRUE. + * If it finds one, converts it to lava tiles and sets lavapool to true. */ static void DRLG_L3Pool() { @@ -1548,22 +1548,22 @@ static void DRLG_L3Pool() if (dunx + 1 < DMAXX) { found = DRLG_L3Spawn(dunx + 1, duny, &totarea); } else { - found = TRUE; + found = true; } if (dunx - 1 > 0 && !found) { found = DRLG_L3Spawn(dunx - 1, duny, &totarea); } else { - found = TRUE; + found = true; } if (duny + 1 < DMAXY && !found) { found = DRLG_L3Spawn(dunx, duny + 1, &totarea); } else { - found = TRUE; + found = true; } if (duny - 1 > 0 && !found) { found = DRLG_L3Spawn(dunx, duny - 1, &totarea); } else { - found = TRUE; + found = true; } poolchance = random_(0, 100); for (j = std::max(duny - totarea, 0); j < std::min(duny + totarea, DMAXY); j++) { @@ -1627,29 +1627,29 @@ static bool DRLG_L3PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, for (i = 0; i < numt; i++) { sx = random_(0, DMAXX - sw); sy = random_(0, DMAXY - sh); - found = FALSE; + found = false; trys = 0; while (!found && trys < 200) { trys++; - found = TRUE; + found = true; if (cx != -1 && sx >= cx - sw && sx <= cx + 12) { sx = random_(0, DMAXX - sw); sy = random_(0, DMAXY - sh); - found = FALSE; + found = false; } if (cy != -1 && sy >= cy - sh && sy <= cy + 12) { sx = random_(0, DMAXX - sw); sy = random_(0, DMAXY - sh); - found = FALSE; + found = false; } ii = 2; - for (yy = 0; yy < sh && found == TRUE; yy++) { - for (xx = 0; xx < sw && found == TRUE; xx++) { + for (yy = 0; yy < sh && found == true; yy++) { + for (xx = 0; xx < sw && found == true; xx++) { if (miniset[ii] != 0 && dungeon[xx + sx][yy + sy] != miniset[ii]) { - found = FALSE; + found = false; } if (dflags[xx + sx][yy + sy] != 0) { - found = FALSE; + found = false; } ii++; } @@ -1666,7 +1666,7 @@ static bool DRLG_L3PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, } } if (trys >= 200) { - return TRUE; + return true; } ii = sw * sh + 2; for (yy = 0; yy < sh; yy++) { @@ -1679,7 +1679,7 @@ static bool DRLG_L3PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, } } - if (setview == TRUE) { + if (setview == true) { ViewX = 2 * sx + 17; ViewY = 2 * sy + 19; } @@ -1688,7 +1688,7 @@ static bool DRLG_L3PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, LvlViewY = 2 * sy + 19; } - return FALSE; + return false; } static void DRLG_L3PlaceRndSet(const BYTE *miniset, int rndper) @@ -1701,37 +1701,37 @@ static void DRLG_L3PlaceRndSet(const BYTE *miniset, int rndper) for (sy = 0; sy < DMAXX - sh; sy++) { for (sx = 0; sx < DMAXY - sw; sx++) { - found = TRUE; + found = true; ii = 2; - for (yy = 0; yy < sh && found == TRUE; yy++) { - for (xx = 0; xx < sw && found == TRUE; xx++) { + for (yy = 0; yy < sh && found == true; yy++) { + for (xx = 0; xx < sw && found == true; xx++) { if (miniset[ii] != 0 && dungeon[xx + sx][yy + sy] != miniset[ii]) { - found = FALSE; + found = false; } if (dflags[xx + sx][yy + sy] != 0) { - found = FALSE; + found = false; } ii++; } } kk = sw * sh + 2; - if (miniset[kk] >= 84 && miniset[kk] <= 100 && found == TRUE) { + if (miniset[kk] >= 84 && miniset[kk] <= 100 && found == true) { // BUGFIX: accesses to dungeon can go out of bounds (fixed) // BUGFIX: Comparisons vs 100 should use same tile as comparisons vs 84. if (sx - 1 >= 0 && dungeon[sx - 1][sy] >= 84 && dungeon[sx - 1][sy] <= 100) { - found = FALSE; + found = false; } if (sx + 1 < 40 && sx - 1 >= 0 && dungeon[sx + 1][sy] >= 84 && dungeon[sx - 1][sy] <= 100) { - found = FALSE; + found = false; } if (sy + 1 < 40 && sx - 1 >= 0 && dungeon[sx][sy + 1] >= 84 && dungeon[sx - 1][sy] <= 100) { - found = FALSE; + found = false; } if (sy - 1 >= 0 && sx - 1 >= 0 && dungeon[sx][sy - 1] >= 84 && dungeon[sx - 1][sy] <= 100) { - found = FALSE; + found = false; } } - if (found == TRUE && random_(0, 100) < rndper) { + if (found == true && random_(0, 100) < rndper) { for (yy = 0; yy < sh; yy++) { for (xx = 0; xx < sw; xx++) { if (miniset[kk] != 0) { @@ -1751,44 +1751,44 @@ bool drlg_l3_hive_rnd_piece(const BYTE *miniset, int rndper) bool found; bool placed; - placed = FALSE; + placed = false; sw = miniset[0]; sh = miniset[1]; for (sy = 0; sy < DMAXX - sh; sy++) { for (sx = 0; sx < DMAXY - sw; sx++) { - found = TRUE; + found = true; ii = 2; - for (yy = 0; yy < sh && found == TRUE; yy++) { - for (xx = 0; xx < sw && found == TRUE; xx++) { + for (yy = 0; yy < sh && found == true; yy++) { + for (xx = 0; xx < sw && found == true; xx++) { if (miniset[ii] != 0 && dungeon[xx + sx][yy + sy] != miniset[ii]) { - found = FALSE; + found = false; } if (dflags[xx + sx][yy + sy] != 0) { - found = FALSE; + found = false; } ii++; } } kk = sw * sh + 2; - if (miniset[kk] >= 84 && miniset[kk] <= 100 && found == TRUE) { + if (miniset[kk] >= 84 && miniset[kk] <= 100 && found == true) { // BUGFIX: accesses to dungeon can go out of bounds // BUGFIX: Comparisons vs 100 should use same tile as comparisons vs 84. if (dungeon[sx - 1][sy] >= 84 && dungeon[sx - 1][sy] <= 100) { - found = FALSE; + found = false; } if (dungeon[sx + 1][sy] >= 84 && dungeon[sx - 1][sy] <= 100) { - found = FALSE; + found = false; } if (dungeon[sx][sy + 1] >= 84 && dungeon[sx - 1][sy] <= 100) { - found = FALSE; + found = false; } if (dungeon[sx][sy - 1] >= 84 && dungeon[sx - 1][sy] <= 100) { - found = FALSE; + found = false; } } - if (found == TRUE && random_(0, 100) < rndper) { - placed = TRUE; + if (found == true && random_(0, 100) < rndper) { + placed = true; for (yy = 0; yy < sh; yy++) { for (xx = 0; xx < sw; xx++) { if (miniset[kk] != 0) { @@ -1809,26 +1809,26 @@ static bool WoodVertU(int i, int y) if ((dungeon[i + 1][y] > 152 || dungeon[i + 1][y] < 130) && (dungeon[i - 1][y] > 152 || dungeon[i - 1][y] < 130)) { if (dungeon[i][y] == 7) { - return TRUE; + return true; } if (dungeon[i][y] == 10) { - return TRUE; + return true; } if (dungeon[i][y] == 126) { - return TRUE; + return true; } if (dungeon[i][y] == 129) { - return TRUE; + return true; } if (dungeon[i][y] == 134) { - return TRUE; + return true; } if (dungeon[i][y] == 136) { - return TRUE; + return true; } } - return FALSE; + return false; } static bool WoodVertD(int i, int y) @@ -1836,20 +1836,20 @@ static bool WoodVertD(int i, int y) if ((dungeon[i + 1][y] > 152 || dungeon[i + 1][y] < 130) && (dungeon[i - 1][y] > 152 || dungeon[i - 1][y] < 130)) { if (dungeon[i][y] == 7) { - return TRUE; + return true; } if (dungeon[i][y] == 2) { - return TRUE; + return true; } if (dungeon[i][y] == 134) { - return TRUE; + return true; } if (dungeon[i][y] == 136) { - return TRUE; + return true; } } - return FALSE; + return false; } static bool WoodHorizL(int x, int j) @@ -1857,26 +1857,26 @@ static bool WoodHorizL(int x, int j) if ((dungeon[x][j + 1] > 152 || dungeon[x][j + 1] < 130) && (dungeon[x][j - 1] > 152 || dungeon[x][j - 1] < 130)) { if (dungeon[x][j] == 7) { - return TRUE; + return true; } if (dungeon[x][j] == 9) { - return TRUE; + return true; } if (dungeon[x][j] == 121) { - return TRUE; + return true; } if (dungeon[x][j] == 124) { - return TRUE; + return true; } if (dungeon[x][j] == 135) { - return TRUE; + return true; } if (dungeon[x][j] == 137) { - return TRUE; + return true; } } - return FALSE; + return false; } static bool WoodHorizR(int x, int j) @@ -1884,20 +1884,20 @@ static bool WoodHorizR(int x, int j) if ((dungeon[x][j + 1] > 152 || dungeon[x][j + 1] < 130) && (dungeon[x][j - 1] > 152 || dungeon[x][j - 1] < 130)) { if (dungeon[x][j] == 7) { - return TRUE; + return true; } if (dungeon[x][j] == 4) { - return TRUE; + return true; } if (dungeon[x][j] == 135) { - return TRUE; + return true; } if (dungeon[x][j] == 137) { - return TRUE; + return true; } } - return FALSE; + return false; } void AddFenceDoors() @@ -2068,12 +2068,12 @@ static void DRLG_L3Wood() y2++; } y2--; - skip = TRUE; + skip = true; if (dungeon[i][y1] == 7) { - skip = FALSE; + skip = false; } if (dungeon[i][y2] == 7) { - skip = FALSE; + skip = false; } if (y2 - y1 > 1 && skip) { rp = random_(0, y2 - y1 - 1) + y1 + 1; @@ -2122,12 +2122,12 @@ static void DRLG_L3Wood() x2++; } x2--; - skip = TRUE; + skip = true; if (dungeon[x1][j] == 7) { - skip = FALSE; + skip = false; } if (dungeon[x2][j] == 7) { - skip = FALSE; + skip = false; } if (x2 - x1 > 1 && skip) { rp = random_(0, x2 - x1 - 1) + x1 + 1; @@ -2181,19 +2181,19 @@ static bool DRLG_L3Anvil() sx = random_(0, DMAXX - sw); sy = random_(0, DMAXY - sh); - found = FALSE; + found = false; trys = 0; while (!found && trys < 200) { trys++; - found = TRUE; + found = true; ii = 2; - for (yy = 0; yy < sh && found == TRUE; yy++) { - for (xx = 0; xx < sw && found == TRUE; xx++) { + for (yy = 0; yy < sh && found == true; yy++) { + for (xx = 0; xx < sw && found == true; xx++) { if (L3ANVIL[ii] != 0 && dungeon[xx + sx][yy + sy] != L3ANVIL[ii]) { - found = FALSE; + found = false; } if (dflags[xx + sx][yy + sy] != 0) { - found = FALSE; + found = false; } ii++; } @@ -2210,7 +2210,7 @@ static bool DRLG_L3Anvil() } } if (trys >= 200) { - return TRUE; + return true; } ii = sw * sh + 2; @@ -2229,7 +2229,7 @@ static bool DRLG_L3Anvil() setpc_w = sw; setpc_h = sh; - return FALSE; + return false; } static void FixL3Warp() @@ -2285,7 +2285,7 @@ static void DRLG_L3LockRec(int x, int y) return; } - lockout[x][y] = FALSE; + lockout[x][y] = false; lockoutcnt++; DRLG_L3LockRec(x, y - 1); DRLG_L3LockRec(x, y + 1); @@ -2301,12 +2301,12 @@ bool DRLG_L3Lockout() for (j = 0; j < DMAXY; j++) { for (i = 0; i < DMAXX; i++) { if (dungeon[i][j] != 0) { - lockout[i][j] = TRUE; + lockout[i][j] = true; fx = i; fy = j; t++; } else { - lockout[i][j] = FALSE; + lockout[i][j] = false; } } } @@ -2352,80 +2352,80 @@ static void DRLG_L3(int entry) if (DRLG_L3GetFloorArea() >= 600) { found = DRLG_L3Lockout(); } else { - found = FALSE; + found = false; } } while (!found); DRLG_L3MakeMegas(); if (entry == ENTRY_MAIN) { if (currlevel < 17) { - genok = DRLG_L3PlaceMiniSet(L3UP, 1, 1, -1, -1, TRUE, 0); + genok = DRLG_L3PlaceMiniSet(L3UP, 1, 1, -1, -1, true, 0); } else { if (currlevel != 17) - genok = DRLG_L3PlaceMiniSet(L6UP, 1, 1, -1, -1, TRUE, 0); + genok = DRLG_L3PlaceMiniSet(L6UP, 1, 1, -1, -1, true, 0); else - genok = DRLG_L3PlaceMiniSet(L6HOLDWARP, 1, 1, -1, -1, TRUE, 6); + genok = DRLG_L3PlaceMiniSet(L6HOLDWARP, 1, 1, -1, -1, true, 6); } if (!genok) { if (currlevel < 17) { - genok = DRLG_L3PlaceMiniSet(L3DOWN, 1, 1, -1, -1, FALSE, 1); + genok = DRLG_L3PlaceMiniSet(L3DOWN, 1, 1, -1, -1, false, 1); } else { if (currlevel != 20) - genok = DRLG_L3PlaceMiniSet(L6DOWN, 1, 1, -1, -1, FALSE, 1); + genok = DRLG_L3PlaceMiniSet(L6DOWN, 1, 1, -1, -1, false, 1); } if (!genok && currlevel == 9) { - genok = DRLG_L3PlaceMiniSet(L3HOLDWARP, 1, 1, -1, -1, FALSE, 6); + genok = DRLG_L3PlaceMiniSet(L3HOLDWARP, 1, 1, -1, -1, false, 6); } } } else if (entry == ENTRY_PREV) { if (currlevel < 17) { - genok = DRLG_L3PlaceMiniSet(L3UP, 1, 1, -1, -1, FALSE, 0); + genok = DRLG_L3PlaceMiniSet(L3UP, 1, 1, -1, -1, false, 0); } else { if (currlevel != 17) - genok = DRLG_L3PlaceMiniSet(L6UP, 1, 1, -1, -1, FALSE, 0); + genok = DRLG_L3PlaceMiniSet(L6UP, 1, 1, -1, -1, false, 0); else - genok = DRLG_L3PlaceMiniSet(L6HOLDWARP, 1, 1, -1, -1, FALSE, 6); + genok = DRLG_L3PlaceMiniSet(L6HOLDWARP, 1, 1, -1, -1, false, 6); } if (!genok) { if (currlevel < 17) { - genok = DRLG_L3PlaceMiniSet(L3DOWN, 1, 1, -1, -1, TRUE, 1); + genok = DRLG_L3PlaceMiniSet(L3DOWN, 1, 1, -1, -1, true, 1); ViewX += 2; ViewY -= 2; } else { if (currlevel != 20) { - genok = DRLG_L3PlaceMiniSet(L6DOWN, 1, 1, -1, -1, TRUE, 1); + genok = DRLG_L3PlaceMiniSet(L6DOWN, 1, 1, -1, -1, true, 1); ViewX += 2; ViewY -= 2; } } if (!genok && currlevel == 9) { - genok = DRLG_L3PlaceMiniSet(L3HOLDWARP, 1, 1, -1, -1, FALSE, 6); + genok = DRLG_L3PlaceMiniSet(L3HOLDWARP, 1, 1, -1, -1, false, 6); } } } else { if (currlevel < 17) { - genok = DRLG_L3PlaceMiniSet(L3UP, 1, 1, -1, -1, FALSE, 0); + genok = DRLG_L3PlaceMiniSet(L3UP, 1, 1, -1, -1, false, 0); } else { if (currlevel != 17) - genok = DRLG_L3PlaceMiniSet(L6UP, 1, 1, -1, -1, FALSE, 0); + genok = DRLG_L3PlaceMiniSet(L6UP, 1, 1, -1, -1, false, 0); else - genok = DRLG_L3PlaceMiniSet(L6HOLDWARP, 1, 1, -1, -1, TRUE, 6); + genok = DRLG_L3PlaceMiniSet(L6HOLDWARP, 1, 1, -1, -1, true, 6); } if (!genok) { if (currlevel < 17) { - genok = DRLG_L3PlaceMiniSet(L3DOWN, 1, 1, -1, -1, FALSE, 1); + genok = DRLG_L3PlaceMiniSet(L3DOWN, 1, 1, -1, -1, false, 1); } else { if (currlevel != 20) - genok = DRLG_L3PlaceMiniSet(L6DOWN, 1, 1, -1, -1, FALSE, 1); + genok = DRLG_L3PlaceMiniSet(L6DOWN, 1, 1, -1, -1, false, 1); } if (!genok && currlevel == 9) { - genok = DRLG_L3PlaceMiniSet(L3HOLDWARP, 1, 1, -1, -1, TRUE, 6); + genok = DRLG_L3PlaceMiniSet(L3HOLDWARP, 1, 1, -1, -1, true, 6); } } } if (!genok && QuestStatus(Q_ANVIL)) { genok = DRLG_L3Anvil(); } - } while (genok == TRUE); + } while (genok == true); if (currlevel < 17) { DRLG_L3Pool(); } else { diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp index f99a60f3..81bce3f9 100644 --- a/Source/drlg_l4.cpp +++ b/Source/drlg_l4.cpp @@ -153,18 +153,18 @@ static void DRLG_L4Shadows() for (y = 1; y < DMAXY; y++) { for (x = 1; x < DMAXY; x++) { - okflag = FALSE; + okflag = false; if (dungeon[x][y] == 3) { - okflag = TRUE; + okflag = true; } if (dungeon[x][y] == 4) { - okflag = TRUE; + okflag = true; } if (dungeon[x][y] == 8) { - okflag = TRUE; + okflag = true; } if (dungeon[x][y] == 15) { - okflag = TRUE; + okflag = true; } if (!okflag) { continue; @@ -196,14 +196,14 @@ static void InitL4Dungeon() void DRLG_LoadL4SP() { - setloadflag = FALSE; + setloadflag = false; if (QuestStatus(Q_WARLORD)) { pSetPiece = LoadFileInMem("Levels\\L4Data\\Warlord.DUN", NULL); - setloadflag = TRUE; + setloadflag = true; } if (currlevel == 15 && gbIsMultiplayer) { pSetPiece = LoadFileInMem("Levels\\L4Data\\Vile1.DUN", NULL); - setloadflag = TRUE; + setloadflag = true; } } @@ -273,31 +273,31 @@ static int L4HWallOk(int i, int j) } } - wallok = FALSE; + wallok = false; if (dungeon[i + x][j] == 10) { - wallok = TRUE; + wallok = true; } if (dungeon[i + x][j] == 12) { - wallok = TRUE; + wallok = true; } if (dungeon[i + x][j] == 13) { - wallok = TRUE; + wallok = true; } if (dungeon[i + x][j] == 15) { - wallok = TRUE; + wallok = true; } if (dungeon[i + x][j] == 16) { - wallok = TRUE; + wallok = true; } if (dungeon[i + x][j] == 21) { - wallok = TRUE; + wallok = true; } if (dungeon[i + x][j] == 22) { - wallok = TRUE; + wallok = true; } if (x <= 3) { - wallok = FALSE; + wallok = false; } if (wallok) { @@ -324,34 +324,34 @@ static int L4VWallOk(int i, int j) } } - wallok = FALSE; + wallok = false; if (dungeon[i][j + y] == 8) { - wallok = TRUE; + wallok = true; } if (dungeon[i][j + y] == 9) { - wallok = TRUE; + wallok = true; } if (dungeon[i][j + y] == 11) { - wallok = TRUE; + wallok = true; } if (dungeon[i][j + y] == 14) { - wallok = TRUE; + wallok = true; } if (dungeon[i][j + y] == 15) { - wallok = TRUE; + wallok = true; } if (dungeon[i][j + y] == 16) { - wallok = TRUE; + wallok = true; } if (dungeon[i][j + y] == 21) { - wallok = TRUE; + wallok = true; } if (dungeon[i][j + y] == 23) { - wallok = TRUE; + wallok = true; } if (y <= 3) { - wallok = FALSE; + wallok = false; } if (wallok) { @@ -995,15 +995,15 @@ static void uShape() for (j = 19; j >= 0; j--) { for (i = 19; i >= 0; i--) { if (dung[i][j] != 1) { - hallok[j] = FALSE; + hallok[j] = false; } if (dung[i][j] == 1) { // BUGFIX: check that i + 1 < 20 and j + 1 < 20 (fixed) if (i + 1 < 20 && j + 1 < 20 && dung[i][j + 1] == 1 && dung[i + 1][j + 1] == 0) { - hallok[j] = TRUE; + hallok[j] = true; } else { - hallok[j] = FALSE; + hallok[j] = false; } i = 0; } @@ -1033,15 +1033,15 @@ static void uShape() for (i = 19; i >= 0; i--) { for (j = 19; j >= 0; j--) { if (dung[i][j] != 1) { - hallok[i] = FALSE; + hallok[i] = false; } if (dung[i][j] == 1) { // BUGFIX: check that i + 1 < 20 and j + 1 < 20 (fixed) if (i + 1 < 20 && j + 1 < 20 && dung[i + 1][j] == 1 && dung[i + 1][j + 1] == 0) { - hallok[i] = TRUE; + hallok[i] = true; } else { - hallok[i] = FALSE; + hallok[i] = false; } j = 0; } @@ -1103,21 +1103,21 @@ static bool L4checkRoom(int x, int y, int width, int height) int i, j; if (x <= 0 || y <= 0) { - return FALSE; + return false; } for (j = 0; j < height; j++) { for (i = 0; i < width; i++) { if (i + x < 0 || i + x >= 20 || j + y < 0 || j + y >= 20) { - return FALSE; + return false; } if (dung[i + x][j + y] != 0) { - return FALSE; + return false; } } } - return TRUE; + return true; } static void L4roomGen(int x, int y, int w, int h, int dir) @@ -1137,17 +1137,17 @@ static void L4roomGen(int x, int y, int w, int h, int dir) cx1 = x - cw; ran = L4checkRoom(cx1 - 1, cy1 - 1, ch + 2, cw + 1); /// BUGFIX: swap args 3 and 4 ("ch+2" and "cw+1") num++; - } while (ran == FALSE && num < 20); + } while (ran == false && num < 20); - if (ran == TRUE) + if (ran == true) L4drawRoom(cx1, cy1, cw, ch); cx2 = x + w; ran2 = L4checkRoom(cx2, cy1 - 1, cw + 1, ch + 2); - if (ran2 == TRUE) + if (ran2 == true) L4drawRoom(cx2, cy1, cw, ch); - if (ran == TRUE) + if (ran == true) L4roomGen(cx1, cy1, cw, ch, 1); - if (ran2 == TRUE) + if (ran2 == true) L4roomGen(cx2, cy1, cw, ch, 1); return; } @@ -1159,17 +1159,17 @@ static void L4roomGen(int x, int y, int w, int h, int dir) ry = y - height; ran = L4checkRoom(rx - 1, ry - 1, width + 2, height + 1); num++; - } while (ran == FALSE && num < 20); + } while (ran == false && num < 20); - if (ran == TRUE) + if (ran == true) L4drawRoom(rx, ry, width, height); ry2 = y + h; ran2 = L4checkRoom(rx - 1, ry2, width + 2, height + 1); - if (ran2 == TRUE) + if (ran2 == true) L4drawRoom(rx, ry2, width, height); - if (ran == TRUE) + if (ran == true) L4roomGen(rx, ry, width, height, 0); - if (ran2 == TRUE) + if (ran2 == true) L4roomGen(rx, ry2, width, height, 0); } @@ -1330,30 +1330,30 @@ static bool DRLG_L4PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, for (i = 0; i < numt; i++) { sx = random_(0, DMAXX - sw); sy = random_(0, DMAXY - sh); - found = FALSE; + found = false; for (bailcnt = 0; !found && bailcnt < 200; bailcnt++) { - found = TRUE; + found = true; if (sx >= SP4x1 && sx <= SP4x2 && sy >= SP4y1 && sy <= SP4y2) { - found = FALSE; + found = false; } if (cx != -1 && sx >= cx - sw && sx <= cx + 12) { sx = random_(0, DMAXX - sw); sy = random_(0, DMAXY - sh); - found = FALSE; + found = false; } if (cy != -1 && sy >= cy - sh && sy <= cy + 12) { sx = random_(0, DMAXX - sw); sy = random_(0, DMAXY - sh); - found = FALSE; + found = false; } ii = 2; - for (yy = 0; yy < sh && found == TRUE; yy++) { - for (xx = 0; xx < sw && found == TRUE; xx++) { + for (yy = 0; yy < sh && found == true; yy++) { + for (xx = 0; xx < sw && found == true; xx++) { if (miniset[ii] != 0 && dungeon[xx + sx][yy + sy] != miniset[ii]) { - found = FALSE; + found = false; } if (dflags[xx + sx][yy + sy] != 0) { - found = FALSE; + found = false; } ii++; } @@ -1370,7 +1370,7 @@ static bool DRLG_L4PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, } } if (bailcnt >= 200) { - return FALSE; + return false; } ii = sw * sh + 2; for (yy = 0; yy < sh; yy++) { @@ -1388,7 +1388,7 @@ static bool DRLG_L4PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, quests[Q_BETRAYER]._qtx = sx + 1; quests[Q_BETRAYER]._qty = sy + 1; } - if (setview == TRUE) { + if (setview == true) { ViewX = 2 * sx + 21; ViewY = 2 * sy + 22; } @@ -1397,7 +1397,7 @@ static bool DRLG_L4PlaceMiniSet(const BYTE *miniset, int tmin, int tmax, int cx, LvlViewY = 2 * sy + 22; } - return TRUE; + return true; } #if defined(__3DS__) @@ -1477,31 +1477,31 @@ static void DRLG_L4FloodTVal() bool IsDURWall(char d) { if (d == 25) { - return TRUE; + return true; } if (d == 28) { - return TRUE; + return true; } if (d == 23) { - return TRUE; + return true; } - return FALSE; + return false; } bool IsDLLWall(char dd) { if (dd == 27) { - return TRUE; + return true; } if (dd == 26) { - return TRUE; + return true; } if (dd == 22) { - return TRUE; + return true; } - return FALSE; + return false; } static void DRLG_L4TransFix() @@ -1625,76 +1625,76 @@ static void DRLG_L4(int entry) DRLG_L4SetSPRoom(SP4x1, SP4y1); } if (currlevel == 16) { - DRLG_LoadDiabQuads(TRUE); + DRLG_LoadDiabQuads(true); } if (QuestStatus(Q_WARLORD)) { if (entry == ENTRY_MAIN) { - doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, TRUE, 0); + doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, true, 0); if (doneflag && currlevel == 13) { - doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, FALSE, 6); + doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, false, 6); } ViewX++; } else if (entry == ENTRY_PREV) { - doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, FALSE, 0); + doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, false, 0); if (doneflag && currlevel == 13) { - doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, FALSE, 6); + doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, false, 6); } ViewX = 2 * setpc_x + 22; ViewY = 2 * setpc_y + 22; } else { - doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, FALSE, 0); + doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, false, 0); if (doneflag && currlevel == 13) { - doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, TRUE, 6); + doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, true, 6); } ViewX++; } } else if (currlevel != 15) { if (entry == ENTRY_MAIN) { - doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, TRUE, 0); + doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, true, 0); if (doneflag && currlevel != 16) { - doneflag = DRLG_L4PlaceMiniSet(L4DSTAIRS, 1, 1, -1, -1, FALSE, 1); + doneflag = DRLG_L4PlaceMiniSet(L4DSTAIRS, 1, 1, -1, -1, false, 1); } if (doneflag && currlevel == 13) { - doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, FALSE, 6); + doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, false, 6); } ViewX++; } else if (entry == ENTRY_PREV) { - doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, FALSE, 0); + doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, false, 0); if (doneflag && currlevel != 16) { - doneflag = DRLG_L4PlaceMiniSet(L4DSTAIRS, 1, 1, -1, -1, TRUE, 1); + doneflag = DRLG_L4PlaceMiniSet(L4DSTAIRS, 1, 1, -1, -1, true, 1); } if (doneflag && currlevel == 13) { - doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, FALSE, 6); + doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, false, 6); } ViewY++; } else { - doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, FALSE, 0); + doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, false, 0); if (doneflag && currlevel != 16) { - doneflag = DRLG_L4PlaceMiniSet(L4DSTAIRS, 1, 1, -1, -1, FALSE, 1); + doneflag = DRLG_L4PlaceMiniSet(L4DSTAIRS, 1, 1, -1, -1, false, 1); } if (doneflag && currlevel == 13) { - doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, TRUE, 6); + doneflag = DRLG_L4PlaceMiniSet(L4TWARP, 1, 1, -1, -1, true, 6); } ViewX++; } } else { if (entry == ENTRY_MAIN) { - doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, TRUE, 0); + doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, true, 0); if (doneflag) { if (!gbIsMultiplayer && quests[Q_DIABLO]._qactive != QUEST_ACTIVE) { - doneflag = DRLG_L4PlaceMiniSet(L4PENTA, 1, 1, -1, -1, FALSE, 1); + doneflag = DRLG_L4PlaceMiniSet(L4PENTA, 1, 1, -1, -1, false, 1); } else { - doneflag = DRLG_L4PlaceMiniSet(L4PENTA2, 1, 1, -1, -1, FALSE, 1); + doneflag = DRLG_L4PlaceMiniSet(L4PENTA2, 1, 1, -1, -1, false, 1); } } ViewX++; } else { - doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, FALSE, 0); + doneflag = DRLG_L4PlaceMiniSet(L4USTAIRS, 1, 1, -1, -1, false, 0); if (doneflag) { if (!gbIsMultiplayer && quests[Q_DIABLO]._qactive != QUEST_ACTIVE) { - doneflag = DRLG_L4PlaceMiniSet(L4PENTA, 1, 1, -1, -1, TRUE, 1); + doneflag = DRLG_L4PlaceMiniSet(L4PENTA, 1, 1, -1, -1, true, 1); } else { - doneflag = DRLG_L4PlaceMiniSet(L4PENTA2, 1, 1, -1, -1, TRUE, 1); + doneflag = DRLG_L4PlaceMiniSet(L4PENTA2, 1, 1, -1, -1, true, 1); } } ViewY++; @@ -1741,7 +1741,7 @@ static void DRLG_L4(int entry) pdungeon[i][j] = dungeon[i][j]; } } - DRLG_LoadDiabQuads(FALSE); + DRLG_LoadDiabQuads(false); } } diff --git a/Source/dthread.cpp b/Source/dthread.cpp index 215f1815..2acdb931 100644 --- a/Source/dthread.cpp +++ b/Source/dthread.cpp @@ -107,7 +107,7 @@ void dthread_start() app_fatal("dthread:1\n%s", error_buf); } - dthread_running = TRUE; + dthread_running = true; sghThread = CreateThread(dthread_handler, &glpDThreadId); if (sghThread == NULL) { @@ -124,7 +124,7 @@ void dthread_cleanup() return; } - dthread_running = FALSE; + dthread_running = false; SetEvent(sghWorkToDoEvent); if (sghThread != NULL && glpDThreadId != SDL_GetThreadID(NULL)) { SDL_WaitThread(sghThread, NULL); diff --git a/Source/effects.cpp b/Source/effects.cpp index bacc7e46..9aa9c0ff 100644 --- a/Source/effects.cpp +++ b/Source/effects.cpp @@ -1067,7 +1067,7 @@ bool effect_is_playing(int nSFX) if (sfx->bFlags & sfx_STREAM) return sfx == sgpStreamSFX; - return FALSE; + return false; } void stream_stop() @@ -1173,18 +1173,18 @@ bool calc_snd_position(int x, int y, int *plVolume, int *plPan) *plPan = pan; if (abs(pan) > 6400) - return FALSE; + return false; volume = abs(x) > abs(y) ? abs(x) : abs(y); volume *= 64; *plVolume = volume; if (volume >= 6400) - return FALSE; + return false; *plVolume = -volume; - return TRUE; + return true; } static void PlaySFX_priv(TSFX *pSFX, bool loc, int x, int y) @@ -1284,7 +1284,7 @@ void PlaySFX(_sfx_id psfx, bool randomizeByCategory) psfx = RndSFX(psfx); } - PlaySFX_priv(&sgSFX[psfx], FALSE, 0, 0); + PlaySFX_priv(&sgSFX[psfx], false, 0, 0); } void PlaySfxLoc(_sfx_id psfx, int x, int y) @@ -1299,7 +1299,7 @@ void PlaySfxLoc(_sfx_id psfx, int x, int y) pSnd->start_tc = 0; } - PlaySFX_priv(&sgSFX[psfx], TRUE, x, y); + PlaySFX_priv(&sgSFX[psfx], true, x, y); } void sound_stop() diff --git a/Source/engine.cpp b/Source/engine.cpp index f2bc59b5..52c56e90 100644 --- a/Source/engine.cpp +++ b/Source/engine.cpp @@ -1076,10 +1076,10 @@ void Cl2DrawLight(CelOutputBuffer out, int sx, int sy, BYTE *pCelBuff, int nCel, void PlayInGameMovie(const char *pszMovie) { PaletteFadeOut(8); - play_movie(pszMovie, FALSE); + play_movie(pszMovie, false); ClearScreenBuffer(); force_redraw = 255; - scrollrt_draw_game_screen(TRUE); + scrollrt_draw_game_screen(true); PaletteFadeIn(8); force_redraw = 255; } diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp index e70ae164..be939108 100644 --- a/Source/gamemenu.cpp +++ b/Source/gamemenu.cpp @@ -70,9 +70,9 @@ static void gamemenu_update_single(TMenuItem *pMenuItems) gmenu_enable(&sgSingleMenu[3], gbValidSaveFile); - enable = FALSE; + enable = false; if (plr[myplr]._pmode != PM_DEATH && !deathflag) - enable = TRUE; + enable = true; gmenu_enable(&sgSingleMenu[0], enable); } @@ -116,21 +116,21 @@ void gamemenu_new_game(bool bActivate) for (i = 0; i < MAX_PLRS; i++) { plr[i]._pmode = PM_QUIT; - plr[i]._pInvincible = TRUE; + plr[i]._pInvincible = true; } - deathflag = FALSE; + deathflag = false; force_redraw = 255; - scrollrt_draw_game_screen(TRUE); - CornerStone.activated = FALSE; - gbRunGame = FALSE; + scrollrt_draw_game_screen(true); + CornerStone.activated = false; + gbRunGame = false; gamemenu_off(); } void gamemenu_quit_game(bool bActivate) { gamemenu_new_game(bActivate); - gbRunGameResult = FALSE; + gbRunGameResult = false; } void gamemenu_load_game(bool bActivate) @@ -141,11 +141,11 @@ void gamemenu_load_game(bool bActivate) InitDiabloMsg(EMSG_LOADING); force_redraw = 255; DrawAndBlit(); - LoadGame(FALSE); + LoadGame(false); ClrDiabloMsg(); - CornerStone.activated = FALSE; + CornerStone.activated = false; PaletteFadeOut(8); - deathflag = FALSE; + deathflag = false; force_redraw = 255; DrawAndBlit(); LoadPWaterPalette(); @@ -185,7 +185,7 @@ void gamemenu_save_game(bool bActivate) void gamemenu_restart_town(bool bActivate) { - NetSendCmd(TRUE, CMD_RETOWN); + NetSendCmd(true, CMD_RETOWN); } static void gamemenu_sound_music_toggle(const char *const *names, TMenuItem *menu_item, int volume) @@ -279,11 +279,11 @@ void gamemenu_music_volume(bool bActivate) if (bActivate) { if (gbMusicOn) { - gbMusicOn = FALSE; + gbMusicOn = false; music_stop(); sound_get_or_set_music_volume(VOLUME_MIN); } else { - gbMusicOn = TRUE; + gbMusicOn = true; sound_get_or_set_music_volume(VOLUME_MAX); int lt; if (currlevel >= 17) { @@ -300,11 +300,11 @@ void gamemenu_music_volume(bool bActivate) sound_get_or_set_music_volume(volume); if (volume == VOLUME_MIN) { if (gbMusicOn) { - gbMusicOn = FALSE; + gbMusicOn = false; music_stop(); } } else if (!gbMusicOn) { - gbMusicOn = TRUE; + gbMusicOn = true; int lt; if (currlevel >= 17) { if (currlevel > 20) @@ -324,11 +324,11 @@ void gamemenu_sound_volume(bool bActivate) int volume; if (bActivate) { if (gbSoundOn) { - gbSoundOn = FALSE; + gbSoundOn = false; sound_stop(); sound_get_or_set_sound_volume(VOLUME_MIN); } else { - gbSoundOn = TRUE; + gbSoundOn = true; sound_get_or_set_sound_volume(VOLUME_MAX); } } else { @@ -336,11 +336,11 @@ void gamemenu_sound_volume(bool bActivate) sound_get_or_set_sound_volume(volume); if (volume == VOLUME_MIN) { if (gbSoundOn) { - gbSoundOn = FALSE; + gbSoundOn = false; sound_stop(); } } else if (!gbSoundOn) { - gbSoundOn = TRUE; + gbSoundOn = true; } } PlaySFX(IS_TITLEMOV); diff --git a/Source/gendung.cpp b/Source/gendung.cpp index d186c8db..278de5cf 100644 --- a/Source/gendung.cpp +++ b/Source/gendung.cpp @@ -171,15 +171,15 @@ void FillSolidBlockTbls() for (i = 1; i <= dwTiles; i++) { bv = *pTmp++; if (bv & 1) - nSolidTable[i] = TRUE; + nSolidTable[i] = true; if (bv & 2) - nBlockTable[i] = TRUE; + nBlockTable[i] = true; if (bv & 4) - nMissileTable[i] = TRUE; + nMissileTable[i] = true; if (bv & 8) - nTransTable[i] = TRUE; + nTransTable[i] = true; if (bv & 0x80) - nTrapTable[i] = TRUE; + nTrapTable[i] = true; block_lvid[i] = (bv & 0x70) >> 4; /* beta: (bv >> 4) & 7 */ } @@ -343,17 +343,17 @@ bool DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, in int xCount, yCount; bool yFlag, xFlag; - yFlag = TRUE; - xFlag = TRUE; + yFlag = true; + xFlag = true; xCount = 0; yCount = 0; // BUGFIX: change '&&' to '||' (fixed) if (x > DMAXX - maxSize || y > DMAXY - maxSize) { - return FALSE; + return false; } if (!SkipThemeRoom(x, y)) { - return FALSE; + return false; } memset(xArray, 0, sizeof(xArray)); @@ -366,7 +366,7 @@ bool DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, in if (xx >= minSize) { break; } - xFlag = FALSE; + xFlag = false; } else { xCount++; } @@ -382,7 +382,7 @@ bool DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, in if (yy >= minSize) { break; } - yFlag = FALSE; + yFlag = false; } else { yCount++; } @@ -396,7 +396,7 @@ bool DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, in for (ii = 0; ii < minSize; ii++) { if (xArray[ii] < minSize || yArray[ii] < minSize) { - return FALSE; + return false; } } @@ -417,7 +417,7 @@ bool DRLG_WillThemeRoomFit(int floor, int x, int y, int minSize, int maxSize, in *width = xSmallest - 2; *height = ySmallest - 2; - return TRUE; + return true; } void DRLG_CreateThemeRoom(int themeIndex) @@ -586,10 +586,10 @@ bool SkipThemeRoom(int x, int y) for (i = 0; i < themeCount; i++) { if (x >= themeLoc[i].x - 2 && x <= themeLoc[i].x + themeLoc[i].width + 2 && y >= themeLoc[i].y - 2 && y <= themeLoc[i].y + themeLoc[i].height + 2) - return FALSE; + return false; } - return TRUE; + return true; } void InitLevels() @@ -601,7 +601,7 @@ void InitLevels() currlevel = 0; leveltype = DTYPE_TOWN; - setlevel = FALSE; + setlevel = false; } } // namespace devilution diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp index 37d34f2c..9eb74e30 100644 --- a/Source/gmenu.cpp +++ b/Source/gmenu.cpp @@ -90,7 +90,7 @@ void gmenu_init_menu() sgpCurrItem = NULL; gmenu_current_option = NULL; sgCurrentMenuIdx = 0; - mouseNavigation = FALSE; + mouseNavigation = false; if (gbIsHellfire) sgpLogo = LoadFileInMem("Data\\hf_logo3.CEL", NULL); else @@ -113,7 +113,7 @@ static void gmenu_up_down(bool isDown) if (!sgpCurrItem) { return; } - mouseNavigation = FALSE; + mouseNavigation = false; i = sgCurrentMenuIdx; if (sgCurrentMenuIdx) { while (i) { @@ -156,7 +156,7 @@ static void gmenu_left_right(bool isRight) } sgpCurrItem->dwFlags &= 0xFFFFF000; sgpCurrItem->dwFlags |= step; - sgpCurrItem->fnMenu(FALSE); + sgpCurrItem->fnMenu(false); } void gmenu_set_items(TMenuItem *pItem, void (*gmFunc)(TMenuItem *)) @@ -164,7 +164,7 @@ void gmenu_set_items(TMenuItem *pItem, void (*gmFunc)(TMenuItem *)) int i; PauseMode = 0; - mouseNavigation = FALSE; + mouseNavigation = false; sgpCurrentMenu = pItem; gmenu_current_option = gmFunc; if (gmFunc) { @@ -179,7 +179,7 @@ void gmenu_set_items(TMenuItem *pItem, void (*gmFunc)(TMenuItem *)) } // BUGFIX: OOB access when sgCurrentMenuIdx is 0; should be set to NULL instead. (fixed) sgpCurrItem = sgCurrentMenuIdx > 0 ? &sgpCurrentMenu[sgCurrentMenuIdx - 1] : NULL; - gmenu_up_down(TRUE); + gmenu_up_down(true); } static void gmenu_clear_buffer(CelOutputBuffer out, int x, int y, int width, int height) @@ -279,12 +279,12 @@ void gmenu_draw(CelOutputBuffer out) bool gmenu_presskeys(int vkey) { if (!sgpCurrentMenu) - return FALSE; + return false; switch (vkey) { case DVL_VK_RETURN: if ((sgpCurrItem->dwFlags & GMENU_ENABLED) != 0) { PlaySFX(IS_TITLEMOV); - sgpCurrItem->fnMenu(TRUE); + sgpCurrItem->fnMenu(true); } break; case DVL_VK_ESCAPE: @@ -292,21 +292,21 @@ bool gmenu_presskeys(int vkey) gmenu_set_items(NULL, NULL); break; case DVL_VK_SPACE: - return FALSE; + return false; case DVL_VK_LEFT: - gmenu_left_right(FALSE); + gmenu_left_right(false); break; case DVL_VK_RIGHT: - gmenu_left_right(TRUE); + gmenu_left_right(true); break; case DVL_VK_UP: - gmenu_up_down(FALSE); + gmenu_up_down(false); break; case DVL_VK_DOWN: - gmenu_up_down(TRUE); + gmenu_up_down(true); break; } - return TRUE; + return true; } static bool gmenu_get_mouse_slider(int *plOffset) @@ -314,14 +314,14 @@ static bool gmenu_get_mouse_slider(int *plOffset) *plOffset = 282; if (MouseX < 282 + PANEL_LEFT) { *plOffset = 0; - return FALSE; + return false; } if (MouseX > 538 + PANEL_LEFT) { *plOffset = 256; - return FALSE; + return false; } *plOffset = MouseX - 282 - PANEL_LEFT; - return TRUE; + return true; } bool gmenu_on_mouse_move() @@ -329,7 +329,7 @@ bool gmenu_on_mouse_move() int step, nSteps; if (!mouseNavigation) - return FALSE; + return false; gmenu_get_mouse_slider(&step); nSteps = (int)(sgpCurrItem->dwFlags & 0xFFF000) >> 12; step *= nSteps; @@ -337,8 +337,8 @@ bool gmenu_on_mouse_move() sgpCurrItem->dwFlags &= 0xFFFFF000; sgpCurrItem->dwFlags |= step; - sgpCurrItem->fnMenu(FALSE); - return TRUE; + sgpCurrItem->fnMenu(false); + return true; } bool gmenu_left_mouse(bool isDown) @@ -348,36 +348,36 @@ bool gmenu_left_mouse(bool isDown) if (!isDown) { if (mouseNavigation) { - mouseNavigation = FALSE; - return TRUE; + mouseNavigation = false; + return true; } else { - return FALSE; + return false; } } if (!sgpCurrentMenu) { - return FALSE; + return false; } if (MouseY >= PANEL_TOP) { - return FALSE; + return false; } if (MouseY - (117 + UI_OFFSET_Y) < 0) { - return TRUE; + return true; } i = (MouseY - (117 + UI_OFFSET_Y)) / 45; if (i >= sgCurrentMenuIdx) { - return TRUE; + return true; } pItem = &sgpCurrentMenu[i]; if (!(sgpCurrentMenu[i].dwFlags & GMENU_ENABLED)) { - return TRUE; + return true; } w = gmenu_get_lfont(pItem); if (MouseX < gnScreenWidth / 2 - w / 2) { - return TRUE; + return true; } if (MouseX > gnScreenWidth / 2 + w / 2) { - return TRUE; + return true; } sgpCurrItem = pItem; PlaySFX(IS_TITLEMOV); @@ -385,9 +385,9 @@ bool gmenu_left_mouse(bool isDown) mouseNavigation = gmenu_get_mouse_slider(&dummy); gmenu_on_mouse_move(); } else { - sgpCurrItem->fnMenu(TRUE); + sgpCurrItem->fnMenu(true); } - return TRUE; + return true; } void gmenu_enable(TMenuItem *pMenuItem, bool enable) diff --git a/Source/help.cpp b/Source/help.cpp index 7cb18090..382aa825 100644 --- a/Source/help.cpp +++ b/Source/help.cpp @@ -450,7 +450,7 @@ const char gszHelpText[] = { void InitHelp() { - helpflag = FALSE; + helpflag = false; } static void DrawHelpLine(CelOutputBuffer out, int x, int y, char *text, text_color color) @@ -482,9 +482,9 @@ void DrawHelp(CelOutputBuffer out) DrawSTextHelp(); DrawQTextBack(out); if (gbIsHellfire) - PrintSString(out, 0, 2, TRUE, "Hellfire Help", COL_GOLD, 0); + PrintSString(out, 0, 2, true, "Hellfire Help", COL_GOLD, 0); else - PrintSString(out, 0, 2, TRUE, "Diablo Help", COL_GOLD, 0); + PrintSString(out, 0, 2, true, "Diablo Help", COL_GOLD, 0); DrawSLine(out, 5); s = &gszHelpText[0]; @@ -564,13 +564,13 @@ void DrawHelp(CelOutputBuffer out) } } - PrintSString(out, 0, 23, TRUE, "Press ESC to end or the arrow keys to scroll.", COL_GOLD, 0); + PrintSString(out, 0, 23, true, "Press ESC to end or the arrow keys to scroll.", COL_GOLD, 0); } void DisplayHelp() { help_select_line = 0; - helpflag = TRUE; + helpflag = true; HelpTop = 5000; } diff --git a/Source/interfac.cpp b/Source/interfac.cpp index c1cba300..2d80f850 100644 --- a/Source/interfac.cpp +++ b/Source/interfac.cpp @@ -176,7 +176,7 @@ static void DrawCutscene() unlock_buf(1); force_redraw = 255; - scrollrt_draw_game_screen(FALSE); + scrollrt_draw_game_screen(false); } void interface_msg_pump() @@ -206,15 +206,15 @@ void ShowProgress(interface_mode uMsg) { WNDPROC saveProc; - gbSomebodyWonGameKludge = FALSE; - plrmsg_delay(TRUE); + gbSomebodyWonGameKludge = false; + plrmsg_delay(true); assert(ghMainWnd); saveProc = SetWindowProc(DisableInputWndProc); interface_msg_pump(); ClearScreenBuffer(); - scrollrt_draw_game_screen(TRUE); + scrollrt_draw_game_screen(true); InitCutscene(uMsg); BlackPalette(); DrawCutscene(); @@ -227,7 +227,7 @@ void ShowProgress(interface_mode uMsg) case WM_DIABLOADGAME: IncProgress(); IncProgress(); - LoadGame(TRUE); + LoadGame(true); IncProgress(); IncProgress(); break; @@ -238,7 +238,7 @@ void ShowProgress(interface_mode uMsg) IncProgress(); pfile_remove_temp_files(); IncProgress(); - LoadGameLevel(TRUE, ENTRY_MAIN); + LoadGameLevel(true, ENTRY_MAIN); IncProgress(); break; case WM_DIABNEXTLVL: @@ -254,7 +254,7 @@ void ShowProgress(interface_mode uMsg) leveltype = gnLevelTypeTbl[currlevel]; assert(plr[myplr].plrlevel == currlevel); IncProgress(); - LoadGameLevel(FALSE, ENTRY_MAIN); + LoadGameLevel(false, ENTRY_MAIN); IncProgress(); break; case WM_DIABPREVLVL: @@ -270,7 +270,7 @@ void ShowProgress(interface_mode uMsg) leveltype = gnLevelTypeTbl[currlevel]; assert(plr[myplr].plrlevel == currlevel); IncProgress(); - LoadGameLevel(FALSE, ENTRY_PREV); + LoadGameLevel(false, ENTRY_PREV); IncProgress(); break; case WM_DIABSETLVL: @@ -282,11 +282,11 @@ void ShowProgress(interface_mode uMsg) DeltaSaveLevel(); } IncProgress(); - setlevel = TRUE; + setlevel = true; leveltype = setlvltype; FreeGameMem(); IncProgress(); - LoadGameLevel(FALSE, ENTRY_SETLVL); + LoadGameLevel(false, ENTRY_SETLVL); IncProgress(); break; case WM_DIABRTNLVL: @@ -297,11 +297,11 @@ void ShowProgress(interface_mode uMsg) DeltaSaveLevel(); } IncProgress(); - setlevel = FALSE; + setlevel = false; FreeGameMem(); IncProgress(); GetReturnLvlPos(); - LoadGameLevel(FALSE, ENTRY_RTNLVL); + LoadGameLevel(false, ENTRY_RTNLVL); IncProgress(); break; case WM_DIABWARPLVL: @@ -315,7 +315,7 @@ void ShowProgress(interface_mode uMsg) FreeGameMem(); GetPortalLevel(); IncProgress(); - LoadGameLevel(FALSE, ENTRY_WARPLVL); + LoadGameLevel(false, ENTRY_WARPLVL); IncProgress(); break; case WM_DIABTOWNWARP: @@ -331,7 +331,7 @@ void ShowProgress(interface_mode uMsg) leveltype = gnLevelTypeTbl[currlevel]; assert(plr[myplr].plrlevel == currlevel); IncProgress(); - LoadGameLevel(FALSE, ENTRY_TWARPDN); + LoadGameLevel(false, ENTRY_TWARPDN); IncProgress(); break; case WM_DIABTWARPUP: @@ -347,7 +347,7 @@ void ShowProgress(interface_mode uMsg) leveltype = gnLevelTypeTbl[currlevel]; assert(plr[myplr].plrlevel == currlevel); IncProgress(); - LoadGameLevel(FALSE, ENTRY_TWARPUP); + LoadGameLevel(false, ENTRY_TWARPUP); IncProgress(); break; case WM_DIABRETOWN: @@ -363,7 +363,7 @@ void ShowProgress(interface_mode uMsg) leveltype = gnLevelTypeTbl[currlevel]; assert(plr[myplr].plrlevel == currlevel); IncProgress(); - LoadGameLevel(FALSE, ENTRY_MAIN); + LoadGameLevel(false, ENTRY_MAIN); IncProgress(); break; } @@ -376,15 +376,15 @@ void ShowProgress(interface_mode uMsg) saveProc = SetWindowProc(saveProc); assert(saveProc == DisableInputWndProc); - NetSendCmdLocParam1(TRUE, CMD_PLAYER_JOINLEVEL, plr[myplr]._px, plr[myplr]._py, plr[myplr].plrlevel); - plrmsg_delay(FALSE); + NetSendCmdLocParam1(true, CMD_PLAYER_JOINLEVEL, plr[myplr]._px, plr[myplr]._py, plr[myplr].plrlevel); + plrmsg_delay(false); ResetPal(); if (gbSomebodyWonGameKludge && plr[myplr].plrlevel == 16) { PrepDoEnding(); } - gbSomebodyWonGameKludge = FALSE; + gbSomebodyWonGameKludge = false; } } // namespace devilution diff --git a/Source/inv.cpp b/Source/inv.cpp index 83b6e8d9..7dd311df 100644 --- a/Source/inv.cpp +++ b/Source/inv.cpp @@ -136,8 +136,8 @@ void InitInv() pInvCels = LoadFileInMem("Data\\Inv\\Inv.CEL", NULL); } - invflag = FALSE; - drawsbarflag = FALSE; + invflag = false; + drawsbarflag = false; } static void InvDrawSlotBack(CelOutputBuffer out, int X, int Y, int W, int H) @@ -358,7 +358,7 @@ void DrawInv(CelOutputBuffer out) && plr[myplr].InvBody[INVLOC_HAND_LEFT]._itype != ITYPE_MACE)) { InvDrawSlotBack(out, RIGHT_PANEL_X + 248, 160, 2 * INV_SLOT_SIZE_PX, 3 * INV_SLOT_SIZE_PX); light_table_index = 0; - cel_transparency_active = TRUE; + cel_transparency_active = true; const int dst_x = RIGHT_PANEL_X + (frame_width == INV_SLOT_SIZE_PX ? 261 : 247); const int dst_y = 160; @@ -368,7 +368,7 @@ void DrawInv(CelOutputBuffer out) CelClippedBlitLightTransTo(out, dst_x, dst_y, pCursCels2, frame - 179, frame_width); } - cel_transparency_active = FALSE; + cel_transparency_active = false; } } } @@ -448,7 +448,7 @@ void DrawInv(CelOutputBuffer out) } for (i = 0; i < NUM_INV_GRID_ELEM; i++) { - invtest[i] = FALSE; + invtest[i] = false; if (plr[myplr].InvGrid[i] != 0) { InvDrawSlotBack( out, @@ -464,7 +464,7 @@ void DrawInv(CelOutputBuffer out) { ii = plr[myplr].InvGrid[j] - 1; - invtest[j] = TRUE; + invtest[j] = true; frame = plr[myplr].InvList[ii]._iCurs + CURSOR_FIRSTITEM; frame_width = InvItemWidth[frame]; @@ -645,7 +645,7 @@ bool AutoPlaceItemInBelt(int playerNumber, const ItemStruct &item, bool persistI if (persistItem) { plr[playerNumber].SpdList[i] = item; CalcPlrScrolls(playerNumber); - drawsbarflag = TRUE; + drawsbarflag = true; } return true; @@ -781,8 +781,8 @@ bool AutoEquip(int playerNumber, const ItemStruct &item, int bodyLocation, bool PlaySFX(ItemInvSnds[ItemCAnimTbl[item._iCurs]]); } - NetSendCmdChItem(FALSE, bodyLocation); - CalcPlrInv(playerNumber, TRUE); + NetSendCmdChItem(false, bodyLocation); + CalcPlrInv(playerNumber, true); } return true; @@ -1050,33 +1050,33 @@ bool GoldAutoPlace(int pnum) bool WeaponAutoPlace(int pnum) { if (plr[pnum]._pClass == PC_MONK) - return FALSE; + return false; if (plr[pnum].HoldItem._iLoc != ILOC_TWOHAND || (plr[pnum]._pClass == PC_BARBARIAN && (plr[pnum].HoldItem._itype == ITYPE_SWORD || plr[pnum].HoldItem._itype == ITYPE_MACE))) { if (plr[pnum]._pClass != PC_BARD) { if (!plr[pnum].InvBody[INVLOC_HAND_LEFT].isEmpty() && plr[pnum].InvBody[INVLOC_HAND_LEFT]._iClass == ICLASS_WEAPON) - return FALSE; + return false; if (!plr[pnum].InvBody[INVLOC_HAND_RIGHT].isEmpty() && plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iClass == ICLASS_WEAPON) - return FALSE; + return false; } if (plr[pnum].InvBody[INVLOC_HAND_LEFT].isEmpty()) { - NetSendCmdChItem(TRUE, INVLOC_HAND_LEFT); + NetSendCmdChItem(true, INVLOC_HAND_LEFT); plr[pnum].InvBody[INVLOC_HAND_LEFT] = plr[pnum].HoldItem; - return TRUE; + return true; } if (plr[pnum].InvBody[INVLOC_HAND_RIGHT].isEmpty() && plr[pnum].InvBody[INVLOC_HAND_LEFT]._iLoc != ILOC_TWOHAND) { - NetSendCmdChItem(TRUE, INVLOC_HAND_RIGHT); + NetSendCmdChItem(true, INVLOC_HAND_RIGHT); plr[pnum].InvBody[INVLOC_HAND_RIGHT] = plr[pnum].HoldItem; - return TRUE; + return true; } } else if (plr[pnum].InvBody[INVLOC_HAND_LEFT].isEmpty() && plr[pnum].InvBody[INVLOC_HAND_RIGHT].isEmpty()) { - NetSendCmdChItem(TRUE, INVLOC_HAND_LEFT); + NetSendCmdChItem(true, INVLOC_HAND_LEFT); plr[pnum].InvBody[INVLOC_HAND_LEFT] = plr[pnum].HoldItem; - return TRUE; + return true; } - return FALSE; + return false; } int SwapItem(ItemStruct *a, ItemStruct *b) @@ -1103,7 +1103,7 @@ void CheckInvPaste(int pnum, int mx, int my) j = my + (icursH >> 1); sx = icursW28; sy = icursH28; - done = FALSE; + done = false; for (r = 0; (DWORD)r < NUM_XY_SLOTS && !done; r++) { int xo = RIGHT_PANEL; int yo = 0; @@ -1114,7 +1114,7 @@ void CheckInvPaste(int pnum, int mx, int my) if (i >= InvRect[r].X + xo && i < InvRect[r].X + xo + INV_SLOT_SIZE_PX) { if (j >= InvRect[r].Y + yo - INV_SLOT_SIZE_PX - 1 && j < InvRect[r].Y + yo) { - done = TRUE; + done = true; r--; } } @@ -1142,31 +1142,31 @@ void CheckInvPaste(int pnum, int mx, int my) il = ILOC_ARMOR; if (r >= SLOTXY_BELT_FIRST && r <= SLOTXY_BELT_LAST) il = ILOC_BELT; - done = FALSE; + done = false; if (plr[pnum].HoldItem._iLoc == il) - done = TRUE; + done = true; if (il == ILOC_ONEHAND && plr[pnum].HoldItem._iLoc == ILOC_TWOHAND) { if (plr[pnum]._pClass == PC_BARBARIAN && (plr[pnum].HoldItem._itype == ITYPE_SWORD || plr[pnum].HoldItem._itype == ITYPE_MACE)) il = ILOC_ONEHAND; else il = ILOC_TWOHAND; - done = TRUE; + done = true; } if (plr[pnum].HoldItem._iLoc == ILOC_UNEQUIPABLE && il == ILOC_BELT) { if (sx == 1 && sy == 1) { - done = TRUE; + done = true; if (!AllItemsList[plr[pnum].HoldItem.IDidx].iUsable) - done = FALSE; + done = false; if (!plr[pnum].HoldItem._iStatFlag) - done = FALSE; + done = false; if (plr[pnum].HoldItem._itype == ITYPE_GOLD) - done = FALSE; + done = false; } } if (il == ILOC_UNEQUIPABLE) { - done = TRUE; + done = true; it = 0; ii = r - SLOTXY_INV_FIRST; if (plr[pnum].HoldItem._itype == ITYPE_GOLD) { @@ -1188,13 +1188,13 @@ void CheckInvPaste(int pnum, int mx, int my) yy = 0; for (j = 0; j < sy && done; j++) { if (yy >= NUM_INV_GRID_ELEM) - done = FALSE; + done = false; xx = (ii % 10) - ((sx - 1) >> 1); if (xx < 0) xx = 0; for (i = 0; i < sx && done; i++) { if (xx >= 10) { - done = FALSE; + done = false; } else { if (plr[pnum].InvGrid[xx + yy] != 0) { iv = plr[pnum].InvGrid[xx + yy]; @@ -1202,7 +1202,7 @@ void CheckInvPaste(int pnum, int mx, int my) iv = -iv; if (it != 0) { if (it != iv) - done = FALSE; + done = false; } else it = iv; } @@ -1218,7 +1218,7 @@ void CheckInvPaste(int pnum, int mx, int my) return; if (il != ILOC_UNEQUIPABLE && il != ILOC_BELT && !plr[pnum].HoldItem._iStatFlag) { - done = FALSE; + done = false; if (plr[pnum]._pClass == PC_WARRIOR) PlaySFX(PS_WARR13); else if (plr[pnum]._pClass == PC_ROGUE) @@ -1242,7 +1242,7 @@ void CheckInvPaste(int pnum, int mx, int my) cn = CURSOR_HAND; switch (il) { case ILOC_HELM: - NetSendCmdChItem(FALSE, INVLOC_HEAD); + NetSendCmdChItem(false, INVLOC_HEAD); if (plr[pnum].InvBody[INVLOC_HEAD].isEmpty()) plr[pnum].InvBody[INVLOC_HEAD] = plr[pnum].HoldItem; else @@ -1250,13 +1250,13 @@ void CheckInvPaste(int pnum, int mx, int my) break; case ILOC_RING: if (r == SLOTXY_RING_LEFT) { - NetSendCmdChItem(FALSE, INVLOC_RING_LEFT); + NetSendCmdChItem(false, INVLOC_RING_LEFT); if (plr[pnum].InvBody[INVLOC_RING_LEFT].isEmpty()) plr[pnum].InvBody[INVLOC_RING_LEFT] = plr[pnum].HoldItem; else cn = SwapItem(&plr[pnum].InvBody[INVLOC_RING_LEFT], &plr[pnum].HoldItem); } else { - NetSendCmdChItem(FALSE, INVLOC_RING_RIGHT); + NetSendCmdChItem(false, INVLOC_RING_RIGHT); if (plr[pnum].InvBody[INVLOC_RING_RIGHT].isEmpty()) plr[pnum].InvBody[INVLOC_RING_RIGHT] = plr[pnum].HoldItem; else @@ -1264,7 +1264,7 @@ void CheckInvPaste(int pnum, int mx, int my) } break; case ILOC_AMULET: - NetSendCmdChItem(FALSE, INVLOC_AMULET); + NetSendCmdChItem(false, INVLOC_AMULET); if (plr[pnum].InvBody[INVLOC_AMULET].isEmpty()) plr[pnum].InvBody[INVLOC_AMULET] = plr[pnum].HoldItem; else @@ -1275,22 +1275,22 @@ void CheckInvPaste(int pnum, int mx, int my) if (plr[pnum].InvBody[INVLOC_HAND_LEFT].isEmpty()) { if ((plr[pnum].InvBody[INVLOC_HAND_RIGHT].isEmpty() || plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iClass != plr[pnum].HoldItem._iClass) || (plr[pnum]._pClass == PC_BARD && plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iClass == ICLASS_WEAPON && plr[pnum].HoldItem._iClass == ICLASS_WEAPON)) { - NetSendCmdChItem(FALSE, INVLOC_HAND_LEFT); + NetSendCmdChItem(false, INVLOC_HAND_LEFT); plr[pnum].InvBody[INVLOC_HAND_LEFT] = plr[pnum].HoldItem; } else { - NetSendCmdChItem(FALSE, INVLOC_HAND_RIGHT); + NetSendCmdChItem(false, INVLOC_HAND_RIGHT); cn = SwapItem(&plr[pnum].InvBody[INVLOC_HAND_RIGHT], &plr[pnum].HoldItem); } break; } if ((plr[pnum].InvBody[INVLOC_HAND_RIGHT].isEmpty() || plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iClass != plr[pnum].HoldItem._iClass) || (plr[pnum]._pClass == PC_BARD && plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iClass == ICLASS_WEAPON && plr[pnum].HoldItem._iClass == ICLASS_WEAPON)) { - NetSendCmdChItem(FALSE, INVLOC_HAND_LEFT); + NetSendCmdChItem(false, INVLOC_HAND_LEFT); cn = SwapItem(&plr[pnum].InvBody[INVLOC_HAND_LEFT], &plr[pnum].HoldItem); break; } - NetSendCmdChItem(FALSE, INVLOC_HAND_RIGHT); + NetSendCmdChItem(false, INVLOC_HAND_RIGHT); cn = SwapItem(&plr[pnum].InvBody[INVLOC_HAND_RIGHT], &plr[pnum].HoldItem); break; } @@ -1299,16 +1299,16 @@ void CheckInvPaste(int pnum, int mx, int my) || (plr[pnum]._pClass == PC_BARBARIAN && (plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype == ITYPE_SWORD || plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype == ITYPE_MACE))) { if ((plr[pnum].InvBody[INVLOC_HAND_LEFT].isEmpty() || plr[pnum].InvBody[INVLOC_HAND_LEFT]._iClass != plr[pnum].HoldItem._iClass) || (plr[pnum]._pClass == PC_BARD && plr[pnum].InvBody[INVLOC_HAND_LEFT]._iClass == ICLASS_WEAPON && plr[pnum].HoldItem._iClass == ICLASS_WEAPON)) { - NetSendCmdChItem(FALSE, INVLOC_HAND_RIGHT); + NetSendCmdChItem(false, INVLOC_HAND_RIGHT); plr[pnum].InvBody[INVLOC_HAND_RIGHT] = plr[pnum].HoldItem; break; } - NetSendCmdChItem(FALSE, INVLOC_HAND_LEFT); + NetSendCmdChItem(false, INVLOC_HAND_LEFT); cn = SwapItem(&plr[pnum].InvBody[INVLOC_HAND_LEFT], &plr[pnum].HoldItem); break; } - NetSendCmdDelItem(FALSE, INVLOC_HAND_LEFT); - NetSendCmdChItem(FALSE, INVLOC_HAND_RIGHT); + NetSendCmdDelItem(false, INVLOC_HAND_LEFT); + NetSendCmdChItem(false, INVLOC_HAND_RIGHT); SwapItem(&plr[pnum].InvBody[INVLOC_HAND_RIGHT], &plr[pnum].InvBody[INVLOC_HAND_LEFT]); cn = SwapItem(&plr[pnum].InvBody[INVLOC_HAND_RIGHT], &plr[pnum].HoldItem); break; @@ -1316,15 +1316,15 @@ void CheckInvPaste(int pnum, int mx, int my) if ((!plr[pnum].InvBody[INVLOC_HAND_LEFT].isEmpty() && plr[pnum].InvBody[INVLOC_HAND_LEFT]._iClass == plr[pnum].HoldItem._iClass) && !(plr[pnum]._pClass == PC_BARD && plr[pnum].InvBody[INVLOC_HAND_LEFT]._iClass == ICLASS_WEAPON && plr[pnum].HoldItem._iClass == ICLASS_WEAPON)) { - NetSendCmdChItem(FALSE, INVLOC_HAND_LEFT); + NetSendCmdChItem(false, INVLOC_HAND_LEFT); cn = SwapItem(&plr[pnum].InvBody[INVLOC_HAND_LEFT], &plr[pnum].HoldItem); break; } - NetSendCmdChItem(FALSE, INVLOC_HAND_RIGHT); + NetSendCmdChItem(false, INVLOC_HAND_RIGHT); cn = SwapItem(&plr[pnum].InvBody[INVLOC_HAND_RIGHT], &plr[pnum].HoldItem); break; case ILOC_TWOHAND: - NetSendCmdDelItem(FALSE, INVLOC_HAND_RIGHT); + NetSendCmdDelItem(false, INVLOC_HAND_RIGHT); if (!plr[pnum].InvBody[INVLOC_HAND_LEFT].isEmpty() && !plr[pnum].InvBody[INVLOC_HAND_RIGHT].isEmpty()) { tempitem = plr[pnum].HoldItem; if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype == ITYPE_SHIELD) @@ -1351,12 +1351,12 @@ void CheckInvPaste(int pnum, int mx, int my) } if (!plr[pnum].InvBody[INVLOC_HAND_LEFT].isEmpty() || !plr[pnum].InvBody[INVLOC_HAND_RIGHT].isEmpty()) { - NetSendCmdChItem(FALSE, INVLOC_HAND_LEFT); + NetSendCmdChItem(false, INVLOC_HAND_LEFT); if (plr[pnum].InvBody[INVLOC_HAND_LEFT].isEmpty()) SwapItem(&plr[pnum].InvBody[INVLOC_HAND_LEFT], &plr[pnum].InvBody[INVLOC_HAND_RIGHT]); cn = SwapItem(&plr[pnum].InvBody[INVLOC_HAND_LEFT], &plr[pnum].HoldItem); } else { - NetSendCmdChItem(FALSE, INVLOC_HAND_LEFT); + NetSendCmdChItem(false, INVLOC_HAND_LEFT); plr[pnum].InvBody[INVLOC_HAND_LEFT] = plr[pnum].HoldItem; } if (plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype == ITYPE_STAFF && plr[pnum].InvBody[INVLOC_HAND_LEFT]._iSpell != SPL_NULL && plr[pnum].InvBody[INVLOC_HAND_LEFT]._iCharges > 0) { @@ -1366,7 +1366,7 @@ void CheckInvPaste(int pnum, int mx, int my) } break; case ILOC_ARMOR: - NetSendCmdChItem(FALSE, INVLOC_CHEST); + NetSendCmdChItem(false, INVLOC_CHEST); if (plr[pnum].InvBody[INVLOC_CHEST].isEmpty()) plr[pnum].InvBody[INVLOC_CHEST] = plr[pnum].HoldItem; else @@ -1478,10 +1478,10 @@ void CheckInvPaste(int pnum, int mx, int my) if (plr[pnum].HoldItem._itype == ITYPE_GOLD) plr[pnum]._pGold = CalculateGold(pnum); } - drawsbarflag = TRUE; + drawsbarflag = true; break; } - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); if (pnum == myplr) { if (cn == CURSOR_HAND) SetCursorPos(MouseX + (cursW >> 1), MouseY + (cursH >> 1)); @@ -1500,7 +1500,7 @@ void CheckInvSwap(int pnum, BYTE bLoc, int idx, WORD wCI, int seed, bool bId, ui p->HoldItem = items[MAXITEMS]; if (bId) { - p->HoldItem._iIdentified = TRUE; + p->HoldItem._iIdentified = true; } if (bLoc < NUM_INVLOC) { @@ -1513,7 +1513,7 @@ void CheckInvSwap(int pnum, BYTE bLoc, int idx, WORD wCI, int seed, bool bId, ui } } - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); } void CheckInvCut(int pnum, int mx, int my, bool automaticMove) @@ -1529,11 +1529,11 @@ void CheckInvCut(int pnum, int mx, int my, bool automaticMove) } if (dropGoldFlag) { - dropGoldFlag = FALSE; + dropGoldFlag = false; dropGoldValue = 0; } - done = FALSE; + done = false; for (r = 0; (DWORD)r < NUM_XY_SLOTS && !done; r++) { int xo = RIGHT_PANEL; @@ -1548,7 +1548,7 @@ void CheckInvCut(int pnum, int mx, int my, bool automaticMove) && mx < InvRect[r].X + xo + (INV_SLOT_SIZE_PX + 1) && my >= InvRect[r].Y + yo - (INV_SLOT_SIZE_PX + 1) && my < InvRect[r].Y + yo) { - done = TRUE; + done = true; r--; } } @@ -1574,7 +1574,7 @@ void CheckInvCut(int pnum, int mx, int my, bool automaticMove) } if (!automaticMove || automaticallyMoved) { - NetSendCmdDelItem(FALSE, INVLOC_HEAD); + NetSendCmdDelItem(false, INVLOC_HEAD); headItem._itype = ITYPE_NONE; } } @@ -1588,7 +1588,7 @@ void CheckInvCut(int pnum, int mx, int my, bool automaticMove) } if (!automaticMove || automaticallyMoved) { - NetSendCmdDelItem(FALSE, INVLOC_RING_LEFT); + NetSendCmdDelItem(false, INVLOC_RING_LEFT); leftRingItem._itype = ITYPE_NONE; } } @@ -1602,7 +1602,7 @@ void CheckInvCut(int pnum, int mx, int my, bool automaticMove) } if (!automaticMove || automaticallyMoved) { - NetSendCmdDelItem(FALSE, INVLOC_RING_RIGHT); + NetSendCmdDelItem(false, INVLOC_RING_RIGHT); rightRingItem._itype = ITYPE_NONE; } } @@ -1616,7 +1616,7 @@ void CheckInvCut(int pnum, int mx, int my, bool automaticMove) } if (!automaticMove || automaticallyMoved) { - NetSendCmdDelItem(FALSE, INVLOC_AMULET); + NetSendCmdDelItem(false, INVLOC_AMULET); amuletItem._itype = ITYPE_NONE; } } @@ -1630,7 +1630,7 @@ void CheckInvCut(int pnum, int mx, int my, bool automaticMove) } if (!automaticMove || automaticallyMoved) { - NetSendCmdDelItem(FALSE, INVLOC_HAND_LEFT); + NetSendCmdDelItem(false, INVLOC_HAND_LEFT); leftHandItem._itype = ITYPE_NONE; } } @@ -1644,7 +1644,7 @@ void CheckInvCut(int pnum, int mx, int my, bool automaticMove) } if (!automaticMove || automaticallyMoved) { - NetSendCmdDelItem(FALSE, INVLOC_HAND_RIGHT); + NetSendCmdDelItem(false, INVLOC_HAND_RIGHT); rightHandItem._itype = ITYPE_NONE; } } @@ -1658,7 +1658,7 @@ void CheckInvCut(int pnum, int mx, int my, bool automaticMove) } if (!automaticMove || automaticallyMoved) { - NetSendCmdDelItem(FALSE, INVLOC_CHEST); + NetSendCmdDelItem(false, INVLOC_CHEST); chestItem._itype = ITYPE_NONE; } } @@ -1718,7 +1718,7 @@ void CheckInvCut(int pnum, int mx, int my, bool automaticMove) if (!automaticMove || automaticallyMoved) { beltItem._itype = ITYPE_NONE; - drawsbarflag = TRUE; + drawsbarflag = true; } } } @@ -1728,7 +1728,7 @@ void CheckInvCut(int pnum, int mx, int my, bool automaticMove) player._pGold = CalculateGold(pnum); } - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); CheckItemStats(pnum); if (pnum == myplr) { @@ -1797,9 +1797,9 @@ void inv_update_rem_item(int pnum, BYTE iv) } if (plr[pnum]._pmode != PM_DEATH) { - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); } else { - CalcPlrInv(pnum, FALSE); + CalcPlrInv(pnum, false); } } @@ -1866,12 +1866,12 @@ void CheckItemStats(int pnum) { PlayerStruct *p = &plr[pnum]; - p->HoldItem._iStatFlag = FALSE; + p->HoldItem._iStatFlag = false; if (p->_pStrength >= p->HoldItem._iMinStr && p->_pMagic >= p->HoldItem._iMinMag && p->_pDexterity >= p->HoldItem._iMinDex) { - p->HoldItem._iStatFlag = TRUE; + p->HoldItem._iStatFlag = true; } } @@ -1919,7 +1919,7 @@ void CheckQuestItem(int pnum) quests[Q_ANVIL]._qactive = QUEST_ACTIVE; quests[Q_ANVIL]._qvar1 = 1; } - if (quests[Q_ANVIL]._qlog == TRUE) { + if (quests[Q_ANVIL]._qlog == true) { sfxdelay = 10; if (plr[myplr]._pClass == PC_WARRIOR) { sfxdnum = PS_WARR89; @@ -1957,7 +1957,7 @@ void CheckQuestItem(int pnum) quests[Q_ROCK]._qactive = QUEST_ACTIVE; quests[Q_ROCK]._qvar1 = 1; } - if (quests[Q_ROCK]._qlog == TRUE) { + if (quests[Q_ROCK]._qlog == true) { sfxdelay = 10; if (plr[myplr]._pClass == PC_WARRIOR) { sfxdnum = PS_WARR87; @@ -1992,7 +1992,7 @@ void CheckQuestItem(int pnum) } } if (plr[pnum].HoldItem.IDidx == IDI_MAPOFDOOM) { - quests[Q_GRAVE]._qlog = FALSE; + quests[Q_GRAVE]._qlog = false; quests[Q_GRAVE]._qactive = QUEST_ACTIVE; quests[Q_GRAVE]._qvar1 = 1; sfxdelay = 10; @@ -2077,9 +2077,9 @@ void CleanupItems(ItemStruct *item, int ii) CornerStone.item._iSelFlag = 0; CornerStone.item._ix = 0; CornerStone.item._iy = 0; - CornerStone.item._iAnimFlag = FALSE; - CornerStone.item._iIdentified = FALSE; - CornerStone.item._iPostDraw = FALSE; + CornerStone.item._iAnimFlag = false; + CornerStone.item._iIdentified = false; + CornerStone.item._iPostDraw = false; } int i = 0; @@ -2097,7 +2097,7 @@ void CleanupItems(ItemStruct *item, int ii) void InvGetItem(int pnum, ItemStruct *item, int ii) { if (dropGoldFlag) { - dropGoldFlag = FALSE; + dropGoldFlag = false; dropGoldValue = 0; } @@ -2105,7 +2105,7 @@ void InvGetItem(int pnum, ItemStruct *item, int ii) return; if (myplr == pnum && pcurs >= CURSOR_FIRSTITEM) - NetSendCmdPItem(TRUE, CMD_SYNCPUTITEM, plr[myplr]._px, plr[myplr]._py); + NetSendCmdPItem(true, CMD_SYNCPUTITEM, plr[myplr]._px, plr[myplr]._py); item->_iCreateInfo &= ~CF_PREGEN; plr[pnum].HoldItem = *item; @@ -2132,7 +2132,7 @@ void AutoGetItem(int pnum, ItemStruct *item, int ii) } if (dropGoldFlag) { - dropGoldFlag = FALSE; + dropGoldFlag = false; dropGoldValue = 0; } @@ -2157,7 +2157,7 @@ void AutoGetItem(int pnum, ItemStruct *item, int ii) done = AutoPlaceItemInBelt(pnum, plr[pnum].HoldItem, true); } if (!done) { - done = AutoPlaceItemInInventory(pnum, plr[pnum].HoldItem, TRUE); + done = AutoPlaceItemInInventory(pnum, plr[pnum].HoldItem, true); } } @@ -2182,8 +2182,8 @@ void AutoGetItem(int pnum, ItemStruct *item, int ii) } } plr[pnum].HoldItem = *item; - RespawnItem(item, TRUE); - NetSendCmdPItem(TRUE, CMD_RESPAWNITEM, item->_ix, item->_iy); + RespawnItem(item, true); + NetSendCmdPItem(true, CMD_RESPAWNITEM, item->_ix, item->_iy); plr[pnum].HoldItem._itype = ITYPE_NONE; } @@ -2237,36 +2237,36 @@ bool CanPut(int x, int y) char oi, oi2; if (dItem[x][y]) - return FALSE; + return false; if (nSolidTable[dPiece[x][y]]) - return FALSE; + return false; if (dObject[x][y] != 0) { if (object[dObject[x][y] > 0 ? dObject[x][y] - 1 : -(dObject[x][y] + 1)]._oSolidFlag) - return FALSE; + return false; } oi = dObject[x + 1][y + 1]; if (oi > 0 && object[oi - 1]._oSelFlag != 0) { - return FALSE; + return false; } if (oi < 0 && object[-(oi + 1)]._oSelFlag != 0) { - return FALSE; + return false; } oi = dObject[x + 1][y]; if (oi > 0) { oi2 = dObject[x][y + 1]; if (oi2 > 0 && object[oi - 1]._oSelFlag != 0 && object[oi2 - 1]._oSelFlag != 0) - return FALSE; + return false; } if (currlevel == 0 && dMonster[x][y] != 0) - return FALSE; + return false; if (currlevel == 0 && dMonster[x + 1][y + 1] != 0) - return FALSE; + return false; - return TRUE; + return true; } bool TryInvPut() @@ -2274,21 +2274,21 @@ bool TryInvPut() int dir; if (numitems >= MAXITEMS) - return FALSE; + return false; dir = GetDirection(plr[myplr]._px, plr[myplr]._py, cursmx, cursmy); if (CanPut(plr[myplr]._px + offset_x[dir], plr[myplr]._py + offset_y[dir])) { - return TRUE; + return true; } dir = (dir - 1) & 7; if (CanPut(plr[myplr]._px + offset_x[dir], plr[myplr]._py + offset_y[dir])) { - return TRUE; + return true; } dir = (dir + 2) & 7; if (CanPut(plr[myplr]._px + offset_x[dir], plr[myplr]._py + offset_y[dir])) { - return TRUE; + return true; } return CanPut(plr[myplr]._px, plr[myplr]._py); @@ -2332,14 +2332,14 @@ int InvPutItem(int pnum, int x, int y) x = plr[pnum]._px + offset_x[d]; y = plr[pnum]._py + offset_y[d]; if (!CanPut(x, y)) { - done = FALSE; + done = false; for (l = 1; l < 50 && !done; l++) { for (j = -l; j <= l && !done; j++) { yp = j + plr[pnum]._py; for (i = -l; i <= l && !done; i++) { xp = i + plr[pnum]._px; if (CanPut(xp, yp)) { - done = TRUE; + done = true; x = xp; y = yp; } @@ -2359,16 +2359,16 @@ int InvPutItem(int pnum, int x, int y) NetSendCmdLocParam2(0, CMD_OPENHIVE, plr[pnum]._px, plr[pnum]._py, xx, yy); quests[Q_FARMER]._qactive = 3; if (gbIsMultiplayer) { - NetSendCmdQuest(TRUE, Q_FARMER); + NetSendCmdQuest(true, Q_FARMER); return -1; } return -1; } if (plr[pnum].HoldItem.IDidx == IDI_MAPOFDOOM && xp >= 35 && xp <= 38 && yp >= 20 && yp <= 24) { - NetSendCmd(FALSE, CMD_OPENCRYPT); + NetSendCmd(false, CMD_OPENCRYPT); quests[Q_GRAVE]._qactive = 3; if (gbIsMultiplayer) { - NetSendCmdQuest(TRUE, Q_GRAVE); + NetSendCmdQuest(true, Q_GRAVE); } return -1; } @@ -2382,7 +2382,7 @@ int InvPutItem(int pnum, int x, int y) items[ii] = plr[pnum].HoldItem; items[ii]._ix = x; items[ii]._iy = y; - RespawnItem(&items[ii], TRUE); + RespawnItem(&items[ii], true); if (currlevel == 21 && x == CornerStone.x && y == CornerStone.y) { CornerStone.item = items[ii]; @@ -2422,14 +2422,14 @@ int SyncPutItem(int pnum, int x, int y, int idx, WORD icreateinfo, int iseed, in x = plr[pnum]._px + offset_x[d]; y = plr[pnum]._py + offset_y[d]; if (!CanPut(x, y)) { - done = FALSE; + done = false; for (l = 1; l < 50 && !done; l++) { for (j = -l; j <= l && !done; j++) { yp = j + plr[pnum]._py; for (i = -l; i <= l && !done; i++) { xp = i + plr[pnum]._px; if (CanPut(xp, yp)) { - done = TRUE; + done = true; x = xp; y = yp; } @@ -2453,7 +2453,7 @@ int SyncPutItem(int pnum, int x, int y, int idx, WORD icreateinfo, int iseed, in } else { RecreateItem(ii, idx, icreateinfo, iseed, ivalue, (ibuff & CF_HELLFIRE) != 0); if (Id) - items[ii]._iIdentified = TRUE; + items[ii]._iIdentified = true; items[ii]._iDurability = dur; items[ii]._iMaxDur = mdur; items[ii]._iCharges = ch; @@ -2469,7 +2469,7 @@ int SyncPutItem(int pnum, int x, int y, int idx, WORD icreateinfo, int iseed, in items[ii]._ix = x; items[ii]._iy = y; - RespawnItem(&items[ii], TRUE); + RespawnItem(&items[ii], true); if (currlevel == 21 && x == CornerStone.x && y == CornerStone.y) { CornerStone.item = items[ii]; @@ -2547,7 +2547,7 @@ char CheckInvHLight() pi = &p->InvList[ii]; } else if (r >= SLOTXY_BELT_FIRST) { r -= SLOTXY_BELT_FIRST; - drawsbarflag = TRUE; + drawsbarflag = true; pi = &p->SpdList[r]; if (pi->isEmpty()) return -1; @@ -2607,26 +2607,26 @@ bool UseScroll() int i; if (pcurs != CURSOR_HAND) - return FALSE; + return false; if (leveltype == DTYPE_TOWN && !spelldata[plr[myplr]._pRSpell].sTownSpell) - return FALSE; + return false; for (i = 0; i < plr[myplr]._pNumInv; i++) { if (!plr[myplr].InvList[i].isEmpty() && (plr[myplr].InvList[i]._iMiscId == IMISC_SCROLL || plr[myplr].InvList[i]._iMiscId == IMISC_SCROLLT) && plr[myplr].InvList[i]._iSpell == plr[myplr]._pRSpell) { - return TRUE; + return true; } } for (i = 0; i < MAXBELTITEMS; i++) { if (!plr[myplr].SpdList[i].isEmpty() && (plr[myplr].SpdList[i]._iMiscId == IMISC_SCROLL || plr[myplr].SpdList[i]._iMiscId == IMISC_SCROLLT) && plr[myplr].SpdList[i]._iSpell == plr[myplr]._pRSpell) { - return TRUE; + return true; } } - return FALSE; + return false; } void UseStaffCharge(int pnum) @@ -2649,11 +2649,11 @@ bool UseStaff() && (plr[myplr].InvBody[INVLOC_HAND_LEFT]._iMiscId == IMISC_STAFF || plr[myplr].InvBody[INVLOC_HAND_LEFT]._iMiscId == IMISC_UNIQUE) && plr[myplr].InvBody[INVLOC_HAND_LEFT]._iSpell == plr[myplr]._pRSpell && plr[myplr].InvBody[INVLOC_HAND_LEFT]._iCharges > 0) { - return TRUE; + return true; } } - return FALSE; + return false; } void StartGoldDrop() @@ -2663,7 +2663,7 @@ void StartGoldDrop() initialDropGoldValue = plr[myplr].InvList[pcursinvitem - INVITEM_INV_FIRST]._ivalue; else initialDropGoldValue = plr[myplr].SpdList[pcursinvitem - INVITEM_BELT_FIRST]._ivalue; - dropGoldFlag = TRUE; + dropGoldFlag = true; dropGoldValue = 0; if (talkflag) control_reset_talk(); @@ -2676,24 +2676,24 @@ bool UseInvItem(int pnum, int cii) bool speedlist; if (plr[pnum]._pInvincible && plr[pnum]._pHitPoints == 0 && pnum == myplr) - return TRUE; + return true; if (pcurs != CURSOR_HAND) - return TRUE; + return true; if (stextflag != STORE_NONE) - return TRUE; + return true; if (cii < INVITEM_INV_FIRST) - return FALSE; + return false; if (cii <= INVITEM_INV_LAST) { c = cii - INVITEM_INV_FIRST; Item = &plr[pnum].InvList[c]; - speedlist = FALSE; + speedlist = false; } else { if (talkflag) - return TRUE; + return true; c = cii - INVITEM_BELT_FIRST; Item = &plr[pnum].SpdList[c]; - speedlist = TRUE; + speedlist = true; } switch (Item->IDidx) { @@ -2712,7 +2712,7 @@ bool UseInvItem(int pnum, int cii) } else if (plr[pnum]._pClass == PC_BARBARIAN) { sfxdnum = PS_WARR95; } - return TRUE; + return true; case IDI_FUNGALTM: PlaySFX(IS_IBOOK); sfxdelay = 10; @@ -2729,11 +2729,11 @@ bool UseInvItem(int pnum, int cii) } else if (plr[pnum]._pClass == PC_BARBARIAN) { sfxdnum = PS_WARR29; } - return TRUE; + return true; } if (!AllItemsList[Item->IDidx].iUsable) - return FALSE; + return false; if (!Item->_iStatFlag) { if (plr[pnum]._pClass == PC_WARRIOR) { @@ -2749,29 +2749,29 @@ bool UseInvItem(int pnum, int cii) } else if (plr[pnum]._pClass == PC_BARBARIAN) { PlaySFX(PS_WARR13); } - return TRUE; + return true; } if (Item->_iMiscId == IMISC_NONE && Item->_itype == ITYPE_GOLD) { StartGoldDrop(); - return TRUE; + return true; } if (dropGoldFlag) { - dropGoldFlag = FALSE; + dropGoldFlag = false; dropGoldValue = 0; } if (Item->_iMiscId == IMISC_SCROLL && currlevel == 0 && !spelldata[Item->_iSpell].sTownSpell) { - return TRUE; + return true; } if (Item->_iMiscId == IMISC_SCROLLT && currlevel == 0 && !spelldata[Item->_iSpell].sTownSpell) { - return TRUE; + return true; } if (Item->_iMiscId > IMISC_RUNEFIRST && Item->_iMiscId < IMISC_RUNELAST && currlevel == 0) { - return TRUE; + return true; } idata = ItemCAnimTbl[Item->_iCurs]; @@ -2785,32 +2785,32 @@ bool UseInvItem(int pnum, int cii) if (speedlist) { if (plr[pnum].SpdList[c]._iMiscId == IMISC_NOTE) { InitQTextMsg(TEXT_BOOK9); - invflag = FALSE; - return TRUE; + invflag = false; + return true; } RemoveSpdBarItem(pnum, c); - return TRUE; + return true; } else { if (plr[pnum].InvList[c]._iMiscId == IMISC_MAPOFDOOM) - return TRUE; + return true; if (plr[pnum].InvList[c]._iMiscId == IMISC_NOTE) { InitQTextMsg(TEXT_BOOK9); - invflag = FALSE; - return TRUE; + invflag = false; + return true; } RemoveInvItem(pnum, c); } - return TRUE; + return true; } void DoTelekinesis() { if (pcursobj != -1) - NetSendCmdParam1(TRUE, CMD_OPOBJT, pcursobj); + NetSendCmdParam1(true, CMD_OPOBJT, pcursobj); if (pcursitem != -1) - NetSendCmdGItem(TRUE, CMD_REQUESTAGITEM, myplr, myplr, pcursitem); + NetSendCmdGItem(true, CMD_REQUESTAGITEM, myplr, myplr, pcursitem); if (pcursmonst != -1 && !M_Talker(pcursmonst) && monster[pcursmonst].mtalkmsg == 0) - NetSendCmdParam1(TRUE, CMD_KNOCKBACK, pcursmonst); + NetSendCmdParam1(true, CMD_KNOCKBACK, pcursmonst); NewCursor(CURSOR_HAND); } @@ -2836,12 +2836,12 @@ int CalculateGold(int pnum) bool DropItemBeforeTrig() { if (TryInvPut()) { - NetSendCmdPItem(TRUE, CMD_PUTITEM, cursmx, cursmy); + NetSendCmdPItem(true, CMD_PUTITEM, cursmx, cursmy); NewCursor(CURSOR_HAND); - return TRUE; + return true; } - return FALSE; + return false; } } // namespace devilution diff --git a/Source/itemdat.cpp b/Source/itemdat.cpp index f94a1d3d..76cab673 100644 --- a/Source/itemdat.cpp +++ b/Source/itemdat.cpp @@ -11,174 +11,174 @@ namespace devilution { ItemDataStruct AllItemsList[] = { // clang-format off //_item_indexes iRnd, iClass, iLoc, iCurs, itype, iItemId, iName, iSName, iMinMLvl, iDurability, iMinDam, iMaxDam, iMinAC, iMaxAC, iMinStr, iMinMag, iMinDex, iFlags, iMiscId, iSpell, iUsable, iValue, iMaxValue -/*IDI_GOLD */ { IDROP_REGULAR, ICLASS_GOLD, ILOC_UNEQUIPABLE, ICURS_GOLD, ITYPE_GOLD, UITYPE_NONE, "Gold", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, TRUE, 0, 0 }, -/*IDI_WARRIOR */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SHORT_SWORD, ITYPE_SWORD, UITYPE_NONE, "Short Sword", NULL, 2, 20, 2, 6, 0, 0, 18, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 50, 50 }, -/*IDI_WARRSHLD */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_BUCKLER, ITYPE_SHIELD, UITYPE_NONE, "Buckler", NULL, 2, 10, 0, 0, 3, 3, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 50, 50 }, -/*IDI_WARRCLUB */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_CLUB, ITYPE_MACE, UITYPE_SPIKCLUB, "Club", NULL, 1, 20, 1, 6, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 20, 20 }, -/*IDI_ROGUE */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_BOW, ITYPE_BOW, UITYPE_NONE, "Short Bow", NULL, 1, 30, 1, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 100, 100 }, -/*IDI_SORCERER */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_NONE, "Short Staff of Mana", NULL, 1, 25, 2, 4, 0, 0, 0, 20, 0, ISPL_NONE, IMISC_STAFF, SPL_MANA, FALSE, 520, 520 }, -/*IDI_CLEAVER */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_CLEAVER, ITYPE_AXE, UITYPE_CLEAVER, "Cleaver", NULL, 10, 10, 4, 24, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, FALSE, 2000, 2000 }, -/*IDI_SKCROWN */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_HELM, ICURS_THE_UNDEAD_CROWN, ITYPE_HELM, UITYPE_SKCROWN, "The Undead Crown", NULL, 0, 50, 0, 0, 15, 15, 0, 0, 0, ISPL_RNDSTEALLIFE, IMISC_UNIQUE, SPL_NULL, FALSE, 10000, 10000 }, -/*IDI_INFRARING */ { IDROP_NEVER, ICLASS_MISC, ILOC_RING, ICURS_EMPYREAN_BAND, ITYPE_RING, UITYPE_INFRARING, "Empyrean Band", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, FALSE, 8000, 8000 }, -/*IDI_ROCK */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_MAGIC_ROCK, ITYPE_MISC, UITYPE_NONE, "Magic Rock", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_OPTAMULET */ { IDROP_NEVER, ICLASS_MISC, ILOC_AMULET, ICURS_OPTIC_AMULET, ITYPE_AMULET, UITYPE_OPTAMULET, "Optic Amulet", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, FALSE, 5000, 5000 }, -/*IDI_TRING */ { IDROP_NEVER, ICLASS_MISC, ILOC_RING, ICURS_RING_OF_TRUTH, ITYPE_RING, UITYPE_TRING, "Ring of Truth", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, FALSE, 1000, 1000 }, -/*IDI_BANNER */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_TAVERN_SIGN, ITYPE_MISC, UITYPE_NONE, "Tavern Sign", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_HARCREST */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_HELM, ICURS_HARLEQUIN_CREST, ITYPE_HELM, UITYPE_HARCREST, "Harlequin Crest", NULL, 0, 15, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, FALSE, 15, 20 }, -/*IDI_STEELVEIL */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_HELM, ICURS_VIEL_OF_STEEL, ITYPE_HELM, UITYPE_STEELVEIL, "Veil of Steel", NULL, 0, 60, 0, 0, 18, 18, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_GLDNELIX */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_GOLDEN_ELIXIR, ITYPE_MISC, UITYPE_ELIXIR, "Golden Elixir", NULL, 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_ANVIL */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_ANVIL_OF_FURY, ITYPE_MISC, UITYPE_NONE, "Anvil of Fury", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_MUSHROOM */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_BLACK_MUSHROOM, ITYPE_MISC, UITYPE_NONE, "Black Mushroom", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_BRAIN */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_BRAIN, ITYPE_MISC, UITYPE_NONE, "Brain", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_FUNGALTM */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_FUNGAL_TOME, ITYPE_MISC, UITYPE_NONE, "Fungal Tome", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_SPECELIX */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SPECTRAL_ELIXIR, ITYPE_MISC, UITYPE_ELIXIR, "Spectral Elixir", NULL, 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SPECELIX, SPL_NULL, FALSE, 0, 0 }, -/*IDI_BLDSTONE */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_BLOOD_STONE, ITYPE_MISC, UITYPE_NONE, "Blood Stone", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_MAPOFDOOM */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_MAP_OF_THE_STARS, ITYPE_MISC, UITYPE_MAPOFDOOM, "Cathedral Map", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_MAPOFDOOM, SPL_NULL, TRUE, 0, 0 }, -/*IDI_EAR */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_EAR_SORCERER, ITYPE_MISC, UITYPE_NONE, "Heart", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_EAR, SPL_NULL, FALSE, 0, 0 }, -/*IDI_HEAL */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_HEALING, ITYPE_MISC, UITYPE_NONE, "Potion of Healing", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_HEAL, SPL_NULL, TRUE, 50, 50 }, -/*IDI_MANA */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_MANA, ITYPE_MISC, UITYPE_NONE, "Potion of Mana", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_MANA, SPL_NULL, TRUE, 50, 50 }, -/*IDI_IDENTIFY */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Identify", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_IDENTIFY, TRUE, 200, 200 }, -/*IDI_PORTAL */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Town Portal", NULL, 4, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_TOWN, TRUE, 200, 200 }, -/*IDI_ARMOFVAL */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_ARMOR, ICURS_ARKAINES_VALOR, ITYPE_MARMOR, UITYPE_ARMOFVAL, "Arkaine's Valor", NULL, 0, 40, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_FULLHEAL */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_FULL_HEALING, ITYPE_MISC, UITYPE_NONE, "Potion of Full Healing", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_FULLHEAL, SPL_NULL, TRUE, 150, 150 }, -/*IDI_FULLMANA */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_FULL_MANA, ITYPE_MISC, UITYPE_NONE, "Potion of Full Mana", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_FULLMANA, SPL_NULL, TRUE, 150, 150 }, -/*IDI_GRISWOLD */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_BROAD_SWORD, ITYPE_SWORD, UITYPE_GRISWOLD, "Griswold's Edge", NULL, 8, 50, 4, 12, 0, 0, 40, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, FALSE, 750, 750 }, -/*IDI_LGTFORGE */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_ARMOR, ICURS_BOVINE, ITYPE_HARMOR, UITYPE_BOVINE, "Bovine Plate", NULL, 0, 40, 0, 0, 0, 0, 50, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_LAZSTAFF */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_STAFF_OF_LAZARUS, ITYPE_MISC, UITYPE_LAZSTAFF, "Staff of Lazarus", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_RESURRECT */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Resurrect", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLLT, SPL_RESURRECT, TRUE, 250, 250 }, -/*IDI_OIL */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_OIL, ITYPE_MISC, UITYPE_NONE, "Blacksmith Oil", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_OILBSMTH, SPL_NULL, TRUE, 100, 100 }, -/*IDI_SHORTSTAFF */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_NONE, "Short Staff", NULL, 1, 25, 2, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 20, 20 }, -/*IDI_BARDSWORD */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SHORT_SWORD, ITYPE_SWORD, UITYPE_NONE, "Sword", NULL, 2, 8, 1, 5, 0, 0, 15, 0, 20, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 20, 20 }, -/*IDI_BARDDAGGER */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_DAGGER, ITYPE_SWORD, UITYPE_NONE, "Dagger", NULL, 1, 16, 1, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 20, 20 }, -/*IDI_RUNEBOMB */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_RUNE_BOMB, ITYPE_MISC, UITYPE_NONE, "Rune Bomb", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_THEODORE */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_THEODORE, ITYPE_MISC, UITYPE_NONE, "Theodore", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_AURIC */ { IDROP_NEVER, ICLASS_MISC, ILOC_AMULET, ICURS_AURIC_AMULET, ITYPE_MISC, UITYPE_NONE, "Auric Amulet", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_AURIC, SPL_NULL, FALSE, 100, 100 }, -/*IDI_NOTE1 */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_TORN_NOTE_1, ITYPE_MISC, UITYPE_NONE, "Torn Note 1", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_NOTE2 */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_TORN_NOTE_2, ITYPE_MISC, UITYPE_NONE, "Torn Note 2", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_NOTE3 */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_TORN_NOTE_3, ITYPE_MISC, UITYPE_NONE, "Torn Note 3", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_FULLNOTE */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_RECONSTRUCTED_NOTE, ITYPE_MISC, UITYPE_NONE, "Reconstructed Note", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NOTE, SPL_NULL, TRUE, 0, 0 }, -/*IDI_BROWNSUIT */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_BROWN_SUIT, ITYPE_MISC, UITYPE_NONE, "Brown Suit", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/*IDI_GREYSUIT */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_GREY_SUIT, ITYPE_MISC, UITYPE_NONE, "Grey Suit", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_CAP, ITYPE_HELM, UITYPE_NONE, "Cap", "Cap", 1, 15, 0, 0, 1, 3, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 15, 20 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_SKULL_CAP, ITYPE_HELM, UITYPE_SKULLCAP, "Skull Cap", "Cap", 4, 20, 0, 0, 2, 4, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 25, 30 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_HELM, ITYPE_HELM, UITYPE_HELM, "Helm", "Helm", 8, 30, 0, 0, 4, 6, 25, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 40, 70 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_FULL_HELM, ITYPE_HELM, UITYPE_NONE, "Full Helm", "Helm", 12, 35, 0, 0, 6, 8, 35, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 90, 130 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_CROWN, ITYPE_HELM, UITYPE_CROWN, "Crown", "Crown", 16, 40, 0, 0, 8, 12, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 200, 300 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_GREAT_HELM, ITYPE_HELM, UITYPE_GREATHELM, "Great Helm", "Helm", 20, 60, 0, 0, 10, 15, 50, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 400, 500 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_CAPE, ITYPE_LARMOR, UITYPE_CAPE, "Cape", "Cape", 1, 12, 0, 0, 1, 5, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 10, 50 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_RAGS, ITYPE_LARMOR, UITYPE_RAGS, "Rags", "Rags", 1, 6, 0, 0, 2, 6, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 5, 25 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_CLOAK, ITYPE_LARMOR, UITYPE_CLOAK, "Cloak", "Cloak", 2, 18, 0, 0, 3, 7, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 40, 70 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_ROBE, ITYPE_LARMOR, UITYPE_ROBE, "Robe", "Robe", 3, 24, 0, 0, 4, 7, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 75, 125 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_QUILTED_ARMOR, ITYPE_LARMOR, UITYPE_NONE, "Quilted Armor", "Armor", 4, 30, 0, 0, 7, 10, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 200, 300 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_LEATHER_ARMOR, ITYPE_LARMOR, UITYPE_LEATHARMOR, "Leather Armor", "Armor", 6, 35, 0, 0, 10, 13, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 300, 400 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_HARD_LEATHER_ARMOR, ITYPE_LARMOR, UITYPE_NONE, "Hard Leather Armor", "Armor", 7, 40, 0, 0, 11, 14, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 450, 550 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_STUDDED_LEATHER_ARMOR, ITYPE_LARMOR, UITYPE_STUDARMOR, "Studded Leather Armor", "Armor", 9, 45, 0, 0, 15, 17, 20, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 700, 800 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_RING_MAIL, ITYPE_MARMOR, UITYPE_NONE, "Ring Mail", "Mail", 11, 50, 0, 0, 17, 20, 25, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 900, 1100 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_CHAIN_MAIL, ITYPE_MARMOR, UITYPE_CHAINMAIL, "Chain Mail", "Mail", 13, 55, 0, 0, 18, 22, 30, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 1250, 1750 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_SCALE_MAIL, ITYPE_MARMOR, UITYPE_NONE, "Scale Mail", "Mail", 15, 60, 0, 0, 23, 28, 35, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 2300, 2800 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_BREAST_PLATE, ITYPE_HARMOR, UITYPE_BREASTPLATE, "Breast Plate", "Plate", 16, 80, 0, 0, 20, 24, 40, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 2800, 3200 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_SPLINT_MAIL, ITYPE_MARMOR, UITYPE_NONE, "Splint Mail", "Mail", 17, 65, 0, 0, 30, 35, 40, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 3250, 3750 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_FIELD_PLATE, ITYPE_HARMOR, UITYPE_PLATEMAIL, "Plate Mail", "Plate", 19, 75, 0, 0, 42, 50, 60, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 4600, 5400 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_FIELD_PLATE, ITYPE_HARMOR, UITYPE_NONE, "Field Plate", "Plate", 21, 80, 0, 0, 40, 45, 65, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 5800, 6200 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_GOTHIC_PLATE, ITYPE_HARMOR, UITYPE_NONE, "Gothic Plate", "Plate", 23, 100, 0, 0, 50, 60, 80, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 8000, 10000 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_FULL_PLATE_MAIL, ITYPE_HARMOR, UITYPE_FULLPLATE, "Full Plate Mail", "Plate", 25, 90, 0, 0, 60, 75, 90, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 6500, 8000 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_BUCKLER, ITYPE_SHIELD, UITYPE_BUCKLER, "Buckler", "Shield", 1, 16, 0, 0, 1, 5, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 30, 70 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_SMALL_SHIELD, ITYPE_SHIELD, UITYPE_SMALLSHIELD, "Small Shield", "Shield", 5, 24, 0, 0, 3, 8, 25, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 90, 130 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_LARGE_SHIELD, ITYPE_SHIELD, UITYPE_LARGESHIELD, "Large Shield", "Shield", 9, 32, 0, 0, 5, 10, 40, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 200, 300 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_KITE_SHIELD, ITYPE_SHIELD, UITYPE_KITESHIELD, "Kite Shield", "Shield", 14, 40, 0, 0, 8, 15, 50, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 400, 700 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_TOWER_SHIELD, ITYPE_SHIELD, UITYPE_GOTHSHIELD, "Tower Shield", "Shield", 20, 50, 0, 0, 12, 20, 60, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 850, 1200 }, -/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_GOTHIC_SHIELD, ITYPE_SHIELD, UITYPE_GOTHSHIELD, "Gothic Shield", "Shield", 23, 60, 0, 0, 14, 18, 80, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 2300, 2700 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_HEALING, ITYPE_MISC, UITYPE_NONE, "Potion of Healing", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_HEAL, SPL_NULL, TRUE, 50, 50 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_FULL_HEALING, ITYPE_MISC, UITYPE_NONE, "Potion of Full Healing", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_FULLHEAL, SPL_NULL, TRUE, 150, 150 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_MANA, ITYPE_MISC, UITYPE_NONE, "Potion of Mana", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_MANA, SPL_NULL, TRUE, 50, 50 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_FULL_MANA, ITYPE_MISC, UITYPE_NONE, "Potion of Full Mana", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_FULLMANA, SPL_NULL, TRUE, 150, 150 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_REJUVENATION, ITYPE_MISC, UITYPE_NONE, "Potion of Rejuvenation", NULL, 3, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_REJUV, SPL_NULL, TRUE, 120, 120 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_FULL_REJUVENATION, ITYPE_MISC, UITYPE_NONE, "Potion of Full Rejuvenation", NULL, 7, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_FULLREJUV, SPL_NULL, TRUE, 600, 600 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_OIL, ITYPE_MISC, UITYPE_NONE, "Blacksmith Oil", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_OILBSMTH, SPL_NULL, TRUE, 100, 100 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_OIL, ITYPE_MISC, UITYPE_NONE, "Oil of Accuracy", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_OILACC, SPL_NULL, TRUE, 500, 500 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_OIL, ITYPE_MISC, UITYPE_NONE, "Oil of Sharpness", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_OILSHARP, SPL_NULL, TRUE, 500, 500 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_OIL, ITYPE_MISC, UITYPE_NONE, "Oil", NULL, 10, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_OILOF, SPL_NULL, TRUE, 0, 0 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_ELIXIR_OF_STRENGTH, ITYPE_MISC, UITYPE_NONE, "Elixir of Strength", NULL, 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_ELIXSTR, SPL_NULL, TRUE, 5000, 5000 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_ELIXIR_OF_MAGIC, ITYPE_MISC, UITYPE_NONE, "Elixir of Magic", NULL, 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_ELIXMAG, SPL_NULL, TRUE, 5000, 5000 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_ELIXIR_OF_DEXTERITY, ITYPE_MISC, UITYPE_NONE, "Elixir of Dexterity", NULL, 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_ELIXDEX, SPL_NULL, TRUE, 5000, 5000 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_ELIXIR_OF_VITALITY, ITYPE_MISC, UITYPE_NONE, "Elixir of Vitality", NULL, 20, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_ELIXVIT, SPL_NULL, TRUE, 5000, 5000 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Healing", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_HEAL, TRUE, 50, 50 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Search", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_SEARCH, TRUE, 50, 50 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Lightning", NULL, 4, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLLT, SPL_LIGHTNING, TRUE, 150, 150 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Identify", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_IDENTIFY, TRUE, 100, 100 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Resurrect", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLLT, SPL_RESURRECT, TRUE, 250, 250 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Fire Wall", NULL, 4, 0, 0, 0, 0, 0, 0, 17, 0, ISPL_NONE, IMISC_SCROLLT, SPL_FIREWALL, TRUE, 400, 400 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Inferno", NULL, 1, 0, 0, 0, 0, 0, 0, 19, 0, ISPL_NONE, IMISC_SCROLLT, SPL_FLAME, TRUE, 100, 100 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Town Portal", NULL, 4, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_TOWN, TRUE, 200, 200 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Flash", NULL, 6, 0, 0, 0, 0, 0, 0, 21, 0, ISPL_NONE, IMISC_SCROLLT, SPL_FLASH, TRUE, 500, 500 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Infravision", NULL, 8, 0, 0, 0, 0, 0, 0, 23, 0, ISPL_NONE, IMISC_SCROLL, SPL_INFRA, TRUE, 600, 600 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Phasing", NULL, 6, 0, 0, 0, 0, 0, 0, 25, 0, ISPL_NONE, IMISC_SCROLL, SPL_RNDTELEPORT, TRUE, 200, 200 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Mana Shield", NULL, 8, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_MANASHIELD, TRUE, 1200, 1200 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Flame Wave", NULL, 10, 0, 0, 0, 0, 0, 0, 29, 0, ISPL_NONE, IMISC_SCROLLT, SPL_WAVE, TRUE, 650, 650 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Fireball", NULL, 8, 0, 0, 0, 0, 0, 0, 31, 0, ISPL_NONE, IMISC_SCROLLT, SPL_FIREBALL, TRUE, 300, 300 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Stone Curse", NULL, 6, 0, 0, 0, 0, 0, 0, 33, 0, ISPL_NONE, IMISC_SCROLLT, SPL_STONE, TRUE, 800, 800 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Chain Lightning", NULL, 10, 0, 0, 0, 0, 0, 0, 35, 0, ISPL_NONE, IMISC_SCROLLT, SPL_CHAIN, TRUE, 750, 750 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Guardian", NULL, 12, 0, 0, 0, 0, 0, 0, 47, 0, ISPL_NONE, IMISC_SCROLLT, SPL_GUARDIAN, TRUE, 950, 950 }, -/* */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Non Item", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Nova", NULL, 14, 0, 0, 0, 0, 0, 0, 57, 0, ISPL_NONE, IMISC_SCROLL, SPL_NOVA, TRUE, 1300, 1300 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Golem", NULL, 10, 0, 0, 0, 0, 0, 0, 51, 0, ISPL_NONE, IMISC_SCROLLT, SPL_GOLEM, TRUE, 1100, 1100 }, -/* */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of None", NULL, 99, 0, 0, 0, 0, 0, 0, 61, 0, ISPL_NONE, IMISC_SCROLLT, SPL_NULL, TRUE, 1000, 1000 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Teleport", NULL, 14, 0, 0, 0, 0, 0, 0, 81, 0, ISPL_NONE, IMISC_SCROLL, SPL_TELEPORT, TRUE, 3000, 3000 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Apocalypse", NULL, 22, 0, 0, 0, 0, 0, 0, 117, 0, ISPL_NONE, IMISC_SCROLL, SPL_APOCA, TRUE, 2000, 2000 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_BOOK_BLUE, ITYPE_MISC, UITYPE_NONE, "Book of ", NULL, 2, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_BOOK, SPL_NULL, TRUE, 0, 0 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_BOOK_BLUE, ITYPE_MISC, UITYPE_NONE, "Book of ", NULL, 8, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_BOOK, SPL_NULL, TRUE, 0, 0 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_BOOK_BLUE, ITYPE_MISC, UITYPE_NONE, "Book of ", NULL, 14, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_BOOK, SPL_NULL, TRUE, 0, 0 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_BOOK_BLUE, ITYPE_MISC, UITYPE_NONE, "Book of ", NULL, 20, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_BOOK, SPL_NULL, TRUE, 0, 0 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_DAGGER, ITYPE_SWORD, UITYPE_DAGGER, "Dagger", "Dagger", 1, 16, 1, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 60, 60 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SHORT_SWORD, ITYPE_SWORD, UITYPE_NONE, "Short Sword", "Sword", 1, 24, 2, 6, 0, 0, 18, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 120, 120 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_FALCHION, ITYPE_SWORD, UITYPE_FALCHION, "Falchion", "Sword", 2, 20, 4, 8, 0, 0, 30, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 250, 250 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SCIMITAR, ITYPE_SWORD, UITYPE_SCIMITAR, "Scimitar", "Sword", 4, 28, 3, 7, 0, 0, 23, 0, 23, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 200, 200 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_CLAYMORE, ITYPE_SWORD, UITYPE_CLAYMORE, "Claymore", "Sword", 5, 36, 1, 12, 0, 0, 35, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 450, 450 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_BLADE, ITYPE_SWORD, UITYPE_NONE, "Blade", "Blade", 4, 30, 3, 8, 0, 0, 25, 0, 30, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 280, 280 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SABRE, ITYPE_SWORD, UITYPE_SABRE, "Sabre", "Sabre", 1, 45, 1, 8, 0, 0, 17, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 170, 170 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_LONG_SWORD, ITYPE_SWORD, UITYPE_LONGSWR, "Long Sword", "Sword", 6, 40, 2, 10, 0, 0, 30, 0, 30, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 350, 350 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_BROAD_SWORD, ITYPE_SWORD, UITYPE_BROADSWR, "Broad Sword", "Sword", 8, 50, 4, 12, 0, 0, 40, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 750, 750 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_BASTARD_SWORD, ITYPE_SWORD, UITYPE_BASTARDSWR, "Bastard Sword", "Sword", 10, 60, 6, 15, 0, 0, 50, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 1000, 1000 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_TWO_HANDED_SWORD, ITYPE_SWORD, UITYPE_TWOHANDSWR, "Two-Handed Sword", "Sword", 14, 75, 8, 16, 0, 0, 65, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 1800, 1800 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_GREAT_SWORD, ITYPE_SWORD, UITYPE_GREATSWR, "Great Sword", "Sword", 17, 100, 10, 20, 0, 0, 75, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 3000, 3000 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SMALL_AXE, ITYPE_AXE, UITYPE_SMALLAXE, "Small Axe", "Axe", 2, 24, 2, 10, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 150, 150 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_AXE, ITYPE_AXE, UITYPE_NONE, "Axe", "Axe", 4, 32, 4, 12, 0, 0, 22, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 450, 450 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_LARGE_AXE, ITYPE_AXE, UITYPE_LARGEAXE, "Large Axe", "Axe", 6, 40, 6, 16, 0, 0, 30, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 750, 750 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_BROAD_AXE, ITYPE_AXE, UITYPE_BROADAXE, "Broad Axe", "Axe", 8, 50, 8, 20, 0, 0, 50, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 1000, 1000 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_BATTLE_AXE, ITYPE_AXE, UITYPE_BATTLEAXE, "Battle Axe", "Axe", 10, 60, 10, 25, 0, 0, 65, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 1500, 1500 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_GREAT_AXE, ITYPE_AXE, UITYPE_GREATAXE, "Great Axe", "Axe", 12, 75, 12, 30, 0, 0, 80, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 2500, 2500 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_MACE, ITYPE_MACE, UITYPE_MACE, "Mace", "Mace", 2, 32, 1, 8, 0, 0, 16, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 200, 200 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_MORNING_STAR, ITYPE_MACE, UITYPE_MORNSTAR, "Morning Star", "Mace", 3, 40, 1, 10, 0, 0, 26, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 300, 300 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_WAR_HAMMER, ITYPE_MACE, UITYPE_WARHAMMER, "War Hammer", "Hammer", 5, 50, 5, 9, 0, 0, 40, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 600, 600 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SPIKED_CLUB, ITYPE_MACE, UITYPE_SPIKCLUB, "Spiked Club", "Club", 4, 20, 3, 6, 0, 0, 18, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 225, 225 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_CLUB, ITYPE_MACE, UITYPE_SPIKCLUB, "Club", "Club", 1, 20, 1, 6, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 20, 20 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_FLAIL, ITYPE_MACE, UITYPE_FLAIL, "Flail", "Flail", 7, 36, 2, 12, 0, 0, 30, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 500, 500 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_MAUL, ITYPE_MACE, UITYPE_MAUL, "Maul", "Maul", 10, 50, 6, 20, 0, 0, 55, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 900, 900 }, -/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_BOW, ITYPE_BOW, UITYPE_SHORTBOW, "Short Bow", "Bow", 1, 30, 1, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 100, 100 }, -/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_HUNTERS_BOW, ITYPE_BOW, UITYPE_HUNTBOW, "Hunter's Bow", "Bow", 3, 40, 2, 5, 0, 0, 20, 0, 35, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 350, 350 }, -/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_HUNTERS_BOW, ITYPE_BOW, UITYPE_LONGBOW, "Long Bow", "Bow", 5, 35, 1, 6, 0, 0, 25, 0, 30, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 250, 250 }, -/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_COMPOSITE_BOW, ITYPE_BOW, UITYPE_COMPBOW, "Composite Bow", "Bow", 7, 45, 3, 6, 0, 0, 25, 0, 40, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 600, 600 }, -/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_BATTLE_BOW, ITYPE_BOW, UITYPE_NONE, "Short Battle Bow", "Bow", 9, 45, 3, 7, 0, 0, 30, 0, 50, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 750, 750 }, -/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_LONG_WAR_BOW, ITYPE_BOW, UITYPE_BATTLEBOW, "Long Battle Bow", "Bow", 11, 50, 1, 10, 0, 0, 30, 0, 60, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 1000, 1000 }, -/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_WAR_BOW, ITYPE_BOW, UITYPE_NONE, "Short War Bow", "Bow", 15, 55, 4, 8, 0, 0, 35, 0, 70, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 1500, 1500 }, -/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_LONG_WAR_BOW, ITYPE_BOW, UITYPE_WARBOW, "Long War Bow", "Bow", 19, 60, 1, 14, 0, 0, 45, 0, 80, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 2000, 2000 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_SHORTSTAFF, "Short Staff", "Staff", 1, 25, 2, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_STAFF, SPL_NULL, FALSE, 30, 30 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_LONG_STAFF, ITYPE_STAFF, UITYPE_LONGSTAFF, "Long Staff", "Staff", 4, 35, 4, 8, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_STAFF, SPL_NULL, FALSE, 100, 100 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_COMPOSITE_STAFF, ITYPE_STAFF, UITYPE_COMPSTAFF, "Composite Staff", "Staff", 6, 45, 5, 10, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_STAFF, SPL_NULL, FALSE, 500, 500 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_QUARSTAFF, "Quarter Staff", "Staff", 9, 55, 6, 12, 0, 0, 20, 0, 0, ISPL_NONE, IMISC_STAFF, SPL_NULL, FALSE, 1000, 1000 }, -/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_WAR_STAFF, ITYPE_STAFF, UITYPE_WARSTAFF, "War Staff", "Staff", 12, 75, 8, 16, 0, 0, 30, 0, 0, ISPL_NONE, IMISC_STAFF, SPL_NULL, FALSE, 1500, 1500 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_RING, ICURS_RING, ITYPE_RING, UITYPE_RING, "Ring", "Ring", 5, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_RING, SPL_NULL, FALSE, 1000, 1000 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_RING, ICURS_RING, ITYPE_RING, UITYPE_RING, "Ring", "Ring", 10, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_RING, SPL_NULL, FALSE, 1000, 1000 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_RING, ICURS_RING, ITYPE_RING, UITYPE_RING, "Ring", "Ring", 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_RING, SPL_NULL, FALSE, 1000, 1000 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_AMULET, ICURS_AMULET, ITYPE_AMULET, UITYPE_AMULET, "Amulet", "Amulet", 8, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_AMULET, SPL_NULL, FALSE, 1200, 1200 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_AMULET, ICURS_AMULET, ITYPE_AMULET, UITYPE_AMULET, "Amulet", "Amulet", 16, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_AMULET, SPL_NULL, FALSE, 1200, 1200 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_RUNE_OF_FIRE, ITYPE_MISC, UITYPE_NONE, "Rune of Fire", "Rune", 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_RUNEF, SPL_NULL, TRUE, 100, 100 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_RUNE_OF_LIGHTNING, ITYPE_MISC, UITYPE_NONE, "Rune of Lightning", "Rune", 3, 0, 0, 0, 0, 0, 0, 13, 0, ISPL_NONE, IMISC_RUNEL, SPL_NULL, TRUE, 200, 200 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_GREATER_RUNE_OF_FIRE, ITYPE_MISC, UITYPE_NONE, "Greater Rune of Fire", "Rune", 7, 0, 0, 0, 0, 0, 0, 42, 0, ISPL_NONE, IMISC_GR_RUNEF, SPL_NULL, TRUE, 400, 400 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_GREATER_RUNE_OF_LIGHTNING, ITYPE_MISC, UITYPE_NONE, "Greater Rune of Lightning", "Rune", 7, 0, 0, 0, 0, 0, 0, 42, 0, ISPL_NONE, IMISC_GR_RUNEL, SPL_NULL, TRUE, 500, 500 }, -/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_RUNE_OF_STONE, ITYPE_MISC, UITYPE_NONE, "Rune of Stone", "Rune", 7, 0, 0, 0, 0, 0, 0, 25, 0, ISPL_NONE, IMISC_RUNES, SPL_NULL, TRUE, 300, 300 }, -/*IDI_SORCERER */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_NONE, "Short Staff of Charged Bolt", NULL, 1, 25, 2, 4, 0, 0, 0, 20, 0, ISPL_NONE, IMISC_STAFF, SPL_CBOLT, FALSE, 520, 520 }, -/* */ { IDROP_NEVER, ICLASS_NONE, ILOC_INVALID, ICURS_POTION_OF_FULL_MANA, ITYPE_MISC, UITYPE_NONE, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 }, +/*IDI_GOLD */ { IDROP_REGULAR, ICLASS_GOLD, ILOC_UNEQUIPABLE, ICURS_GOLD, ITYPE_GOLD, UITYPE_NONE, "Gold", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, true, 0, 0 }, +/*IDI_WARRIOR */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SHORT_SWORD, ITYPE_SWORD, UITYPE_NONE, "Short Sword", NULL, 2, 20, 2, 6, 0, 0, 18, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 50, 50 }, +/*IDI_WARRSHLD */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_BUCKLER, ITYPE_SHIELD, UITYPE_NONE, "Buckler", NULL, 2, 10, 0, 0, 3, 3, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 50, 50 }, +/*IDI_WARRCLUB */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_CLUB, ITYPE_MACE, UITYPE_SPIKCLUB, "Club", NULL, 1, 20, 1, 6, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 20, 20 }, +/*IDI_ROGUE */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_BOW, ITYPE_BOW, UITYPE_NONE, "Short Bow", NULL, 1, 30, 1, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 100, 100 }, +/*IDI_SORCERER */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_NONE, "Short Staff of Mana", NULL, 1, 25, 2, 4, 0, 0, 0, 20, 0, ISPL_NONE, IMISC_STAFF, SPL_MANA, false, 520, 520 }, +/*IDI_CLEAVER */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_CLEAVER, ITYPE_AXE, UITYPE_CLEAVER, "Cleaver", NULL, 10, 10, 4, 24, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, false, 2000, 2000 }, +/*IDI_SKCROWN */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_HELM, ICURS_THE_UNDEAD_CROWN, ITYPE_HELM, UITYPE_SKCROWN, "The Undead Crown", NULL, 0, 50, 0, 0, 15, 15, 0, 0, 0, ISPL_RNDSTEALLIFE, IMISC_UNIQUE, SPL_NULL, false, 10000, 10000 }, +/*IDI_INFRARING */ { IDROP_NEVER, ICLASS_MISC, ILOC_RING, ICURS_EMPYREAN_BAND, ITYPE_RING, UITYPE_INFRARING, "Empyrean Band", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, false, 8000, 8000 }, +/*IDI_ROCK */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_MAGIC_ROCK, ITYPE_MISC, UITYPE_NONE, "Magic Rock", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_OPTAMULET */ { IDROP_NEVER, ICLASS_MISC, ILOC_AMULET, ICURS_OPTIC_AMULET, ITYPE_AMULET, UITYPE_OPTAMULET, "Optic Amulet", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, false, 5000, 5000 }, +/*IDI_TRING */ { IDROP_NEVER, ICLASS_MISC, ILOC_RING, ICURS_RING_OF_TRUTH, ITYPE_RING, UITYPE_TRING, "Ring of Truth", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, false, 1000, 1000 }, +/*IDI_BANNER */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_TAVERN_SIGN, ITYPE_MISC, UITYPE_NONE, "Tavern Sign", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_HARCREST */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_HELM, ICURS_HARLEQUIN_CREST, ITYPE_HELM, UITYPE_HARCREST, "Harlequin Crest", NULL, 0, 15, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, false, 15, 20 }, +/*IDI_STEELVEIL */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_HELM, ICURS_VIEL_OF_STEEL, ITYPE_HELM, UITYPE_STEELVEIL, "Veil of Steel", NULL, 0, 60, 0, 0, 18, 18, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, false, 0, 0 }, +/*IDI_GLDNELIX */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_GOLDEN_ELIXIR, ITYPE_MISC, UITYPE_ELIXIR, "Golden Elixir", NULL, 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_ANVIL */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_ANVIL_OF_FURY, ITYPE_MISC, UITYPE_NONE, "Anvil of Fury", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_MUSHROOM */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_BLACK_MUSHROOM, ITYPE_MISC, UITYPE_NONE, "Black Mushroom", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_BRAIN */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_BRAIN, ITYPE_MISC, UITYPE_NONE, "Brain", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_FUNGALTM */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_FUNGAL_TOME, ITYPE_MISC, UITYPE_NONE, "Fungal Tome", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_SPECELIX */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SPECTRAL_ELIXIR, ITYPE_MISC, UITYPE_ELIXIR, "Spectral Elixir", NULL, 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SPECELIX, SPL_NULL, false, 0, 0 }, +/*IDI_BLDSTONE */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_BLOOD_STONE, ITYPE_MISC, UITYPE_NONE, "Blood Stone", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_MAPOFDOOM */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_MAP_OF_THE_STARS, ITYPE_MISC, UITYPE_MAPOFDOOM, "Cathedral Map", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_MAPOFDOOM, SPL_NULL, true, 0, 0 }, +/*IDI_EAR */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_EAR_SORCERER, ITYPE_MISC, UITYPE_NONE, "Heart", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_EAR, SPL_NULL, false, 0, 0 }, +/*IDI_HEAL */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_HEALING, ITYPE_MISC, UITYPE_NONE, "Potion of Healing", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_HEAL, SPL_NULL, true, 50, 50 }, +/*IDI_MANA */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_MANA, ITYPE_MISC, UITYPE_NONE, "Potion of Mana", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_MANA, SPL_NULL, true, 50, 50 }, +/*IDI_IDENTIFY */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Identify", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_IDENTIFY, true, 200, 200 }, +/*IDI_PORTAL */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Town Portal", NULL, 4, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_TOWN, true, 200, 200 }, +/*IDI_ARMOFVAL */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_ARMOR, ICURS_ARKAINES_VALOR, ITYPE_MARMOR, UITYPE_ARMOFVAL, "Arkaine's Valor", NULL, 0, 40, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, false, 0, 0 }, +/*IDI_FULLHEAL */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_FULL_HEALING, ITYPE_MISC, UITYPE_NONE, "Potion of Full Healing", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_FULLHEAL, SPL_NULL, true, 150, 150 }, +/*IDI_FULLMANA */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_FULL_MANA, ITYPE_MISC, UITYPE_NONE, "Potion of Full Mana", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_FULLMANA, SPL_NULL, true, 150, 150 }, +/*IDI_GRISWOLD */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_BROAD_SWORD, ITYPE_SWORD, UITYPE_GRISWOLD, "Griswold's Edge", NULL, 8, 50, 4, 12, 0, 0, 40, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, false, 750, 750 }, +/*IDI_LGTFORGE */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_ARMOR, ICURS_BOVINE, ITYPE_HARMOR, UITYPE_BOVINE, "Bovine Plate", NULL, 0, 40, 0, 0, 0, 0, 50, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, false, 0, 0 }, +/*IDI_LAZSTAFF */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_STAFF_OF_LAZARUS, ITYPE_MISC, UITYPE_LAZSTAFF, "Staff of Lazarus", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_RESURRECT */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Resurrect", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLLT, SPL_RESURRECT, true, 250, 250 }, +/*IDI_OIL */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_OIL, ITYPE_MISC, UITYPE_NONE, "Blacksmith Oil", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_OILBSMTH, SPL_NULL, true, 100, 100 }, +/*IDI_SHORTSTAFF */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_NONE, "Short Staff", NULL, 1, 25, 2, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 20, 20 }, +/*IDI_BARDSWORD */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SHORT_SWORD, ITYPE_SWORD, UITYPE_NONE, "Sword", NULL, 2, 8, 1, 5, 0, 0, 15, 0, 20, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 20, 20 }, +/*IDI_BARDDAGGER */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_DAGGER, ITYPE_SWORD, UITYPE_NONE, "Dagger", NULL, 1, 16, 1, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 20, 20 }, +/*IDI_RUNEBOMB */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_RUNE_BOMB, ITYPE_MISC, UITYPE_NONE, "Rune Bomb", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_THEODORE */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_THEODORE, ITYPE_MISC, UITYPE_NONE, "Theodore", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_AURIC */ { IDROP_NEVER, ICLASS_MISC, ILOC_AMULET, ICURS_AURIC_AMULET, ITYPE_MISC, UITYPE_NONE, "Auric Amulet", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_AURIC, SPL_NULL, false, 100, 100 }, +/*IDI_NOTE1 */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_TORN_NOTE_1, ITYPE_MISC, UITYPE_NONE, "Torn Note 1", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_NOTE2 */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_TORN_NOTE_2, ITYPE_MISC, UITYPE_NONE, "Torn Note 2", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_NOTE3 */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_TORN_NOTE_3, ITYPE_MISC, UITYPE_NONE, "Torn Note 3", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_FULLNOTE */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_RECONSTRUCTED_NOTE, ITYPE_MISC, UITYPE_NONE, "Reconstructed Note", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NOTE, SPL_NULL, true, 0, 0 }, +/*IDI_BROWNSUIT */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_BROWN_SUIT, ITYPE_MISC, UITYPE_NONE, "Brown Suit", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/*IDI_GREYSUIT */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_GREY_SUIT, ITYPE_MISC, UITYPE_NONE, "Grey Suit", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_CAP, ITYPE_HELM, UITYPE_NONE, "Cap", "Cap", 1, 15, 0, 0, 1, 3, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 15, 20 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_SKULL_CAP, ITYPE_HELM, UITYPE_SKULLCAP, "Skull Cap", "Cap", 4, 20, 0, 0, 2, 4, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 25, 30 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_HELM, ITYPE_HELM, UITYPE_HELM, "Helm", "Helm", 8, 30, 0, 0, 4, 6, 25, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 40, 70 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_FULL_HELM, ITYPE_HELM, UITYPE_NONE, "Full Helm", "Helm", 12, 35, 0, 0, 6, 8, 35, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 90, 130 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_CROWN, ITYPE_HELM, UITYPE_CROWN, "Crown", "Crown", 16, 40, 0, 0, 8, 12, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 200, 300 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_HELM, ICURS_GREAT_HELM, ITYPE_HELM, UITYPE_GREATHELM, "Great Helm", "Helm", 20, 60, 0, 0, 10, 15, 50, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 400, 500 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_CAPE, ITYPE_LARMOR, UITYPE_CAPE, "Cape", "Cape", 1, 12, 0, 0, 1, 5, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 10, 50 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_RAGS, ITYPE_LARMOR, UITYPE_RAGS, "Rags", "Rags", 1, 6, 0, 0, 2, 6, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 5, 25 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_CLOAK, ITYPE_LARMOR, UITYPE_CLOAK, "Cloak", "Cloak", 2, 18, 0, 0, 3, 7, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 40, 70 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_ROBE, ITYPE_LARMOR, UITYPE_ROBE, "Robe", "Robe", 3, 24, 0, 0, 4, 7, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 75, 125 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_QUILTED_ARMOR, ITYPE_LARMOR, UITYPE_NONE, "Quilted Armor", "Armor", 4, 30, 0, 0, 7, 10, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 200, 300 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_LEATHER_ARMOR, ITYPE_LARMOR, UITYPE_LEATHARMOR, "Leather Armor", "Armor", 6, 35, 0, 0, 10, 13, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 300, 400 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_HARD_LEATHER_ARMOR, ITYPE_LARMOR, UITYPE_NONE, "Hard Leather Armor", "Armor", 7, 40, 0, 0, 11, 14, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 450, 550 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_STUDDED_LEATHER_ARMOR, ITYPE_LARMOR, UITYPE_STUDARMOR, "Studded Leather Armor", "Armor", 9, 45, 0, 0, 15, 17, 20, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 700, 800 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_RING_MAIL, ITYPE_MARMOR, UITYPE_NONE, "Ring Mail", "Mail", 11, 50, 0, 0, 17, 20, 25, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 900, 1100 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_CHAIN_MAIL, ITYPE_MARMOR, UITYPE_CHAINMAIL, "Chain Mail", "Mail", 13, 55, 0, 0, 18, 22, 30, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 1250, 1750 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_SCALE_MAIL, ITYPE_MARMOR, UITYPE_NONE, "Scale Mail", "Mail", 15, 60, 0, 0, 23, 28, 35, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 2300, 2800 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_BREAST_PLATE, ITYPE_HARMOR, UITYPE_BREASTPLATE, "Breast Plate", "Plate", 16, 80, 0, 0, 20, 24, 40, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 2800, 3200 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_SPLINT_MAIL, ITYPE_MARMOR, UITYPE_NONE, "Splint Mail", "Mail", 17, 65, 0, 0, 30, 35, 40, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 3250, 3750 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_FIELD_PLATE, ITYPE_HARMOR, UITYPE_PLATEMAIL, "Plate Mail", "Plate", 19, 75, 0, 0, 42, 50, 60, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 4600, 5400 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_FIELD_PLATE, ITYPE_HARMOR, UITYPE_NONE, "Field Plate", "Plate", 21, 80, 0, 0, 40, 45, 65, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 5800, 6200 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_GOTHIC_PLATE, ITYPE_HARMOR, UITYPE_NONE, "Gothic Plate", "Plate", 23, 100, 0, 0, 50, 60, 80, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 8000, 10000 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ARMOR, ICURS_FULL_PLATE_MAIL, ITYPE_HARMOR, UITYPE_FULLPLATE, "Full Plate Mail", "Plate", 25, 90, 0, 0, 60, 75, 90, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 6500, 8000 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_BUCKLER, ITYPE_SHIELD, UITYPE_BUCKLER, "Buckler", "Shield", 1, 16, 0, 0, 1, 5, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 30, 70 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_SMALL_SHIELD, ITYPE_SHIELD, UITYPE_SMALLSHIELD, "Small Shield", "Shield", 5, 24, 0, 0, 3, 8, 25, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 90, 130 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_LARGE_SHIELD, ITYPE_SHIELD, UITYPE_LARGESHIELD, "Large Shield", "Shield", 9, 32, 0, 0, 5, 10, 40, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 200, 300 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_KITE_SHIELD, ITYPE_SHIELD, UITYPE_KITESHIELD, "Kite Shield", "Shield", 14, 40, 0, 0, 8, 15, 50, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 400, 700 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_TOWER_SHIELD, ITYPE_SHIELD, UITYPE_GOTHSHIELD, "Tower Shield", "Shield", 20, 50, 0, 0, 12, 20, 60, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 850, 1200 }, +/* */ { IDROP_REGULAR, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_GOTHIC_SHIELD, ITYPE_SHIELD, UITYPE_GOTHSHIELD, "Gothic Shield", "Shield", 23, 60, 0, 0, 14, 18, 80, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 2300, 2700 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_HEALING, ITYPE_MISC, UITYPE_NONE, "Potion of Healing", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_HEAL, SPL_NULL, true, 50, 50 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_FULL_HEALING, ITYPE_MISC, UITYPE_NONE, "Potion of Full Healing", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_FULLHEAL, SPL_NULL, true, 150, 150 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_MANA, ITYPE_MISC, UITYPE_NONE, "Potion of Mana", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_MANA, SPL_NULL, true, 50, 50 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_FULL_MANA, ITYPE_MISC, UITYPE_NONE, "Potion of Full Mana", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_FULLMANA, SPL_NULL, true, 150, 150 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_REJUVENATION, ITYPE_MISC, UITYPE_NONE, "Potion of Rejuvenation", NULL, 3, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_REJUV, SPL_NULL, true, 120, 120 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_FULL_REJUVENATION, ITYPE_MISC, UITYPE_NONE, "Potion of Full Rejuvenation", NULL, 7, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_FULLREJUV, SPL_NULL, true, 600, 600 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_OIL, ITYPE_MISC, UITYPE_NONE, "Blacksmith Oil", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_OILBSMTH, SPL_NULL, true, 100, 100 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_OIL, ITYPE_MISC, UITYPE_NONE, "Oil of Accuracy", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_OILACC, SPL_NULL, true, 500, 500 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_OIL, ITYPE_MISC, UITYPE_NONE, "Oil of Sharpness", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_OILSHARP, SPL_NULL, true, 500, 500 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_OIL, ITYPE_MISC, UITYPE_NONE, "Oil", NULL, 10, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_OILOF, SPL_NULL, true, 0, 0 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_ELIXIR_OF_STRENGTH, ITYPE_MISC, UITYPE_NONE, "Elixir of Strength", NULL, 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_ELIXSTR, SPL_NULL, true, 5000, 5000 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_ELIXIR_OF_MAGIC, ITYPE_MISC, UITYPE_NONE, "Elixir of Magic", NULL, 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_ELIXMAG, SPL_NULL, true, 5000, 5000 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_ELIXIR_OF_DEXTERITY, ITYPE_MISC, UITYPE_NONE, "Elixir of Dexterity", NULL, 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_ELIXDEX, SPL_NULL, true, 5000, 5000 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_ELIXIR_OF_VITALITY, ITYPE_MISC, UITYPE_NONE, "Elixir of Vitality", NULL, 20, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_ELIXVIT, SPL_NULL, true, 5000, 5000 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Healing", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_HEAL, true, 50, 50 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Search", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_SEARCH, true, 50, 50 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Lightning", NULL, 4, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLLT, SPL_LIGHTNING, true, 150, 150 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Identify", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_IDENTIFY, true, 100, 100 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Resurrect", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLLT, SPL_RESURRECT, true, 250, 250 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Fire Wall", NULL, 4, 0, 0, 0, 0, 0, 0, 17, 0, ISPL_NONE, IMISC_SCROLLT, SPL_FIREWALL, true, 400, 400 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Inferno", NULL, 1, 0, 0, 0, 0, 0, 0, 19, 0, ISPL_NONE, IMISC_SCROLLT, SPL_FLAME, true, 100, 100 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Town Portal", NULL, 4, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_TOWN, true, 200, 200 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Flash", NULL, 6, 0, 0, 0, 0, 0, 0, 21, 0, ISPL_NONE, IMISC_SCROLLT, SPL_FLASH, true, 500, 500 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Infravision", NULL, 8, 0, 0, 0, 0, 0, 0, 23, 0, ISPL_NONE, IMISC_SCROLL, SPL_INFRA, true, 600, 600 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Phasing", NULL, 6, 0, 0, 0, 0, 0, 0, 25, 0, ISPL_NONE, IMISC_SCROLL, SPL_RNDTELEPORT, true, 200, 200 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Mana Shield", NULL, 8, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_MANASHIELD, true, 1200, 1200 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Flame Wave", NULL, 10, 0, 0, 0, 0, 0, 0, 29, 0, ISPL_NONE, IMISC_SCROLLT, SPL_WAVE, true, 650, 650 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Fireball", NULL, 8, 0, 0, 0, 0, 0, 0, 31, 0, ISPL_NONE, IMISC_SCROLLT, SPL_FIREBALL, true, 300, 300 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Stone Curse", NULL, 6, 0, 0, 0, 0, 0, 0, 33, 0, ISPL_NONE, IMISC_SCROLLT, SPL_STONE, true, 800, 800 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Chain Lightning", NULL, 10, 0, 0, 0, 0, 0, 0, 35, 0, ISPL_NONE, IMISC_SCROLLT, SPL_CHAIN, true, 750, 750 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Guardian", NULL, 12, 0, 0, 0, 0, 0, 0, 47, 0, ISPL_NONE, IMISC_SCROLLT, SPL_GUARDIAN, true, 950, 950 }, +/* */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Non Item", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Nova", NULL, 14, 0, 0, 0, 0, 0, 0, 57, 0, ISPL_NONE, IMISC_SCROLL, SPL_NOVA, true, 1300, 1300 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Golem", NULL, 10, 0, 0, 0, 0, 0, 0, 51, 0, ISPL_NONE, IMISC_SCROLLT, SPL_GOLEM, true, 1100, 1100 }, +/* */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of None", NULL, 99, 0, 0, 0, 0, 0, 0, 61, 0, ISPL_NONE, IMISC_SCROLLT, SPL_NULL, true, 1000, 1000 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Teleport", NULL, 14, 0, 0, 0, 0, 0, 0, 81, 0, ISPL_NONE, IMISC_SCROLL, SPL_TELEPORT, true, 3000, 3000 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Apocalypse", NULL, 22, 0, 0, 0, 0, 0, 0, 117, 0, ISPL_NONE, IMISC_SCROLL, SPL_APOCA, true, 2000, 2000 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_BOOK_BLUE, ITYPE_MISC, UITYPE_NONE, "Book of ", NULL, 2, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_BOOK, SPL_NULL, true, 0, 0 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_BOOK_BLUE, ITYPE_MISC, UITYPE_NONE, "Book of ", NULL, 8, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_BOOK, SPL_NULL, true, 0, 0 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_BOOK_BLUE, ITYPE_MISC, UITYPE_NONE, "Book of ", NULL, 14, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_BOOK, SPL_NULL, true, 0, 0 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_BOOK_BLUE, ITYPE_MISC, UITYPE_NONE, "Book of ", NULL, 20, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_BOOK, SPL_NULL, true, 0, 0 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_DAGGER, ITYPE_SWORD, UITYPE_DAGGER, "Dagger", "Dagger", 1, 16, 1, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 60, 60 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SHORT_SWORD, ITYPE_SWORD, UITYPE_NONE, "Short Sword", "Sword", 1, 24, 2, 6, 0, 0, 18, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 120, 120 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_FALCHION, ITYPE_SWORD, UITYPE_FALCHION, "Falchion", "Sword", 2, 20, 4, 8, 0, 0, 30, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 250, 250 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SCIMITAR, ITYPE_SWORD, UITYPE_SCIMITAR, "Scimitar", "Sword", 4, 28, 3, 7, 0, 0, 23, 0, 23, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 200, 200 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_CLAYMORE, ITYPE_SWORD, UITYPE_CLAYMORE, "Claymore", "Sword", 5, 36, 1, 12, 0, 0, 35, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 450, 450 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_BLADE, ITYPE_SWORD, UITYPE_NONE, "Blade", "Blade", 4, 30, 3, 8, 0, 0, 25, 0, 30, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 280, 280 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SABRE, ITYPE_SWORD, UITYPE_SABRE, "Sabre", "Sabre", 1, 45, 1, 8, 0, 0, 17, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 170, 170 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_LONG_SWORD, ITYPE_SWORD, UITYPE_LONGSWR, "Long Sword", "Sword", 6, 40, 2, 10, 0, 0, 30, 0, 30, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 350, 350 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_BROAD_SWORD, ITYPE_SWORD, UITYPE_BROADSWR, "Broad Sword", "Sword", 8, 50, 4, 12, 0, 0, 40, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 750, 750 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_BASTARD_SWORD, ITYPE_SWORD, UITYPE_BASTARDSWR, "Bastard Sword", "Sword", 10, 60, 6, 15, 0, 0, 50, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 1000, 1000 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_TWO_HANDED_SWORD, ITYPE_SWORD, UITYPE_TWOHANDSWR, "Two-Handed Sword", "Sword", 14, 75, 8, 16, 0, 0, 65, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 1800, 1800 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_GREAT_SWORD, ITYPE_SWORD, UITYPE_GREATSWR, "Great Sword", "Sword", 17, 100, 10, 20, 0, 0, 75, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 3000, 3000 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SMALL_AXE, ITYPE_AXE, UITYPE_SMALLAXE, "Small Axe", "Axe", 2, 24, 2, 10, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 150, 150 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_AXE, ITYPE_AXE, UITYPE_NONE, "Axe", "Axe", 4, 32, 4, 12, 0, 0, 22, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 450, 450 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_LARGE_AXE, ITYPE_AXE, UITYPE_LARGEAXE, "Large Axe", "Axe", 6, 40, 6, 16, 0, 0, 30, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 750, 750 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_BROAD_AXE, ITYPE_AXE, UITYPE_BROADAXE, "Broad Axe", "Axe", 8, 50, 8, 20, 0, 0, 50, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 1000, 1000 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_BATTLE_AXE, ITYPE_AXE, UITYPE_BATTLEAXE, "Battle Axe", "Axe", 10, 60, 10, 25, 0, 0, 65, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 1500, 1500 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_GREAT_AXE, ITYPE_AXE, UITYPE_GREATAXE, "Great Axe", "Axe", 12, 75, 12, 30, 0, 0, 80, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 2500, 2500 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_MACE, ITYPE_MACE, UITYPE_MACE, "Mace", "Mace", 2, 32, 1, 8, 0, 0, 16, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 200, 200 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_MORNING_STAR, ITYPE_MACE, UITYPE_MORNSTAR, "Morning Star", "Mace", 3, 40, 1, 10, 0, 0, 26, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 300, 300 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_WAR_HAMMER, ITYPE_MACE, UITYPE_WARHAMMER, "War Hammer", "Hammer", 5, 50, 5, 9, 0, 0, 40, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 600, 600 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_SPIKED_CLUB, ITYPE_MACE, UITYPE_SPIKCLUB, "Spiked Club", "Club", 4, 20, 3, 6, 0, 0, 18, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 225, 225 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_CLUB, ITYPE_MACE, UITYPE_SPIKCLUB, "Club", "Club", 1, 20, 1, 6, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 20, 20 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_FLAIL, ITYPE_MACE, UITYPE_FLAIL, "Flail", "Flail", 7, 36, 2, 12, 0, 0, 30, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 500, 500 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_MAUL, ITYPE_MACE, UITYPE_MAUL, "Maul", "Maul", 10, 50, 6, 20, 0, 0, 55, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 900, 900 }, +/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_BOW, ITYPE_BOW, UITYPE_SHORTBOW, "Short Bow", "Bow", 1, 30, 1, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 100, 100 }, +/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_HUNTERS_BOW, ITYPE_BOW, UITYPE_HUNTBOW, "Hunter's Bow", "Bow", 3, 40, 2, 5, 0, 0, 20, 0, 35, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 350, 350 }, +/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_HUNTERS_BOW, ITYPE_BOW, UITYPE_LONGBOW, "Long Bow", "Bow", 5, 35, 1, 6, 0, 0, 25, 0, 30, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 250, 250 }, +/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_COMPOSITE_BOW, ITYPE_BOW, UITYPE_COMPBOW, "Composite Bow", "Bow", 7, 45, 3, 6, 0, 0, 25, 0, 40, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 600, 600 }, +/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_BATTLE_BOW, ITYPE_BOW, UITYPE_NONE, "Short Battle Bow", "Bow", 9, 45, 3, 7, 0, 0, 30, 0, 50, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 750, 750 }, +/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_LONG_WAR_BOW, ITYPE_BOW, UITYPE_BATTLEBOW, "Long Battle Bow", "Bow", 11, 50, 1, 10, 0, 0, 30, 0, 60, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 1000, 1000 }, +/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_WAR_BOW, ITYPE_BOW, UITYPE_NONE, "Short War Bow", "Bow", 15, 55, 4, 8, 0, 0, 35, 0, 70, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 1500, 1500 }, +/* */ { IDROP_DOUBLE, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_LONG_WAR_BOW, ITYPE_BOW, UITYPE_WARBOW, "Long War Bow", "Bow", 19, 60, 1, 14, 0, 0, 45, 0, 80, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 2000, 2000 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_SHORTSTAFF, "Short Staff", "Staff", 1, 25, 2, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_STAFF, SPL_NULL, false, 30, 30 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_LONG_STAFF, ITYPE_STAFF, UITYPE_LONGSTAFF, "Long Staff", "Staff", 4, 35, 4, 8, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_STAFF, SPL_NULL, false, 100, 100 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_COMPOSITE_STAFF, ITYPE_STAFF, UITYPE_COMPSTAFF, "Composite Staff", "Staff", 6, 45, 5, 10, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_STAFF, SPL_NULL, false, 500, 500 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_QUARSTAFF, "Quarter Staff", "Staff", 9, 55, 6, 12, 0, 0, 20, 0, 0, ISPL_NONE, IMISC_STAFF, SPL_NULL, false, 1000, 1000 }, +/* */ { IDROP_REGULAR, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_WAR_STAFF, ITYPE_STAFF, UITYPE_WARSTAFF, "War Staff", "Staff", 12, 75, 8, 16, 0, 0, 30, 0, 0, ISPL_NONE, IMISC_STAFF, SPL_NULL, false, 1500, 1500 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_RING, ICURS_RING, ITYPE_RING, UITYPE_RING, "Ring", "Ring", 5, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_RING, SPL_NULL, false, 1000, 1000 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_RING, ICURS_RING, ITYPE_RING, UITYPE_RING, "Ring", "Ring", 10, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_RING, SPL_NULL, false, 1000, 1000 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_RING, ICURS_RING, ITYPE_RING, UITYPE_RING, "Ring", "Ring", 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_RING, SPL_NULL, false, 1000, 1000 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_AMULET, ICURS_AMULET, ITYPE_AMULET, UITYPE_AMULET, "Amulet", "Amulet", 8, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_AMULET, SPL_NULL, false, 1200, 1200 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_AMULET, ICURS_AMULET, ITYPE_AMULET, UITYPE_AMULET, "Amulet", "Amulet", 16, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_AMULET, SPL_NULL, false, 1200, 1200 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_RUNE_OF_FIRE, ITYPE_MISC, UITYPE_NONE, "Rune of Fire", "Rune", 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_RUNEF, SPL_NULL, true, 100, 100 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_RUNE_OF_LIGHTNING, ITYPE_MISC, UITYPE_NONE, "Rune of Lightning", "Rune", 3, 0, 0, 0, 0, 0, 0, 13, 0, ISPL_NONE, IMISC_RUNEL, SPL_NULL, true, 200, 200 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_GREATER_RUNE_OF_FIRE, ITYPE_MISC, UITYPE_NONE, "Greater Rune of Fire", "Rune", 7, 0, 0, 0, 0, 0, 0, 42, 0, ISPL_NONE, IMISC_GR_RUNEF, SPL_NULL, true, 400, 400 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_GREATER_RUNE_OF_LIGHTNING, ITYPE_MISC, UITYPE_NONE, "Greater Rune of Lightning", "Rune", 7, 0, 0, 0, 0, 0, 0, 42, 0, ISPL_NONE, IMISC_GR_RUNEL, SPL_NULL, true, 500, 500 }, +/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_RUNE_OF_STONE, ITYPE_MISC, UITYPE_NONE, "Rune of Stone", "Rune", 7, 0, 0, 0, 0, 0, 0, 25, 0, ISPL_NONE, IMISC_RUNES, SPL_NULL, true, 300, 300 }, +/*IDI_SORCERER */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_NONE, "Short Staff of Charged Bolt", NULL, 1, 25, 2, 4, 0, 0, 0, 20, 0, ISPL_NONE, IMISC_STAFF, SPL_CBOLT, false, 520, 520 }, +/* */ { IDROP_NEVER, ICLASS_NONE, ILOC_INVALID, ICURS_POTION_OF_FULL_MANA, ITYPE_MISC, UITYPE_NONE, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, false, 0, 0 }, // clang-format on }; @@ -186,93 +186,93 @@ ItemDataStruct AllItemsList[] = { const PLStruct PL_Prefix[] = { // clang-format off // PLName, PLPower, PLParam1, PLParam2, PLMinLvl, PLIType, PLGOE, PLDouble, PLOk, PLMinVal, PLMaxVal, PLMultVal - { "Tin", IPL_TOHIT_CURSE, 6, 10, 3, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, TRUE, FALSE, 0, 0, -3 }, - { "Brass", IPL_TOHIT_CURSE, 1, 5, 1, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, TRUE, FALSE, 0, 0, -2 }, - { "Bronze", IPL_TOHIT, 1, 5, 1, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, TRUE, TRUE, 100, 500, 2 }, - { "Iron", IPL_TOHIT, 6, 10, 4, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, TRUE, TRUE, 600, 1000, 3 }, - { "Steel", IPL_TOHIT, 11, 15, 6, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, TRUE, TRUE, 1100, 1500, 5 }, - { "Silver", IPL_TOHIT, 16, 20, 9, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_GOOD, TRUE, TRUE, 1600, 2000, 7 }, - { "Gold", IPL_TOHIT, 21, 30, 12, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_GOOD, TRUE, TRUE, 2100, 3000, 9 }, - { "Platinum", IPL_TOHIT, 31, 40, 16, PLT_WEAP | PLT_BOW , GOE_GOOD, TRUE, TRUE, 3100, 4000, 11 }, - { "Mithril", IPL_TOHIT, 41, 60, 20, PLT_WEAP | PLT_BOW , GOE_GOOD, TRUE, TRUE, 4100, 6000, 13 }, - { "Meteoric", IPL_TOHIT, 61, 80, 23, PLT_WEAP | PLT_BOW , GOE_ANY, TRUE, TRUE, 6100, 10000, 15 }, - { "Weird", IPL_TOHIT, 81, 100, 35, PLT_WEAP | PLT_BOW , GOE_ANY, TRUE, TRUE, 10100, 14000, 17 }, - { "Strange", IPL_TOHIT, 101, 150, 60, PLT_WEAP | PLT_BOW , GOE_ANY, TRUE, TRUE, 14100, 20000, 20 }, - { "Useless", IPL_DAMP_CURSE, 100, 100, 5, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, FALSE, 0, 0, -8 }, - { "Bent", IPL_DAMP_CURSE, 50, 75, 3, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, FALSE, 0, 0, -4 }, - { "Weak", IPL_DAMP_CURSE, 25, 45, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, FALSE, 0, 0, -3 }, - { "Jagged", IPL_DAMP, 20, 35, 4, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, TRUE, 250, 450, 3 }, - { "Deadly", IPL_DAMP, 36, 50, 6, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, TRUE, 500, 700, 4 }, - { "Heavy", IPL_DAMP, 51, 65, 9, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, TRUE, 750, 950, 5 }, - { "Vicious", IPL_DAMP, 66, 80, 12, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_EVIL, TRUE, TRUE, 1000, 1450, 8 }, - { "Brutal", IPL_DAMP, 81, 95, 16, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, TRUE, 1500, 1950, 10 }, - { "Massive", IPL_DAMP, 96, 110, 20, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, TRUE, 2000, 2450, 13 }, - { "Savage", IPL_DAMP, 111, 125, 23, PLT_WEAP | PLT_BOW , GOE_ANY, TRUE, TRUE, 2500, 3000, 15 }, - { "Ruthless", IPL_DAMP, 126, 150, 35, PLT_WEAP | PLT_BOW , GOE_ANY, TRUE, TRUE, 10100, 15000, 17 }, - { "Merciless", IPL_DAMP, 151, 175, 60, PLT_WEAP | PLT_BOW , GOE_ANY, TRUE, TRUE, 15000, 20000, 20 }, - { "Clumsy", IPL_TOHIT_DAMP_CURSE, 50, 75, 5, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, FALSE, 0, 0, -7 }, - { "Dull", IPL_TOHIT_DAMP_CURSE, 25, 45, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, FALSE, 0, 0, -5 }, - { "Sharp", IPL_TOHIT_DAMP, 20, 35, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, FALSE, 350, 950, 5 }, - { "Fine", IPL_TOHIT_DAMP, 36, 50, 6, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, TRUE, 1100, 1700, 7 }, - { "Warrior's", IPL_TOHIT_DAMP, 51, 65, 10, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, TRUE, TRUE, 1850, 2450, 13 }, - { "Soldier's", IPL_TOHIT_DAMP, 66, 80, 15, PLT_WEAP | PLT_STAFF , GOE_ANY, TRUE, TRUE, 2600, 3950, 17 }, - { "Lord's", IPL_TOHIT_DAMP, 81, 95, 19, PLT_WEAP | PLT_STAFF , GOE_ANY, TRUE, TRUE, 4100, 5950, 21 }, - { "Knight's", IPL_TOHIT_DAMP, 96, 110, 23, PLT_WEAP | PLT_STAFF , GOE_ANY, TRUE, TRUE, 6100, 8450, 26 }, - { "Master's", IPL_TOHIT_DAMP, 111, 125, 28, PLT_WEAP | PLT_STAFF , GOE_ANY, TRUE, TRUE, 8600, 13000, 30 }, - { "Champion's", IPL_TOHIT_DAMP, 126, 150, 40, PLT_WEAP | PLT_STAFF , GOE_ANY, TRUE, TRUE, 15200, 24000, 33 }, - { "King's", IPL_TOHIT_DAMP, 151, 175, 28, PLT_WEAP | PLT_STAFF , GOE_ANY, TRUE, TRUE, 24100, 35000, 38 }, - { "Vulnerable", IPL_ACP_CURSE, 51, 100, 3, PLT_ARMO | PLT_SHLD , GOE_ANY, TRUE, FALSE, 0, 0, -3 }, - { "Rusted", IPL_ACP_CURSE, 25, 50, 1, PLT_ARMO | PLT_SHLD , GOE_ANY, TRUE, FALSE, 0, 0, -2 }, - { "Fine", IPL_ACP, 20, 30, 1, PLT_ARMO | PLT_SHLD , GOE_ANY, TRUE, TRUE, 20, 100, 2 }, - { "Strong", IPL_ACP, 31, 40, 3, PLT_ARMO | PLT_SHLD , GOE_ANY, TRUE, TRUE, 120, 200, 3 }, - { "Grand", IPL_ACP, 41, 55, 6, PLT_ARMO | PLT_SHLD , GOE_ANY, TRUE, TRUE, 220, 300, 5 }, - { "Valiant", IPL_ACP, 56, 70, 10, PLT_ARMO | PLT_SHLD , GOE_ANY, TRUE, TRUE, 320, 400, 7 }, - { "Glorious", IPL_ACP, 71, 90, 14, PLT_ARMO | PLT_SHLD , GOE_GOOD, TRUE, TRUE, 420, 600, 9 }, - { "Blessed", IPL_ACP, 91, 110, 19, PLT_ARMO | PLT_SHLD , GOE_GOOD, TRUE, TRUE, 620, 800, 11 }, - { "Saintly", IPL_ACP, 111, 130, 24, PLT_ARMO | PLT_SHLD , GOE_GOOD, TRUE, TRUE, 820, 1200, 13 }, - { "Awesome", IPL_ACP, 131, 150, 28, PLT_ARMO | PLT_SHLD , GOE_GOOD, TRUE, TRUE, 1220, 2000, 15 }, - { "Holy", IPL_ACP, 151, 170, 35, PLT_ARMO | PLT_SHLD , GOE_GOOD, TRUE, TRUE, 5200, 6000, 17 }, - { "Godly", IPL_ACP, 171, 200, 60, PLT_ARMO | PLT_SHLD , GOE_GOOD, TRUE, TRUE, 6200, 7000, 20 }, - { "Red", IPL_FIRERES, 10, 20, 4, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 500, 1500, 2 }, - { "Crimson", IPL_FIRERES, 21, 30, 10, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 2100, 3000, 2 }, - { "Crimson", IPL_FIRERES, 31, 40, 16, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 3100, 4000, 2 }, - { "Garnet", IPL_FIRERES, 41, 50, 20, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 8200, 12000, 3 }, - { "Ruby", IPL_FIRERES, 51, 60, 26, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 17100, 20000, 5 }, - { "Blue", IPL_LIGHTRES, 10, 20, 4, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 500, 1500, 2 }, - { "Azure", IPL_LIGHTRES, 21, 30, 10, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 2100, 3000, 2 }, - { "Lapis", IPL_LIGHTRES, 31, 40, 16, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 3100, 4000, 2 }, - { "Cobalt", IPL_LIGHTRES, 41, 50, 20, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 8200, 12000, 3 }, - { "Sapphire", IPL_LIGHTRES, 51, 60, 26, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 17100, 20000, 5 }, - { "White", IPL_MAGICRES, 10, 20, 4, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 500, 1500, 2 }, - { "Pearl", IPL_MAGICRES, 21, 30, 10, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 2100, 3000, 2 }, - { "Ivory", IPL_MAGICRES, 31, 40, 16, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 3100, 4000, 2 }, - { "Crystal", IPL_MAGICRES, 41, 50, 20, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 8200, 12000, 3 }, - { "Diamond", IPL_MAGICRES, 51, 60, 26, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 17100, 20000, 5 }, - { "Topaz", IPL_ALLRES, 10, 15, 8, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 2000, 5000, 3 }, - { "Amber", IPL_ALLRES, 16, 20, 12, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 7400, 10000, 3 }, - { "Jade", IPL_ALLRES, 21, 30, 18, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 11000, 15000, 3 }, - { "Obsidian", IPL_ALLRES, 31, 40, 24, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 24000, 40000, 4 }, - { "Emerald", IPL_ALLRES, 41, 50, 31, PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, FALSE, TRUE, 61000, 75000, 7 }, - { "Hyena's", IPL_MANA_CURSE, 11, 25, 4, PLT_STAFF | PLT_MISC, GOE_ANY, FALSE, FALSE, 100, 1000, -2 }, - { "Frog's", IPL_MANA_CURSE, 1, 10, 1, PLT_STAFF | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -2 }, - { "Spider's", IPL_MANA, 10, 15, 1, PLT_STAFF | PLT_MISC, GOE_EVIL, FALSE, TRUE, 500, 1000, 2 }, - { "Raven's", IPL_MANA, 15, 20, 5, PLT_STAFF | PLT_MISC, GOE_ANY, FALSE, TRUE, 1100, 2000, 3 }, - { "Snake's", IPL_MANA, 21, 30, 9, PLT_STAFF | PLT_MISC, GOE_ANY, FALSE, TRUE, 2100, 4000, 5 }, - { "Serpent's", IPL_MANA, 30, 40, 15, PLT_STAFF | PLT_MISC, GOE_ANY, FALSE, TRUE, 4100, 6000, 7 }, - { "Drake's", IPL_MANA, 41, 50, 21, PLT_STAFF | PLT_MISC, GOE_ANY, FALSE, TRUE, 6100, 10000, 9 }, - { "Dragon's", IPL_MANA, 51, 60, 27, PLT_STAFF | PLT_MISC, GOE_ANY, FALSE, TRUE, 10100, 15000, 11 }, - { "Wyrm's", IPL_MANA, 61, 80, 35, PLT_STAFF , GOE_ANY, FALSE, TRUE, 15100, 19000, 12 }, - { "Hydra's", IPL_MANA, 81, 100, 60, PLT_STAFF , GOE_ANY, FALSE, TRUE, 19100, 30000, 13 }, - { "Angel's", IPL_SPLLVLADD, 1, 1, 15, PLT_STAFF , GOE_GOOD, FALSE, TRUE, 25000, 25000, 2 }, - { "Arch-Angel's", IPL_SPLLVLADD, 2, 2, 25, PLT_STAFF , GOE_GOOD, FALSE, TRUE, 50000, 50000, 3 }, - { "Plentiful", IPL_CHARGES, 2, 2, 4, PLT_STAFF , GOE_ANY, FALSE, TRUE, 2000, 2000, 2 }, - { "Bountiful", IPL_CHARGES, 3, 3, 9, PLT_STAFF , GOE_ANY, FALSE, TRUE, 3000, 3000, 3 }, - { "Flaming", IPL_FIREDAM, 1, 10, 7, PLT_WEAP | PLT_STAFF , GOE_ANY, FALSE, TRUE, 5000, 5000, 2 }, - { "Lightning", IPL_LIGHTDAM, 2, 20, 18, PLT_WEAP | PLT_STAFF , GOE_ANY, FALSE, TRUE, 10000, 10000, 2 }, - { "Jester's", IPL_JESTERS, 1, 1, 7, PLT_WEAP , GOE_ANY, FALSE, TRUE, 1200, 1200, 3 }, - { "Crystalline", IPL_CRYSTALLINE, 30, 70, 5, PLT_WEAP , GOE_ANY, FALSE, TRUE, 1000, 3000, 3 }, - { "Doppelganger's", IPL_DOPPELGANGER, 81, 95, 11, PLT_WEAP | PLT_STAFF , GOE_ANY, FALSE, TRUE, 2000, 2400, 10 }, - { "", IPL_INVALID, 0, 0, 0, 0 , GOE_ANY, FALSE, FALSE, 0, 0, 0 }, + { "Tin", IPL_TOHIT_CURSE, 6, 10, 3, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, true, false, 0, 0, -3 }, + { "Brass", IPL_TOHIT_CURSE, 1, 5, 1, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, true, false, 0, 0, -2 }, + { "Bronze", IPL_TOHIT, 1, 5, 1, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, true, true, 100, 500, 2 }, + { "Iron", IPL_TOHIT, 6, 10, 4, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, true, true, 600, 1000, 3 }, + { "Steel", IPL_TOHIT, 11, 15, 6, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, true, true, 1100, 1500, 5 }, + { "Silver", IPL_TOHIT, 16, 20, 9, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_GOOD, true, true, 1600, 2000, 7 }, + { "Gold", IPL_TOHIT, 21, 30, 12, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_GOOD, true, true, 2100, 3000, 9 }, + { "Platinum", IPL_TOHIT, 31, 40, 16, PLT_WEAP | PLT_BOW , GOE_GOOD, true, true, 3100, 4000, 11 }, + { "Mithril", IPL_TOHIT, 41, 60, 20, PLT_WEAP | PLT_BOW , GOE_GOOD, true, true, 4100, 6000, 13 }, + { "Meteoric", IPL_TOHIT, 61, 80, 23, PLT_WEAP | PLT_BOW , GOE_ANY, true, true, 6100, 10000, 15 }, + { "Weird", IPL_TOHIT, 81, 100, 35, PLT_WEAP | PLT_BOW , GOE_ANY, true, true, 10100, 14000, 17 }, + { "Strange", IPL_TOHIT, 101, 150, 60, PLT_WEAP | PLT_BOW , GOE_ANY, true, true, 14100, 20000, 20 }, + { "Useless", IPL_DAMP_CURSE, 100, 100, 5, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, false, 0, 0, -8 }, + { "Bent", IPL_DAMP_CURSE, 50, 75, 3, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, false, 0, 0, -4 }, + { "Weak", IPL_DAMP_CURSE, 25, 45, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, false, 0, 0, -3 }, + { "Jagged", IPL_DAMP, 20, 35, 4, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, true, 250, 450, 3 }, + { "Deadly", IPL_DAMP, 36, 50, 6, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, true, 500, 700, 4 }, + { "Heavy", IPL_DAMP, 51, 65, 9, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, true, 750, 950, 5 }, + { "Vicious", IPL_DAMP, 66, 80, 12, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_EVIL, true, true, 1000, 1450, 8 }, + { "Brutal", IPL_DAMP, 81, 95, 16, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, true, 1500, 1950, 10 }, + { "Massive", IPL_DAMP, 96, 110, 20, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, true, 2000, 2450, 13 }, + { "Savage", IPL_DAMP, 111, 125, 23, PLT_WEAP | PLT_BOW , GOE_ANY, true, true, 2500, 3000, 15 }, + { "Ruthless", IPL_DAMP, 126, 150, 35, PLT_WEAP | PLT_BOW , GOE_ANY, true, true, 10100, 15000, 17 }, + { "Merciless", IPL_DAMP, 151, 175, 60, PLT_WEAP | PLT_BOW , GOE_ANY, true, true, 15000, 20000, 20 }, + { "Clumsy", IPL_TOHIT_DAMP_CURSE, 50, 75, 5, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, false, 0, 0, -7 }, + { "Dull", IPL_TOHIT_DAMP_CURSE, 25, 45, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, false, 0, 0, -5 }, + { "Sharp", IPL_TOHIT_DAMP, 20, 35, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, false, 350, 950, 5 }, + { "Fine", IPL_TOHIT_DAMP, 36, 50, 6, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, true, 1100, 1700, 7 }, + { "Warrior's", IPL_TOHIT_DAMP, 51, 65, 10, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, true, true, 1850, 2450, 13 }, + { "Soldier's", IPL_TOHIT_DAMP, 66, 80, 15, PLT_WEAP | PLT_STAFF , GOE_ANY, true, true, 2600, 3950, 17 }, + { "Lord's", IPL_TOHIT_DAMP, 81, 95, 19, PLT_WEAP | PLT_STAFF , GOE_ANY, true, true, 4100, 5950, 21 }, + { "Knight's", IPL_TOHIT_DAMP, 96, 110, 23, PLT_WEAP | PLT_STAFF , GOE_ANY, true, true, 6100, 8450, 26 }, + { "Master's", IPL_TOHIT_DAMP, 111, 125, 28, PLT_WEAP | PLT_STAFF , GOE_ANY, true, true, 8600, 13000, 30 }, + { "Champion's", IPL_TOHIT_DAMP, 126, 150, 40, PLT_WEAP | PLT_STAFF , GOE_ANY, true, true, 15200, 24000, 33 }, + { "King's", IPL_TOHIT_DAMP, 151, 175, 28, PLT_WEAP | PLT_STAFF , GOE_ANY, true, true, 24100, 35000, 38 }, + { "Vulnerable", IPL_ACP_CURSE, 51, 100, 3, PLT_ARMO | PLT_SHLD , GOE_ANY, true, false, 0, 0, -3 }, + { "Rusted", IPL_ACP_CURSE, 25, 50, 1, PLT_ARMO | PLT_SHLD , GOE_ANY, true, false, 0, 0, -2 }, + { "Fine", IPL_ACP, 20, 30, 1, PLT_ARMO | PLT_SHLD , GOE_ANY, true, true, 20, 100, 2 }, + { "Strong", IPL_ACP, 31, 40, 3, PLT_ARMO | PLT_SHLD , GOE_ANY, true, true, 120, 200, 3 }, + { "Grand", IPL_ACP, 41, 55, 6, PLT_ARMO | PLT_SHLD , GOE_ANY, true, true, 220, 300, 5 }, + { "Valiant", IPL_ACP, 56, 70, 10, PLT_ARMO | PLT_SHLD , GOE_ANY, true, true, 320, 400, 7 }, + { "Glorious", IPL_ACP, 71, 90, 14, PLT_ARMO | PLT_SHLD , GOE_GOOD, true, true, 420, 600, 9 }, + { "Blessed", IPL_ACP, 91, 110, 19, PLT_ARMO | PLT_SHLD , GOE_GOOD, true, true, 620, 800, 11 }, + { "Saintly", IPL_ACP, 111, 130, 24, PLT_ARMO | PLT_SHLD , GOE_GOOD, true, true, 820, 1200, 13 }, + { "Awesome", IPL_ACP, 131, 150, 28, PLT_ARMO | PLT_SHLD , GOE_GOOD, true, true, 1220, 2000, 15 }, + { "Holy", IPL_ACP, 151, 170, 35, PLT_ARMO | PLT_SHLD , GOE_GOOD, true, true, 5200, 6000, 17 }, + { "Godly", IPL_ACP, 171, 200, 60, PLT_ARMO | PLT_SHLD , GOE_GOOD, true, true, 6200, 7000, 20 }, + { "Red", IPL_FIRERES, 10, 20, 4, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 500, 1500, 2 }, + { "Crimson", IPL_FIRERES, 21, 30, 10, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 2100, 3000, 2 }, + { "Crimson", IPL_FIRERES, 31, 40, 16, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 3100, 4000, 2 }, + { "Garnet", IPL_FIRERES, 41, 50, 20, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 8200, 12000, 3 }, + { "Ruby", IPL_FIRERES, 51, 60, 26, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 17100, 20000, 5 }, + { "Blue", IPL_LIGHTRES, 10, 20, 4, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 500, 1500, 2 }, + { "Azure", IPL_LIGHTRES, 21, 30, 10, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 2100, 3000, 2 }, + { "Lapis", IPL_LIGHTRES, 31, 40, 16, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 3100, 4000, 2 }, + { "Cobalt", IPL_LIGHTRES, 41, 50, 20, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 8200, 12000, 3 }, + { "Sapphire", IPL_LIGHTRES, 51, 60, 26, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 17100, 20000, 5 }, + { "White", IPL_MAGICRES, 10, 20, 4, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 500, 1500, 2 }, + { "Pearl", IPL_MAGICRES, 21, 30, 10, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 2100, 3000, 2 }, + { "Ivory", IPL_MAGICRES, 31, 40, 16, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 3100, 4000, 2 }, + { "Crystal", IPL_MAGICRES, 41, 50, 20, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 8200, 12000, 3 }, + { "Diamond", IPL_MAGICRES, 51, 60, 26, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 17100, 20000, 5 }, + { "Topaz", IPL_ALLRES, 10, 15, 8, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 2000, 5000, 3 }, + { "Amber", IPL_ALLRES, 16, 20, 12, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 7400, 10000, 3 }, + { "Jade", IPL_ALLRES, 21, 30, 18, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 11000, 15000, 3 }, + { "Obsidian", IPL_ALLRES, 31, 40, 24, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 24000, 40000, 4 }, + { "Emerald", IPL_ALLRES, 41, 50, 31, PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, false, true, 61000, 75000, 7 }, + { "Hyena's", IPL_MANA_CURSE, 11, 25, 4, PLT_STAFF | PLT_MISC, GOE_ANY, false, false, 100, 1000, -2 }, + { "Frog's", IPL_MANA_CURSE, 1, 10, 1, PLT_STAFF | PLT_MISC, GOE_EVIL, false, false, 0, 0, -2 }, + { "Spider's", IPL_MANA, 10, 15, 1, PLT_STAFF | PLT_MISC, GOE_EVIL, false, true, 500, 1000, 2 }, + { "Raven's", IPL_MANA, 15, 20, 5, PLT_STAFF | PLT_MISC, GOE_ANY, false, true, 1100, 2000, 3 }, + { "Snake's", IPL_MANA, 21, 30, 9, PLT_STAFF | PLT_MISC, GOE_ANY, false, true, 2100, 4000, 5 }, + { "Serpent's", IPL_MANA, 30, 40, 15, PLT_STAFF | PLT_MISC, GOE_ANY, false, true, 4100, 6000, 7 }, + { "Drake's", IPL_MANA, 41, 50, 21, PLT_STAFF | PLT_MISC, GOE_ANY, false, true, 6100, 10000, 9 }, + { "Dragon's", IPL_MANA, 51, 60, 27, PLT_STAFF | PLT_MISC, GOE_ANY, false, true, 10100, 15000, 11 }, + { "Wyrm's", IPL_MANA, 61, 80, 35, PLT_STAFF , GOE_ANY, false, true, 15100, 19000, 12 }, + { "Hydra's", IPL_MANA, 81, 100, 60, PLT_STAFF , GOE_ANY, false, true, 19100, 30000, 13 }, + { "Angel's", IPL_SPLLVLADD, 1, 1, 15, PLT_STAFF , GOE_GOOD, false, true, 25000, 25000, 2 }, + { "Arch-Angel's", IPL_SPLLVLADD, 2, 2, 25, PLT_STAFF , GOE_GOOD, false, true, 50000, 50000, 3 }, + { "Plentiful", IPL_CHARGES, 2, 2, 4, PLT_STAFF , GOE_ANY, false, true, 2000, 2000, 2 }, + { "Bountiful", IPL_CHARGES, 3, 3, 9, PLT_STAFF , GOE_ANY, false, true, 3000, 3000, 3 }, + { "Flaming", IPL_FIREDAM, 1, 10, 7, PLT_WEAP | PLT_STAFF , GOE_ANY, false, true, 5000, 5000, 2 }, + { "Lightning", IPL_LIGHTDAM, 2, 20, 18, PLT_WEAP | PLT_STAFF , GOE_ANY, false, true, 10000, 10000, 2 }, + { "Jester's", IPL_JESTERS, 1, 1, 7, PLT_WEAP , GOE_ANY, false, true, 1200, 1200, 3 }, + { "Crystalline", IPL_CRYSTALLINE, 30, 70, 5, PLT_WEAP , GOE_ANY, false, true, 1000, 3000, 3 }, + { "Doppelganger's", IPL_DOPPELGANGER, 81, 95, 11, PLT_WEAP | PLT_STAFF , GOE_ANY, false, true, 2000, 2400, 10 }, + { "", IPL_INVALID, 0, 0, 0, 0 , GOE_ANY, false, false, 0, 0, 0 }, // clang-format on }; @@ -280,105 +280,105 @@ const PLStruct PL_Prefix[] = { const PLStruct PL_Suffix[] = { // clang-format off // PLName, PLPower, PLParam1, PLParam2, PLMinLvl, PLIType, PLGOE, PLDouble, PLOk, PLMinVal, PLMaxVal, PLMultVal - { "quality", IPL_DAMMOD, 1, 2, 2, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, FALSE, TRUE, 100, 200, 2 }, - { "maiming", IPL_DAMMOD, 3, 5, 7, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, FALSE, TRUE, 1300, 1500, 3 }, - { "slaying", IPL_DAMMOD, 6, 8, 15, PLT_WEAP , GOE_ANY, FALSE, TRUE, 2600, 3000, 5 }, - { "gore", IPL_DAMMOD, 9, 12, 25, PLT_WEAP , GOE_ANY, FALSE, TRUE, 4100, 5000, 8 }, - { "carnage", IPL_DAMMOD, 13, 16, 35, PLT_WEAP , GOE_ANY, FALSE, TRUE, 5100, 10000, 10 }, - { "slaughter", IPL_DAMMOD, 17, 20, 60, PLT_WEAP , GOE_ANY, FALSE, TRUE, 10100, 15000, 13 }, - { "pain", IPL_GETHIT_CURSE, 2, 4, 4, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -4 }, - { "tears", IPL_GETHIT_CURSE, 1, 1, 2, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -2 }, - { "health", IPL_GETHIT, 1, 1, 2, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_GOOD, FALSE, TRUE, 200, 200, 2 }, - { "protection", IPL_GETHIT, 2, 2, 6, PLT_ARMO | PLT_SHLD , GOE_GOOD, FALSE, TRUE, 400, 800, 4 }, - { "absorption", IPL_GETHIT, 3, 3, 12, PLT_ARMO | PLT_SHLD , GOE_GOOD, FALSE, TRUE, 1001, 2500, 10 }, - { "deflection", IPL_GETHIT, 4, 4, 20, PLT_ARMO , GOE_GOOD, FALSE, TRUE, 2500, 6500, 15 }, - { "osmosis", IPL_GETHIT, 5, 6, 50, PLT_ARMO , GOE_GOOD, FALSE, TRUE, 7500, 10000, 20 }, - { "frailty", IPL_STR_CURSE, 6, 10, 3, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -3 }, - { "weakness", IPL_STR_CURSE, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -2 }, - { "strength", IPL_STR, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 200, 1000, 2 }, - { "might", IPL_STR, 6, 10, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 1200, 2000, 3 }, - { "power", IPL_STR, 11, 15, 11, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 2200, 3000, 4 }, - { "giants", IPL_STR, 16, 20, 17, PLT_ARMO | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 3200, 5000, 7 }, - { "titans", IPL_STR, 21, 30, 23, PLT_WEAP | PLT_MISC, GOE_ANY, FALSE, TRUE, 5200, 10000, 10 }, - { "paralysis", IPL_DEX_CURSE, 6, 10, 3, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -3 }, - { "atrophy", IPL_DEX_CURSE, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -2 }, - { "dexterity", IPL_DEX, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 200, 1000, 2 }, - { "skill", IPL_DEX, 6, 10, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 1200, 2000, 3 }, - { "accuracy", IPL_DEX, 11, 15, 11, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 2200, 3000, 4 }, - { "precision", IPL_DEX, 16, 20, 17, PLT_ARMO | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 3200, 5000, 7 }, - { "perfection", IPL_DEX, 21, 30, 23, PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 5200, 10000, 10 }, - { "the fool", IPL_MAG_CURSE, 6, 10, 3, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -3 }, - { "dyslexia", IPL_MAG_CURSE, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -2 }, - { "magic", IPL_MAG, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 200, 1000, 2 }, - { "the mind", IPL_MAG, 6, 10, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 1200, 2000, 3 }, - { "brilliance", IPL_MAG, 11, 15, 11, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 2200, 3000, 4 }, - { "sorcery", IPL_MAG, 16, 20, 17, PLT_ARMO | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 3200, 5000, 7 }, - { "wizardry", IPL_MAG, 21, 30, 23, PLT_STAFF | PLT_MISC, GOE_ANY, FALSE, TRUE, 5200, 10000, 10 }, - { "illness", IPL_VIT_CURSE, 6, 10, 3, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -3 }, - { "disease", IPL_VIT_CURSE, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -2 }, - { "vitality", IPL_VIT, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_GOOD, FALSE, TRUE, 200, 1000, 2 }, - { "zest", IPL_VIT, 6, 10, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_GOOD, FALSE, TRUE, 1200, 2000, 3 }, - { "vim", IPL_VIT, 11, 15, 11, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_GOOD, FALSE, TRUE, 2200, 3000, 4 }, - { "vigor", IPL_VIT, 16, 20, 17, PLT_ARMO | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_GOOD, FALSE, TRUE, 3200, 5000, 7 }, - { "life", IPL_VIT, 21, 30, 23, PLT_MISC, GOE_GOOD, FALSE, TRUE, 5200, 10000, 10 }, - { "trouble", IPL_ATTRIBS_CURSE, 6, 10, 12, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -10 }, - { "the pit", IPL_ATTRIBS_CURSE, 1, 5, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -5 }, - { "the sky", IPL_ATTRIBS, 1, 3, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 800, 4000, 5 }, - { "the moon", IPL_ATTRIBS, 4, 7, 11, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 4800, 8000, 10 }, - { "the stars", IPL_ATTRIBS, 8, 11, 17, PLT_ARMO | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 8800, 12000, 15 }, - { "the heavens", IPL_ATTRIBS, 12, 15, 25, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, FALSE, TRUE, 12800, 20000, 20 }, - { "the zodiac", IPL_ATTRIBS, 16, 20, 30, PLT_MISC, GOE_ANY, FALSE, TRUE, 20800, 40000, 30 }, - { "the vulture", IPL_LIFE_CURSE, 11, 25, 4, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -4 }, - { "the jackal", IPL_LIFE_CURSE, 1, 10, 1, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -2 }, - { "the fox", IPL_LIFE, 10, 15, 1, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, FALSE, TRUE, 100, 1000, 2 }, - { "the jaguar", IPL_LIFE, 16, 20, 5, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, FALSE, TRUE, 1100, 2000, 3 }, - { "the eagle", IPL_LIFE, 21, 30, 9, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, FALSE, TRUE, 2100, 4000, 5 }, - { "the wolf", IPL_LIFE, 30, 40, 15, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, FALSE, TRUE, 4100, 6000, 7 }, - { "the tiger", IPL_LIFE, 41, 50, 21, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, FALSE, TRUE, 6100, 10000, 9 }, - { "the lion", IPL_LIFE, 51, 60, 27, PLT_ARMO | PLT_MISC, GOE_ANY, FALSE, TRUE, 10100, 15000, 11 }, - { "the mammoth", IPL_LIFE, 61, 80, 35, PLT_ARMO , GOE_ANY, FALSE, TRUE, 15100, 19000, 12 }, - { "the whale", IPL_LIFE, 81, 100, 60, PLT_ARMO , GOE_ANY, FALSE, TRUE, 19100, 30000, 13 }, - { "fragility", IPL_DUR_CURSE, 100, 100, 3, PLT_ARMO | PLT_SHLD | PLT_WEAP , GOE_EVIL, FALSE, FALSE, 0, 0, -4 }, - { "brittleness", IPL_DUR_CURSE, 26, 75, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP , GOE_EVIL, FALSE, FALSE, 0, 0, -2 }, - { "sturdiness", IPL_DUR, 26, 75, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF , GOE_ANY, FALSE, TRUE, 100, 100, 2 }, - { "craftsmanship", IPL_DUR, 51, 100, 6, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF , GOE_ANY, FALSE, TRUE, 200, 200, 2 }, - { "structure", IPL_DUR, 101, 200, 12, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF , GOE_ANY, FALSE, TRUE, 300, 300, 2 }, - { "the ages", IPL_INDESTRUCTIBLE, 0, 0, 25, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF , GOE_ANY, FALSE, TRUE, 600, 600, 5 }, - { "the dark", IPL_LIGHT_CURSE, 4, 4, 6, PLT_ARMO | PLT_WEAP | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -3 }, - { "the night", IPL_LIGHT_CURSE, 2, 2, 3, PLT_ARMO | PLT_WEAP | PLT_MISC, GOE_EVIL, FALSE, FALSE, 0, 0, -2 }, - { "light", IPL_LIGHT, 2, 2, 4, PLT_ARMO | PLT_WEAP | PLT_MISC, GOE_GOOD, FALSE, TRUE, 750, 750, 2 }, - { "radiance", IPL_LIGHT, 4, 4, 8, PLT_ARMO | PLT_WEAP | PLT_MISC, GOE_GOOD, FALSE, TRUE, 1500, 1500, 3 }, - { "flame", IPL_FIRE_ARROWS, 1, 3, 1, PLT_BOW , GOE_ANY, FALSE, TRUE, 2000, 2000, 2 }, - { "fire", IPL_FIRE_ARROWS, 1, 6, 11, PLT_BOW , GOE_ANY, FALSE, TRUE, 4000, 4000, 4 }, - { "burning", IPL_FIRE_ARROWS, 1, 16, 35, PLT_BOW , GOE_ANY, FALSE, TRUE, 6000, 6000, 6 }, - { "shock", IPL_LIGHT_ARROWS, 1, 6, 13, PLT_BOW , GOE_ANY, FALSE, TRUE, 6000, 6000, 2 }, - { "lightning", IPL_LIGHT_ARROWS, 1, 10, 21, PLT_BOW , GOE_ANY, FALSE, TRUE, 8000, 8000, 4 }, - { "thunder", IPL_LIGHT_ARROWS, 1, 20, 60, PLT_BOW , GOE_ANY, FALSE, TRUE, 12000, 12000, 6 }, - { "many", IPL_DUR, 100, 100, 3, PLT_BOW , GOE_ANY, FALSE, TRUE, 750, 750, 2 }, - { "plenty", IPL_DUR, 200, 200, 7, PLT_BOW , GOE_ANY, FALSE, TRUE, 1500, 1500, 3 }, - { "thorns", IPL_THORNS, 1, 3, 1, PLT_ARMO | PLT_SHLD , GOE_ANY, FALSE, TRUE, 500, 500, 2 }, - { "corruption", IPL_NOMANA, 0, 0, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP , GOE_EVIL, FALSE, FALSE, -1000, -1000, 2 }, - { "thieves", IPL_ABSHALFTRAP, 0, 0, 11, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, FALSE, TRUE, 1500, 1500, 2 }, - { "the bear", IPL_KNOCKBACK, 0, 0, 5, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_EVIL, FALSE, TRUE, 750, 750, 2 }, - { "the bat", IPL_STEALMANA, 3, 3, 8, PLT_WEAP , GOE_ANY, FALSE, TRUE, 7500, 7500, 3 }, - { "vampires", IPL_STEALMANA, 5, 5, 19, PLT_WEAP , GOE_ANY, FALSE, TRUE, 15000, 15000, 3 }, - { "the leech", IPL_STEALLIFE, 3, 3, 8, PLT_WEAP , GOE_ANY, FALSE, TRUE, 7500, 7500, 3 }, - { "blood", IPL_STEALLIFE, 5, 5, 19, PLT_WEAP , GOE_ANY, FALSE, TRUE, 15000, 15000, 3 }, - { "piercing", IPL_TARGAC, 1, 1, 1, PLT_WEAP | PLT_BOW , GOE_ANY, FALSE, TRUE, 1000, 1000, 3 }, - { "puncturing", IPL_TARGAC, 2, 2, 9, PLT_WEAP | PLT_BOW , GOE_ANY, FALSE, TRUE, 2000, 2000, 6 }, - { "bashing", IPL_TARGAC, 3, 3, 17, PLT_WEAP , GOE_ANY, FALSE, TRUE, 4000, 4000, 12 }, - { "readiness", IPL_FASTATTACK, 1, 1, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, FALSE, TRUE, 2000, 2000, 2 }, - { "swiftness", IPL_FASTATTACK, 2, 2, 10, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, FALSE, TRUE, 4000, 4000, 4 }, - { "speed", IPL_FASTATTACK, 3, 3, 19, PLT_WEAP | PLT_STAFF , GOE_ANY, FALSE, TRUE, 8000, 8000, 8 }, - { "haste", IPL_FASTATTACK, 4, 4, 27, PLT_WEAP | PLT_STAFF , GOE_ANY, FALSE, TRUE, 16000, 16000, 16 }, - { "balance", IPL_FASTRECOVER, 1, 1, 1, PLT_ARMO | PLT_MISC, GOE_ANY, FALSE, TRUE, 2000, 2000, 2 }, - { "stability", IPL_FASTRECOVER, 2, 2, 10, PLT_ARMO | PLT_MISC, GOE_ANY, FALSE, TRUE, 4000, 4000, 4 }, - { "harmony", IPL_FASTRECOVER, 3, 3, 20, PLT_ARMO | PLT_MISC, GOE_ANY, FALSE, TRUE, 8000, 8000, 8 }, - { "blocking", IPL_FASTBLOCK, 1, 1, 5, PLT_SHLD , GOE_ANY, FALSE, TRUE, 4000, 4000, 4 }, - { "devastation", IPL_DEVASTATION, 1, 1, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, FALSE, TRUE, 1200, 1200, 3 }, - { "decay", IPL_DECAY, 150, 250, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, FALSE, TRUE, 200, 200, 2 }, - { "peril", IPL_PERIL, 1, 1, 5, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, FALSE, TRUE, 500, 500, 1 }, - { "", IPL_INVALID, 0, 0, 0, 0 , GOE_ANY, FALSE, FALSE, 0, 0, 0 }, + { "quality", IPL_DAMMOD, 1, 2, 2, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, false, true, 100, 200, 2 }, + { "maiming", IPL_DAMMOD, 3, 5, 7, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, false, true, 1300, 1500, 3 }, + { "slaying", IPL_DAMMOD, 6, 8, 15, PLT_WEAP , GOE_ANY, false, true, 2600, 3000, 5 }, + { "gore", IPL_DAMMOD, 9, 12, 25, PLT_WEAP , GOE_ANY, false, true, 4100, 5000, 8 }, + { "carnage", IPL_DAMMOD, 13, 16, 35, PLT_WEAP , GOE_ANY, false, true, 5100, 10000, 10 }, + { "slaughter", IPL_DAMMOD, 17, 20, 60, PLT_WEAP , GOE_ANY, false, true, 10100, 15000, 13 }, + { "pain", IPL_GETHIT_CURSE, 2, 4, 4, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_EVIL, false, false, 0, 0, -4 }, + { "tears", IPL_GETHIT_CURSE, 1, 1, 2, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_EVIL, false, false, 0, 0, -2 }, + { "health", IPL_GETHIT, 1, 1, 2, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_GOOD, false, true, 200, 200, 2 }, + { "protection", IPL_GETHIT, 2, 2, 6, PLT_ARMO | PLT_SHLD , GOE_GOOD, false, true, 400, 800, 4 }, + { "absorption", IPL_GETHIT, 3, 3, 12, PLT_ARMO | PLT_SHLD , GOE_GOOD, false, true, 1001, 2500, 10 }, + { "deflection", IPL_GETHIT, 4, 4, 20, PLT_ARMO , GOE_GOOD, false, true, 2500, 6500, 15 }, + { "osmosis", IPL_GETHIT, 5, 6, 50, PLT_ARMO , GOE_GOOD, false, true, 7500, 10000, 20 }, + { "frailty", IPL_STR_CURSE, 6, 10, 3, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_EVIL, false, false, 0, 0, -3 }, + { "weakness", IPL_STR_CURSE, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, false, false, 0, 0, -2 }, + { "strength", IPL_STR, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 200, 1000, 2 }, + { "might", IPL_STR, 6, 10, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 1200, 2000, 3 }, + { "power", IPL_STR, 11, 15, 11, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 2200, 3000, 4 }, + { "giants", IPL_STR, 16, 20, 17, PLT_ARMO | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 3200, 5000, 7 }, + { "titans", IPL_STR, 21, 30, 23, PLT_WEAP | PLT_MISC, GOE_ANY, false, true, 5200, 10000, 10 }, + { "paralysis", IPL_DEX_CURSE, 6, 10, 3, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_EVIL, false, false, 0, 0, -3 }, + { "atrophy", IPL_DEX_CURSE, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, false, false, 0, 0, -2 }, + { "dexterity", IPL_DEX, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 200, 1000, 2 }, + { "skill", IPL_DEX, 6, 10, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 1200, 2000, 3 }, + { "accuracy", IPL_DEX, 11, 15, 11, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 2200, 3000, 4 }, + { "precision", IPL_DEX, 16, 20, 17, PLT_ARMO | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 3200, 5000, 7 }, + { "perfection", IPL_DEX, 21, 30, 23, PLT_BOW | PLT_MISC, GOE_ANY, false, true, 5200, 10000, 10 }, + { "the fool", IPL_MAG_CURSE, 6, 10, 3, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, false, false, 0, 0, -3 }, + { "dyslexia", IPL_MAG_CURSE, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, false, false, 0, 0, -2 }, + { "magic", IPL_MAG, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 200, 1000, 2 }, + { "the mind", IPL_MAG, 6, 10, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 1200, 2000, 3 }, + { "brilliance", IPL_MAG, 11, 15, 11, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 2200, 3000, 4 }, + { "sorcery", IPL_MAG, 16, 20, 17, PLT_ARMO | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 3200, 5000, 7 }, + { "wizardry", IPL_MAG, 21, 30, 23, PLT_STAFF | PLT_MISC, GOE_ANY, false, true, 5200, 10000, 10 }, + { "illness", IPL_VIT_CURSE, 6, 10, 3, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, false, false, 0, 0, -3 }, + { "disease", IPL_VIT_CURSE, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, false, false, 0, 0, -2 }, + { "vitality", IPL_VIT, 1, 5, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_GOOD, false, true, 200, 1000, 2 }, + { "zest", IPL_VIT, 6, 10, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_GOOD, false, true, 1200, 2000, 3 }, + { "vim", IPL_VIT, 11, 15, 11, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_GOOD, false, true, 2200, 3000, 4 }, + { "vigor", IPL_VIT, 16, 20, 17, PLT_ARMO | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_GOOD, false, true, 3200, 5000, 7 }, + { "life", IPL_VIT, 21, 30, 23, PLT_MISC, GOE_GOOD, false, true, 5200, 10000, 10 }, + { "trouble", IPL_ATTRIBS_CURSE, 6, 10, 12, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, false, false, 0, 0, -10 }, + { "the pit", IPL_ATTRIBS_CURSE, 1, 5, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_EVIL, false, false, 0, 0, -5 }, + { "the sky", IPL_ATTRIBS, 1, 3, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 800, 4000, 5 }, + { "the moon", IPL_ATTRIBS, 4, 7, 11, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 4800, 8000, 10 }, + { "the stars", IPL_ATTRIBS, 8, 11, 17, PLT_ARMO | PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 8800, 12000, 15 }, + { "the heavens", IPL_ATTRIBS, 12, 15, 25, PLT_WEAP | PLT_BOW | PLT_MISC, GOE_ANY, false, true, 12800, 20000, 20 }, + { "the zodiac", IPL_ATTRIBS, 16, 20, 30, PLT_MISC, GOE_ANY, false, true, 20800, 40000, 30 }, + { "the vulture", IPL_LIFE_CURSE, 11, 25, 4, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_EVIL, false, false, 0, 0, -4 }, + { "the jackal", IPL_LIFE_CURSE, 1, 10, 1, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_EVIL, false, false, 0, 0, -2 }, + { "the fox", IPL_LIFE, 10, 15, 1, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, false, true, 100, 1000, 2 }, + { "the jaguar", IPL_LIFE, 16, 20, 5, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, false, true, 1100, 2000, 3 }, + { "the eagle", IPL_LIFE, 21, 30, 9, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, false, true, 2100, 4000, 5 }, + { "the wolf", IPL_LIFE, 30, 40, 15, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, false, true, 4100, 6000, 7 }, + { "the tiger", IPL_LIFE, 41, 50, 21, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, false, true, 6100, 10000, 9 }, + { "the lion", IPL_LIFE, 51, 60, 27, PLT_ARMO | PLT_MISC, GOE_ANY, false, true, 10100, 15000, 11 }, + { "the mammoth", IPL_LIFE, 61, 80, 35, PLT_ARMO , GOE_ANY, false, true, 15100, 19000, 12 }, + { "the whale", IPL_LIFE, 81, 100, 60, PLT_ARMO , GOE_ANY, false, true, 19100, 30000, 13 }, + { "fragility", IPL_DUR_CURSE, 100, 100, 3, PLT_ARMO | PLT_SHLD | PLT_WEAP , GOE_EVIL, false, false, 0, 0, -4 }, + { "brittleness", IPL_DUR_CURSE, 26, 75, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP , GOE_EVIL, false, false, 0, 0, -2 }, + { "sturdiness", IPL_DUR, 26, 75, 1, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF , GOE_ANY, false, true, 100, 100, 2 }, + { "craftsmanship", IPL_DUR, 51, 100, 6, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF , GOE_ANY, false, true, 200, 200, 2 }, + { "structure", IPL_DUR, 101, 200, 12, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF , GOE_ANY, false, true, 300, 300, 2 }, + { "the ages", IPL_INDESTRUCTIBLE, 0, 0, 25, PLT_ARMO | PLT_SHLD | PLT_WEAP | PLT_STAFF , GOE_ANY, false, true, 600, 600, 5 }, + { "the dark", IPL_LIGHT_CURSE, 4, 4, 6, PLT_ARMO | PLT_WEAP | PLT_MISC, GOE_EVIL, false, false, 0, 0, -3 }, + { "the night", IPL_LIGHT_CURSE, 2, 2, 3, PLT_ARMO | PLT_WEAP | PLT_MISC, GOE_EVIL, false, false, 0, 0, -2 }, + { "light", IPL_LIGHT, 2, 2, 4, PLT_ARMO | PLT_WEAP | PLT_MISC, GOE_GOOD, false, true, 750, 750, 2 }, + { "radiance", IPL_LIGHT, 4, 4, 8, PLT_ARMO | PLT_WEAP | PLT_MISC, GOE_GOOD, false, true, 1500, 1500, 3 }, + { "flame", IPL_FIRE_ARROWS, 1, 3, 1, PLT_BOW , GOE_ANY, false, true, 2000, 2000, 2 }, + { "fire", IPL_FIRE_ARROWS, 1, 6, 11, PLT_BOW , GOE_ANY, false, true, 4000, 4000, 4 }, + { "burning", IPL_FIRE_ARROWS, 1, 16, 35, PLT_BOW , GOE_ANY, false, true, 6000, 6000, 6 }, + { "shock", IPL_LIGHT_ARROWS, 1, 6, 13, PLT_BOW , GOE_ANY, false, true, 6000, 6000, 2 }, + { "lightning", IPL_LIGHT_ARROWS, 1, 10, 21, PLT_BOW , GOE_ANY, false, true, 8000, 8000, 4 }, + { "thunder", IPL_LIGHT_ARROWS, 1, 20, 60, PLT_BOW , GOE_ANY, false, true, 12000, 12000, 6 }, + { "many", IPL_DUR, 100, 100, 3, PLT_BOW , GOE_ANY, false, true, 750, 750, 2 }, + { "plenty", IPL_DUR, 200, 200, 7, PLT_BOW , GOE_ANY, false, true, 1500, 1500, 3 }, + { "thorns", IPL_THORNS, 1, 3, 1, PLT_ARMO | PLT_SHLD , GOE_ANY, false, true, 500, 500, 2 }, + { "corruption", IPL_NOMANA, 0, 0, 5, PLT_ARMO | PLT_SHLD | PLT_WEAP , GOE_EVIL, false, false, -1000, -1000, 2 }, + { "thieves", IPL_ABSHALFTRAP, 0, 0, 11, PLT_ARMO | PLT_SHLD | PLT_MISC, GOE_ANY, false, true, 1500, 1500, 2 }, + { "the bear", IPL_KNOCKBACK, 0, 0, 5, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_EVIL, false, true, 750, 750, 2 }, + { "the bat", IPL_STEALMANA, 3, 3, 8, PLT_WEAP , GOE_ANY, false, true, 7500, 7500, 3 }, + { "vampires", IPL_STEALMANA, 5, 5, 19, PLT_WEAP , GOE_ANY, false, true, 15000, 15000, 3 }, + { "the leech", IPL_STEALLIFE, 3, 3, 8, PLT_WEAP , GOE_ANY, false, true, 7500, 7500, 3 }, + { "blood", IPL_STEALLIFE, 5, 5, 19, PLT_WEAP , GOE_ANY, false, true, 15000, 15000, 3 }, + { "piercing", IPL_TARGAC, 1, 1, 1, PLT_WEAP | PLT_BOW , GOE_ANY, false, true, 1000, 1000, 3 }, + { "puncturing", IPL_TARGAC, 2, 2, 9, PLT_WEAP | PLT_BOW , GOE_ANY, false, true, 2000, 2000, 6 }, + { "bashing", IPL_TARGAC, 3, 3, 17, PLT_WEAP , GOE_ANY, false, true, 4000, 4000, 12 }, + { "readiness", IPL_FASTATTACK, 1, 1, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, false, true, 2000, 2000, 2 }, + { "swiftness", IPL_FASTATTACK, 2, 2, 10, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, false, true, 4000, 4000, 4 }, + { "speed", IPL_FASTATTACK, 3, 3, 19, PLT_WEAP | PLT_STAFF , GOE_ANY, false, true, 8000, 8000, 8 }, + { "haste", IPL_FASTATTACK, 4, 4, 27, PLT_WEAP | PLT_STAFF , GOE_ANY, false, true, 16000, 16000, 16 }, + { "balance", IPL_FASTRECOVER, 1, 1, 1, PLT_ARMO | PLT_MISC, GOE_ANY, false, true, 2000, 2000, 2 }, + { "stability", IPL_FASTRECOVER, 2, 2, 10, PLT_ARMO | PLT_MISC, GOE_ANY, false, true, 4000, 4000, 4 }, + { "harmony", IPL_FASTRECOVER, 3, 3, 20, PLT_ARMO | PLT_MISC, GOE_ANY, false, true, 8000, 8000, 8 }, + { "blocking", IPL_FASTBLOCK, 1, 1, 5, PLT_SHLD , GOE_ANY, false, true, 4000, 4000, 4 }, + { "devastation", IPL_DEVASTATION, 1, 1, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, false, true, 1200, 1200, 3 }, + { "decay", IPL_DECAY, 150, 250, 1, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, false, true, 200, 200, 2 }, + { "peril", IPL_PERIL, 1, 1, 5, PLT_WEAP | PLT_STAFF | PLT_BOW , GOE_ANY, false, true, 500, 500, 1 }, + { "", IPL_INVALID, 0, 0, 0, 0 , GOE_ANY, false, false, 0, 0, 0 }, // clang-format on }; diff --git a/Source/items.cpp b/Source/items.cpp index 7d95b17e..786a1a39 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -568,19 +568,19 @@ void InitItemGFX() bool ItemPlace(int xp, int yp) { if (dMonster[xp][yp] != 0) - return FALSE; + return false; if (dPlayer[xp][yp] != 0) - return FALSE; + return false; if (dItem[xp][yp] != 0) - return FALSE; + return false; if (dObject[xp][yp] != 0) - return FALSE; + return false; if (dFlags[xp][yp] & BFLAG_POPULATED) - return FALSE; + return false; if (nSolidTable[dPiece[xp][yp]]) - return FALSE; + return false; - return TRUE; + return true; } void AddInitItems() @@ -614,7 +614,7 @@ void AddInitItems() items[ii]._iCreateInfo = curlv | CF_PREGEN; SetupItem(ii); items[ii]._iAnimFrame = items[ii]._iAnimLen; - items[ii]._iAnimFlag = FALSE; + items[ii]._iAnimFlag = false; items[ii]._iSelFlag = 1; DeltaAddItem(ii); } @@ -651,17 +651,17 @@ void InitItems() memset(&items[0], 0, sizeof(*items)); GetItemAttrs(0, IDI_GOLD, 1); golditem = items[0]; - golditem._iStatFlag = TRUE; + golditem._iStatFlag = true; numitems = 0; for (i = 0; i < MAXITEMS; i++) { items[i]._itype = ITYPE_NONE; items[i]._ix = 0; items[i]._iy = 0; - items[i]._iAnimFlag = FALSE; + items[i]._iAnimFlag = false; items[i]._iSelFlag = 0; - items[i]._iIdentified = FALSE; - items[i]._iPostDraw = FALSE; + items[i]._iIdentified = false; + items[i]._iPostDraw = false; } for (i = 0; i < MAXITEMS; i++) { @@ -685,7 +685,7 @@ void InitItems() items_42390F(); } - uitemflag = FALSE; + uitemflag = false; } void CalcPlrItemVals(int p, bool Loadgfx) @@ -984,27 +984,27 @@ void CalcPlrItemVals(int p, bool Loadgfx) plr[p]._pILMaxDam = lmax; if (iflgs & ISPL_INFRAVISION) { - plr[p]._pInfraFlag = TRUE; + plr[p]._pInfraFlag = true; } else { - plr[p]._pInfraFlag = FALSE; + plr[p]._pInfraFlag = false; } - plr[p]._pBlockFlag = FALSE; + plr[p]._pBlockFlag = false; if (plr[p]._pClass == PC_MONK) { if (plr[p].InvBody[INVLOC_HAND_LEFT]._itype == ITYPE_STAFF && plr[p].InvBody[INVLOC_HAND_LEFT]._iStatFlag) { - plr[p]._pBlockFlag = TRUE; + plr[p]._pBlockFlag = true; plr[p]._pIFlags |= ISPL_FASTBLOCK; } if (plr[p].InvBody[INVLOC_HAND_RIGHT]._itype == ITYPE_STAFF && plr[p].InvBody[INVLOC_HAND_RIGHT]._iStatFlag) { - plr[p]._pBlockFlag = TRUE; + plr[p]._pBlockFlag = true; plr[p]._pIFlags |= ISPL_FASTBLOCK; } if (plr[p].InvBody[INVLOC_HAND_LEFT].isEmpty() && plr[p].InvBody[INVLOC_HAND_RIGHT].isEmpty()) - plr[p]._pBlockFlag = TRUE; + plr[p]._pBlockFlag = true; if (plr[p].InvBody[INVLOC_HAND_LEFT]._iClass == ICLASS_WEAPON && plr[p].InvBody[INVLOC_HAND_LEFT]._iLoc != ILOC_TWOHAND && plr[p].InvBody[INVLOC_HAND_RIGHT].isEmpty()) - plr[p]._pBlockFlag = TRUE; + plr[p]._pBlockFlag = true; if (plr[p].InvBody[INVLOC_HAND_RIGHT]._iClass == ICLASS_WEAPON && plr[p].InvBody[INVLOC_HAND_RIGHT]._iLoc != ILOC_TWOHAND && plr[p].InvBody[INVLOC_HAND_LEFT].isEmpty()) - plr[p]._pBlockFlag = TRUE; + plr[p]._pBlockFlag = true; } plr[p]._pwtype = WT_MELEE; @@ -1042,11 +1042,11 @@ void CalcPlrItemVals(int p, bool Loadgfx) } if (plr[p].InvBody[INVLOC_HAND_LEFT]._itype == ITYPE_SHIELD && plr[p].InvBody[INVLOC_HAND_LEFT]._iStatFlag) { - plr[p]._pBlockFlag = TRUE; + plr[p]._pBlockFlag = true; g++; } if (plr[p].InvBody[INVLOC_HAND_RIGHT]._itype == ITYPE_SHIELD && plr[p].InvBody[INVLOC_HAND_RIGHT]._iStatFlag) { - plr[p]._pBlockFlag = TRUE; + plr[p]._pBlockFlag = true; g++; } @@ -1105,8 +1105,8 @@ void CalcPlrItemVals(int p, bool Loadgfx) MaxGold = GOLD_MAX_LIMIT * 2; } - drawmanaflag = TRUE; - drawhpflag = TRUE; + drawmanaflag = true; + drawhpflag = true; } void CalcPlrScrolls(int p) @@ -1156,7 +1156,7 @@ void CalcSelfItems(int pnum) pi = p->InvBody; for (i = 0; i < NUM_INVLOC; i++, pi++) { if (!pi->isEmpty()) { - pi->_iStatFlag = TRUE; + pi->_iStatFlag = true; if (pi->_iIdentified) { sa += pi->_iPLStr; ma += pi->_iPLMag; @@ -1165,20 +1165,20 @@ void CalcSelfItems(int pnum) } } do { - changeflag = FALSE; + changeflag = false; pi = p->InvBody; for (i = 0; i < NUM_INVLOC; i++, pi++) { if (!pi->isEmpty() && pi->_iStatFlag) { - sf = TRUE; + sf = true; if (sa + p->_pBaseStr < pi->_iMinStr) - sf = FALSE; + sf = false; if (ma + p->_pBaseMag < pi->_iMinMag) - sf = FALSE; + sf = false; if (da + p->_pBaseDex < pi->_iMinDex) - sf = FALSE; + sf = false; if (!sf) { - changeflag = TRUE; - pi->_iStatFlag = FALSE; + changeflag = true; + pi->_iStatFlag = false; if (pi->_iIdentified) { sa -= pi->_iPLStr; ma -= pi->_iPLMag; @@ -1193,15 +1193,15 @@ void CalcSelfItems(int pnum) static bool ItemMinStats(PlayerStruct *p, ItemStruct *x) { if (p->_pMagic < x->_iMinMag) - return FALSE; + return false; if (p->_pStrength < x->_iMinStr) - return FALSE; + return false; if (p->_pDexterity < x->_iMinDex) - return FALSE; + return false; - return TRUE; + return true; } void CalcPlrItemMin(int pnum) @@ -1329,17 +1329,17 @@ void GetGoldSeed(int pnum, ItemStruct *h) bool doneflag; do { - doneflag = TRUE; + doneflag = true; s = AdvanceRndSeed(); for (i = 0; i < numitems; i++) { ii = itemactive[i]; if (items[ii]._iSeed == s) - doneflag = FALSE; + doneflag = false; } if (pnum == myplr) { for (i = 0; i < plr[pnum]._pNumInv; i++) { if (plr[pnum].InvList[i]._iSeed == s) - doneflag = FALSE; + doneflag = false; } } } while (!doneflag); @@ -1505,7 +1505,7 @@ void CreatePlrItems(int p) } #endif - CalcPlrItemVals(p, FALSE); + CalcPlrItemVals(p, false); } bool ItemSpaceOk(int i, int j) @@ -1514,34 +1514,34 @@ bool ItemSpaceOk(int i, int j) // BUGFIX: Check `i + 1 >= MAXDUNX` and `j + 1 >= MAXDUNY` (applied) if (i < 0 || i + 1 >= MAXDUNX || j < 0 || j + 1 >= MAXDUNY) - return FALSE; + return false; if (dMonster[i][j] != 0) - return FALSE; + return false; if (dPlayer[i][j] != 0) - return FALSE; + return false; if (dItem[i][j] != 0) - return FALSE; + return false; if (dObject[i][j] != 0) { oi = dObject[i][j] > 0 ? dObject[i][j] - 1 : -(dObject[i][j] + 1); if (object[oi]._oSolidFlag) - return FALSE; + return false; } if (dObject[i + 1][j + 1] > 0 && object[dObject[i + 1][j + 1] - 1]._oSelFlag != 0) - return FALSE; + return false; if (dObject[i + 1][j + 1] < 0 && object[-(dObject[i + 1][j + 1] + 1)]._oSelFlag != 0) - return FALSE; + return false; if (dObject[i + 1][j] > 0 && dObject[i][j + 1] > 0 && object[dObject[i + 1][j] - 1]._oSelFlag != 0 && object[dObject[i][j + 1] - 1]._oSelFlag != 0) { - return FALSE; + return false; } return !nSolidTable[dPiece[i][j]]; @@ -1563,11 +1563,11 @@ static bool GetItemSpace(int x, int y, char inum) yy++; } - savail = FALSE; + savail = false; for (j = 0; j < 3; j++) { for (i = 0; i < 3; i++) { if (itemhold[i][j]) - savail = TRUE; + savail = true; } } @@ -1730,9 +1730,9 @@ void GetStaffPower(int i, int lvl, int bs, bool onlygood) nl = 0; for (j = 0; PL_Prefix[j].PLPower != IPL_INVALID; j++) { if (IsPrefixValidForItemType(j, PLT_STAFF) && PL_Prefix[j].PLMinLvl <= lvl) { - addok = TRUE; + addok = true; if (onlygood && !PL_Prefix[j].PLOk) - addok = FALSE; + addok = false; if (addok) { l[nl] = j; nl++; @@ -2085,11 +2085,11 @@ void SaveItemPower(int i, item_effect_type power, int param1, int param2, int mi break; case IPL_MANA: items[i]._iPLMana += r << 6; - drawmanaflag = TRUE; + drawmanaflag = true; break; case IPL_MANA_CURSE: items[i]._iPLMana -= r << 6; - drawmanaflag = TRUE; + drawmanaflag = true; break; case IPL_DUR: r2 = r * items[i]._iMaxDur / 100; @@ -2146,7 +2146,7 @@ void SaveItemPower(int i, item_effect_type power, int param1, int param2, int mi break; case IPL_NOMANA: items[i]._iFlags |= ISPL_NOMANA; - drawmanaflag = TRUE; + drawmanaflag = true; break; case IPL_NOHEALPLR: items[i]._iFlags |= ISPL_NOHEALPLR; @@ -2171,14 +2171,14 @@ void SaveItemPower(int i, item_effect_type power, int param1, int param2, int mi items[i]._iFlags |= ISPL_STEALMANA_3; if (param1 == 5) items[i]._iFlags |= ISPL_STEALMANA_5; - drawmanaflag = TRUE; + drawmanaflag = true; break; case IPL_STEALLIFE: if (param1 == 3) items[i]._iFlags |= ISPL_STEALLIFE_3; if (param1 == 5) items[i]._iFlags |= ISPL_STEALLIFE_5; - drawhpflag = TRUE; + drawhpflag = true; break; case IPL_TARGAC: if (gbIsHellfire) @@ -2355,7 +2355,7 @@ void GetItemPower(int i, int minlvl, int maxlvl, int flgs, bool onlygood) sufidx = -1; goe = GOE_ANY; if (!onlygood && random_(0, 3) != 0) - onlygood = TRUE; + onlygood = true; if (pre == 0) { nt = 0; for (j = 0; PL_Prefix[j].PLPower != IPL_INVALID; j++) { @@ -2476,16 +2476,16 @@ void SetupItem(int i) items[i]._iAnimLen = ItemAnimLs[it]; items[i]._iAnimWidth = 96; items[i]._iAnimWidth2 = 16; - items[i]._iIdentified = FALSE; - items[i]._iPostDraw = FALSE; + items[i]._iIdentified = false; + items[i]._iPostDraw = false; if (!plr[myplr].pLvlLoad) { items[i]._iAnimFrame = 1; - items[i]._iAnimFlag = TRUE; + items[i]._iAnimFlag = true; items[i]._iSelFlag = 0; } else { items[i]._iAnimFrame = items[i]._iAnimLen; - items[i]._iAnimFlag = FALSE; + items[i]._iAnimFlag = false; items[i]._iSelFlag = 1; } } @@ -2547,26 +2547,26 @@ int RndUItem(int m) if (!IsItemAvailable(i)) continue; - okflag = TRUE; + okflag = true; if (AllItemsList[i].iRnd == IDROP_NEVER) - okflag = FALSE; + okflag = false; if (m != -1) { if (monster[m].mLevel < AllItemsList[i].iMinMLvl) - okflag = FALSE; + okflag = false; } else { if (2 * curlv < AllItemsList[i].iMinMLvl) - okflag = FALSE; + okflag = false; } if (AllItemsList[i].itype == ITYPE_MISC) - okflag = FALSE; + okflag = false; if (AllItemsList[i].itype == ITYPE_GOLD) - okflag = FALSE; + okflag = false; if (AllItemsList[i].iMiscId == IMISC_BOOK) - okflag = TRUE; + okflag = true; if (AllItemsList[i].iSpell == SPL_RESURRECT && !gbIsMultiplayer) - okflag = FALSE; + okflag = false; if (AllItemsList[i].iSpell == SPL_HEALOTHER && !gbIsMultiplayer) - okflag = FALSE; + okflag = false; if (okflag && ri < 512) { ril[ri] = i; ri++; @@ -2614,15 +2614,15 @@ int RndTypeItems(int itype, int imid, int lvl) if (!IsItemAvailable(i)) continue; - okflag = TRUE; + okflag = true; if (AllItemsList[i].iRnd == IDROP_NEVER) - okflag = FALSE; + okflag = false; if (lvl << 1 < AllItemsList[i].iMinMLvl) - okflag = FALSE; + okflag = false; if (AllItemsList[i].itype != itype) - okflag = FALSE; + okflag = false; if (imid != -1 && AllItemsList[i].iMiscId != imid) - okflag = FALSE; + okflag = false; if (okflag && ri < 512) { ril[ri] = i; ri++; @@ -2648,7 +2648,7 @@ int CheckUnique(int i, int lvl, int uper, bool recreate) if (UniqueItemList[j].UIItemId == AllItemsList[items[i].IDidx].iItemId && lvl >= UniqueItemList[j].UIMinLvl && (recreate || !UniqueItemFlag[j] || gbIsMultiplayer)) { - uok[j] = TRUE; + uok[j] = true; numu++; } } @@ -2764,7 +2764,7 @@ void SetupAllItems(int ii, int idx, int iseed, int lvl, int uper, bool onlygood, if (iblvl != -1) { uid = CheckUnique(ii, iblvl, uper, recreate); if (uid == UITYPE_INVALID) { - GetItemBonus(ii, idx, iblvl >> 1, iblvl, onlygood, TRUE); + GetItemBonus(ii, idx, iblvl >> 1, iblvl, onlygood, true); } else { GetUniqueItem(ii, uid); } @@ -2790,14 +2790,14 @@ void SpawnItem(int m, int x, int y, bool sendmsg) SpawnUnique(-(idx + 1), x, y); return; } - onlygood = TRUE; + onlygood = true; } else if (quests[Q_MUSHROOM]._qactive != QUEST_ACTIVE || quests[Q_MUSHROOM]._qvar1 != QS_MUSHGIVEN) { idx = RndItem(m); if (!idx) return; if (idx > 0) { idx--; - onlygood = FALSE; + onlygood = false; } else { SpawnUnique(-(idx + 1), x, y); return; @@ -2818,10 +2818,10 @@ void SpawnItem(int m, int x, int y, bool sendmsg) if (!gbIsHellfire && monster[m].MType->mtype == MT_DIABLO) mLevel -= 15; - SetupAllItems(ii, idx, AdvanceRndSeed(), mLevel, upper, onlygood, FALSE, FALSE); + SetupAllItems(ii, idx, AdvanceRndSeed(), mLevel, upper, onlygood, false, false); if (sendmsg) - NetSendCmdDItem(FALSE, ii); + NetSendCmdDItem(false, ii); } static void SetupBaseItem(Sint32 x, Sint32 y, Sint32 idx, bool onlygood, bool sendmsg, bool delta) @@ -2833,10 +2833,10 @@ static void SetupBaseItem(Sint32 x, Sint32 y, Sint32 idx, bool onlygood, bool se GetSuperItemSpace(x, y, ii); int curlv = items_get_currlevel(); - SetupAllItems(ii, idx, AdvanceRndSeed(), 2 * curlv, 1, onlygood, FALSE, delta); + SetupAllItems(ii, idx, AdvanceRndSeed(), 2 * curlv, 1, onlygood, false, delta); if (sendmsg) - NetSendCmdDItem(FALSE, ii); + NetSendCmdDItem(false, ii); if (delta) DeltaAddItem(ii); } @@ -2906,7 +2906,7 @@ void CreateRndUseful(int pnum, int x, int y, bool sendmsg) SetupAllUseful(ii, AdvanceRndSeed(), curlv); if (sendmsg) - NetSendCmdDItem(FALSE, ii); + NetSendCmdDItem(false, ii); } void CreateTypeItem(int x, int y, bool onlygood, int itype, int imisc, bool sendmsg, bool delta) @@ -3044,7 +3044,7 @@ void items_427ABA(int x, int y) } CornerStone.item._itype = ITYPE_NONE; - CornerStone.activated = TRUE; + CornerStone.activated = true; if (dItem[x][y]) { int ii = dItem[x][y] - 1; for (int i = 0; i < numitems; i++) { @@ -3068,7 +3068,7 @@ void items_427ABA(int x, int y) UnPackItem(&PkSItem, &items[ii], (PkSItem.dwBuff & CF_HELLFIRE) != 0); items[ii]._ix = x; items[ii]._iy = y; - RespawnItem(&items[ii], FALSE); + RespawnItem(&items[ii], false); CornerStone.item = items[ii]; } @@ -3109,11 +3109,11 @@ void SpawnQuestItem(int itemid, int x, int y, int randarea, int selflag) GetItemAttrs(ii, itemid, curlv); SetupItem(ii); - items[ii]._iPostDraw = TRUE; + items[ii]._iPostDraw = true; if (selflag) { items[ii]._iSelFlag = selflag; items[ii]._iAnimFrame = items[ii]._iAnimLen; - items[ii]._iAnimFlag = FALSE; + items[ii]._iAnimFlag = false; } } @@ -3143,7 +3143,7 @@ void SpawnRock() GetItemAttrs(ii, IDI_ROCK, curlv); SetupItem(ii); items[ii]._iSelFlag = 2; - items[ii]._iPostDraw = TRUE; + items[ii]._iPostDraw = true; items[ii]._iAnimFrame = 11; } @@ -3161,10 +3161,10 @@ void SpawnRewardItem(int itemid, int xx, int yy) GetItemAttrs(ii, itemid, curlv); SetupItem(ii); items[ii]._iSelFlag = 2; - items[ii]._iPostDraw = TRUE; + items[ii]._iPostDraw = true; items[ii]._iAnimFrame = 1; - items[ii]._iAnimFlag = TRUE; - items[ii]._iIdentified = TRUE; + items[ii]._iAnimFlag = true; + items[ii]._iIdentified = true; } void SpawnMapOfDoom(int xx, int yy) @@ -3191,15 +3191,15 @@ void RespawnItem(ItemStruct *item, bool FlipFlag) item->_iAnimLen = ItemAnimLs[it]; item->_iAnimWidth = 96; item->_iAnimWidth2 = 16; - item->_iPostDraw = FALSE; - item->_iRequest = FALSE; + item->_iPostDraw = false; + item->_iRequest = false; if (FlipFlag) { item->_iAnimFrame = 1; - item->_iAnimFlag = TRUE; + item->_iAnimFlag = true; item->_iSelFlag = 0; } else { item->_iAnimFrame = item->_iAnimLen; - item->_iAnimFlag = FALSE; + item->_iAnimFlag = false; item->_iSelFlag = 1; } @@ -3259,7 +3259,7 @@ void ProcessItems() if (items[ii]._iAnimFrame >= items[ii]._iAnimLen) { items[ii]._iAnimFrame = items[ii]._iAnimLen; - items[ii]._iAnimFlag = FALSE; + items[ii]._iAnimFlag = false; items[ii]._iSelFlag = 1; } } @@ -3309,8 +3309,8 @@ void CheckIdentify(int pnum, int cii) else pi = &plr[pnum].InvBody[cii]; - pi->_iIdentified = TRUE; - CalcPlrInv(pnum, TRUE); + pi->_iIdentified = true; + CalcPlrInv(pnum, true); if (pnum == myplr) SetCursor_(CURSOR_HAND); @@ -3362,7 +3362,7 @@ void DoRepair(int pnum, int cii) } RepairItem(pi, p->_pLevel); - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); if (pnum == myplr) SetCursor_(CURSOR_HAND); @@ -3399,7 +3399,7 @@ void DoRecharge(int pnum, int cii) r = GetSpellBookLevel(pi->_iSpell); r = random_(38, p->_pLevel / r) + 1; RechargeItem(pi, r); - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); } if (pnum == myplr) @@ -3411,13 +3411,13 @@ static bool OilItem(ItemStruct *x, PlayerStruct *p) int dur, r; if (x->_iClass == ICLASS_MISC) { - return FALSE; + return false; } if (x->_iClass == ICLASS_GOLD) { - return FALSE; + return false; } if (x->_iClass == ICLASS_QUEST) { - return FALSE; + return false; } switch (p->_pOilType) { @@ -3425,21 +3425,21 @@ static bool OilItem(ItemStruct *x, PlayerStruct *p) case IMISC_OILMAST: case IMISC_OILSHARP: if (x->_iClass == ICLASS_ARMOR) { - return FALSE; + return false; } break; case IMISC_OILDEATH: if (x->_iClass == ICLASS_ARMOR) { - return FALSE; + return false; } if (x->_itype == ITYPE_BOW) { - return FALSE; + return false; } break; case IMISC_OILHARD: case IMISC_OILIMP: if (x->_iClass == ICLASS_WEAPON) { - return FALSE; + return false; } break; default: @@ -3495,7 +3495,7 @@ static bool OilItem(ItemStruct *x, PlayerStruct *p) } } else { if (x->_iMaxDur >= 100) { - return TRUE; + return true; } dur = x->_iMaxDur + 1; x->_iMaxDur = dur; @@ -3525,9 +3525,9 @@ static bool OilItem(ItemStruct *x, PlayerStruct *p) } break; default: - return FALSE; + return false; } - return TRUE; + return true; } void DoOil(int pnum, int cii) @@ -3536,7 +3536,7 @@ void DoOil(int pnum, int cii) if (cii >= NUM_INVLOC || cii == INVLOC_HEAD || (cii > INVLOC_AMULET && cii <= INVLOC_CHEST)) { if (OilItem(&p->InvBody[cii], p)) { - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); if (pnum == myplr) { SetCursor_(CURSOR_HAND); } @@ -3549,145 +3549,145 @@ void PrintItemOil(char IDidx) switch (IDidx) { case IMISC_OILACC: strcpy(tempstr, "increases a weapon's"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); strcpy(tempstr, "chance to hit"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_OILMAST: strcpy(tempstr, "greatly increases a"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); strcpy(tempstr, "weapon's chance to hit"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_OILSHARP: strcpy(tempstr, "increases a weapon's"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); strcpy(tempstr, "damage potential"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_OILDEATH: strcpy(tempstr, "greatly increases a weapon's"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); strcpy(tempstr, "damage potential - not bows"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_OILSKILL: strcpy(tempstr, "reduces attributes needed"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); strcpy(tempstr, "to use armor or weapons"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_OILBSMTH: strcpy(tempstr, "restores 20% of an"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); strcpy(tempstr, "item's durability"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_OILFORT: strcpy(tempstr, "increases an item's"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); strcpy(tempstr, "current and max durability"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_OILPERM: strcpy(tempstr, "makes an item indestructible"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_OILHARD: strcpy(tempstr, "increases the armor class"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); strcpy(tempstr, "of armor and shields"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_OILIMP: strcpy(tempstr, "greatly increases the armor"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); strcpy(tempstr, "class of armor and shields"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_RUNEF: strcpy(tempstr, "sets fire trap"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_RUNEL: strcpy(tempstr, "sets lightning trap"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_GR_RUNEL: strcpy(tempstr, "sets lightning trap"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_GR_RUNEF: strcpy(tempstr, "sets fire trap"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_RUNES: strcpy(tempstr, "sets petrification trap"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_FULLHEAL: strcpy(tempstr, "fully recover life"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_HEAL: strcpy(tempstr, "recover partial life"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_OLDHEAL: strcpy(tempstr, "recover life"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_DEADHEAL: strcpy(tempstr, "deadly heal"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_MANA: strcpy(tempstr, "recover mana"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_FULLMANA: strcpy(tempstr, "fully recover mana"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_ELIXSTR: strcpy(tempstr, "increase strength"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_ELIXMAG: strcpy(tempstr, "increase magic"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_ELIXDEX: strcpy(tempstr, "increase dexterity"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_ELIXVIT: strcpy(tempstr, "increase vitality"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_ELIXWEAK: strcpy(tempstr, "decrease strength"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_ELIXDIS: strcpy(tempstr, "decrease strength"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_ELIXCLUM: strcpy(tempstr, "decrease dexterity"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_ELIXSICK: strcpy(tempstr, "decrease vitality"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_REJUV: strcpy(tempstr, "recover life and mana"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; case IMISC_FULLREJUV: strcpy(tempstr, "fully recover life and mana"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); break; } } @@ -4037,30 +4037,30 @@ void DrawUniqueInfo(CelOutputBuffer out) if ((!chrflag && !questlog) || gnScreenWidth >= SPANEL_WIDTH * 3) { uid = curruitem._iUid; DrawUTextBack(GlobalBackBuffer()); - PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, 2, TRUE, UniqueItemList[uid].UIName, COL_GOLD); + PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, 2, true, UniqueItemList[uid].UIName, COL_GOLD); DrawULine(out, 5); PrintItemPower(UniqueItemList[uid].UIPower1, &curruitem); y = 6 - UniqueItemList[uid].UINumPL + 8; - PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y, TRUE, tempstr, COL_WHITE); + PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y, true, tempstr, COL_WHITE); if (UniqueItemList[uid].UINumPL > 1) { PrintItemPower(UniqueItemList[uid].UIPower2, &curruitem); - PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y + 2, TRUE, tempstr, COL_WHITE); + PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y + 2, true, tempstr, COL_WHITE); } if (UniqueItemList[uid].UINumPL > 2) { PrintItemPower(UniqueItemList[uid].UIPower3, &curruitem); - PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y + 4, TRUE, tempstr, COL_WHITE); + PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y + 4, true, tempstr, COL_WHITE); } if (UniqueItemList[uid].UINumPL > 3) { PrintItemPower(UniqueItemList[uid].UIPower4, &curruitem); - PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y + 6, TRUE, tempstr, COL_WHITE); + PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y + 6, true, tempstr, COL_WHITE); } if (UniqueItemList[uid].UINumPL > 4) { PrintItemPower(UniqueItemList[uid].UIPower5, &curruitem); - PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y + 8, TRUE, tempstr, COL_WHITE); + PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y + 8, true, tempstr, COL_WHITE); } if (UniqueItemList[uid].UINumPL > 5) { PrintItemPower(UniqueItemList[uid].UIPower6, &curruitem); - PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y + 10, TRUE, tempstr, COL_WHITE); + PrintUString(out, 0 + RIGHT_PANEL - SPANEL_WIDTH, y + 10, true, tempstr, COL_WHITE); } } } @@ -4069,48 +4069,48 @@ void PrintItemMisc(ItemStruct *x) { if (x->_iMiscId == IMISC_SCROLL) { strcpy(tempstr, "Right-click to read"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMiscId == IMISC_SCROLLT) { strcpy(tempstr, "Right-click to read, then"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); strcpy(tempstr, "left-click to target"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMiscId >= IMISC_USEFIRST && x->_iMiscId <= IMISC_USELAST) { PrintItemOil(x->_iMiscId); strcpy(tempstr, "Right-click to use"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMiscId > IMISC_OILFIRST && x->_iMiscId < IMISC_OILLAST) { PrintItemOil(x->_iMiscId); strcpy(tempstr, "Right click to use"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMiscId > IMISC_RUNEFIRST && x->_iMiscId < IMISC_RUNELAST) { PrintItemOil(x->_iMiscId); strcpy(tempstr, "Right click to use"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMiscId == IMISC_BOOK) { strcpy(tempstr, "Right-click to read"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMiscId == IMISC_NOTE) { strcpy(tempstr, "Right click to read"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMiscId == IMISC_MAPOFDOOM) { strcpy(tempstr, "Right-click to view"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMiscId == IMISC_EAR) { sprintf(tempstr, "Level: %i", x->_ivalue); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMiscId == IMISC_AURIC) { sprintf(tempstr, "Doubles gold capacity"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } } @@ -4128,9 +4128,9 @@ static void PrintItemInfo(ItemStruct *x) sprintf(tempstr + strlen(tempstr), " %i Mag", mag); if (dex) sprintf(tempstr + strlen(tempstr), " %i Dex", dex); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } - pinfoflag = TRUE; + pinfoflag = true; } void PrintItemDetails(ItemStruct *x) @@ -4147,14 +4147,14 @@ void PrintItemDetails(ItemStruct *x) else sprintf(tempstr, "damage: %i-%i Dur: %i/%i", x->_iMinDam, x->_iMaxDam, x->_iDurability, x->_iMaxDur); } - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iClass == ICLASS_ARMOR) { if (x->_iMaxDur == DUR_INDESTRUCTIBLE) sprintf(tempstr, "armor: %i Indestructible", x->_iAC); else sprintf(tempstr, "armor: %i Dur: %i/%i", x->_iAC, x->_iDurability, x->_iMaxDur); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMiscId == IMISC_STAFF && x->_iMaxCharges) { if (x->_iMinDam == x->_iMaxDam) @@ -4162,19 +4162,19 @@ void PrintItemDetails(ItemStruct *x) else sprintf(tempstr, "dam: %i-%i Dur: %i/%i", x->_iMinDam, x->_iMaxDam, x->_iDurability, x->_iMaxDur); sprintf(tempstr, "Charges: %i/%i", x->_iCharges, x->_iMaxCharges); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iPrePower != -1) { PrintItemPower(x->_iPrePower, x); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iSufPower != -1) { PrintItemPower(x->_iSufPower, x); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMagical == ITEM_QUALITY_UNIQUE) { - AddPanelString("unique item", TRUE); - uitemflag = TRUE; + AddPanelString("unique item", true); + uitemflag = true; curruitem = *x; } PrintItemInfo(x); @@ -4194,29 +4194,29 @@ void PrintItemDur(ItemStruct *x) else sprintf(tempstr, "damage: %i-%i Dur: %i/%i", x->_iMinDam, x->_iMaxDam, x->_iDurability, x->_iMaxDur); } - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); if (x->_iMiscId == IMISC_STAFF && x->_iMaxCharges) { sprintf(tempstr, "Charges: %i/%i", x->_iCharges, x->_iMaxCharges); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (x->_iMagical != ITEM_QUALITY_NORMAL) - AddPanelString("Not Identified", TRUE); + AddPanelString("Not Identified", true); } if (x->_iClass == ICLASS_ARMOR) { if (x->_iMaxDur == DUR_INDESTRUCTIBLE) sprintf(tempstr, "armor: %i Indestructible", x->_iAC); else sprintf(tempstr, "armor: %i Dur: %i/%i", x->_iAC, x->_iDurability, x->_iMaxDur); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); if (x->_iMagical != ITEM_QUALITY_NORMAL) - AddPanelString("Not Identified", TRUE); + AddPanelString("Not Identified", true); if (x->_iMiscId == IMISC_STAFF && x->_iMaxCharges) { sprintf(tempstr, "Charges: %i/%i", x->_iCharges, x->_iMaxCharges); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } } if (x->_itype == ITYPE_RING || x->_itype == ITYPE_AMULET) - AddPanelString("Not Identified", TRUE); + AddPanelString("Not Identified", true); PrintItemInfo(x); } @@ -4239,12 +4239,12 @@ void UseItem(int p, item_misc_id Mid, spell_id spl) plr[p]._pHPBase += l; if (plr[p]._pHPBase > plr[p]._pMaxHPBase) plr[p]._pHPBase = plr[p]._pMaxHPBase; - drawhpflag = TRUE; + drawhpflag = true; break; case IMISC_FULLHEAL: plr[p]._pHitPoints = plr[p]._pMaxHP; plr[p]._pHPBase = plr[p]._pMaxHPBase; - drawhpflag = TRUE; + drawhpflag = true; break; case IMISC_MANA: j = plr[p]._pMaxMana >> 8; @@ -4260,14 +4260,14 @@ void UseItem(int p, item_misc_id Mid, spell_id spl) plr[p]._pManaBase += l; if (plr[p]._pManaBase > plr[p]._pMaxManaBase) plr[p]._pManaBase = plr[p]._pMaxManaBase; - drawmanaflag = TRUE; + drawmanaflag = true; } break; case IMISC_FULLMANA: if (!(plr[p]._pIFlags & ISPL_NOMANA)) { plr[p]._pMana = plr[p]._pMaxMana; plr[p]._pManaBase = plr[p]._pMaxManaBase; - drawmanaflag = TRUE; + drawmanaflag = true; } break; case IMISC_ELIXSTR: @@ -4278,7 +4278,7 @@ void UseItem(int p, item_misc_id Mid, spell_id spl) if (gbIsHellfire) { plr[p]._pMana = plr[p]._pMaxMana; plr[p]._pManaBase = plr[p]._pMaxManaBase; - drawmanaflag = TRUE; + drawmanaflag = true; } break; case IMISC_ELIXDEX: @@ -4289,7 +4289,7 @@ void UseItem(int p, item_misc_id Mid, spell_id spl) if (gbIsHellfire) { plr[p]._pHitPoints = plr[p]._pMaxHP; plr[p]._pHPBase = plr[p]._pMaxHPBase; - drawhpflag = TRUE; + drawhpflag = true; } break; case IMISC_REJUV: @@ -4305,7 +4305,7 @@ void UseItem(int p, item_misc_id Mid, spell_id spl) plr[p]._pHPBase += l; if (plr[p]._pHPBase > plr[p]._pMaxHPBase) plr[p]._pHPBase = plr[p]._pMaxHPBase; - drawhpflag = TRUE; + drawhpflag = true; j = plr[p]._pMaxMana >> 8; l = ((j >> 1) + random_(40, j)) << 6; if (plr[p]._pClass == PC_SORCERER) @@ -4319,17 +4319,17 @@ void UseItem(int p, item_misc_id Mid, spell_id spl) plr[p]._pManaBase += l; if (plr[p]._pManaBase > plr[p]._pMaxManaBase) plr[p]._pManaBase = plr[p]._pMaxManaBase; - drawmanaflag = TRUE; + drawmanaflag = true; } break; case IMISC_FULLREJUV: plr[p]._pHitPoints = plr[p]._pMaxHP; plr[p]._pHPBase = plr[p]._pMaxHPBase; - drawhpflag = TRUE; + drawhpflag = true; if (!(plr[p]._pIFlags & ISPL_NOMANA)) { plr[p]._pMana = plr[p]._pMaxMana; plr[p]._pManaBase = plr[p]._pMaxManaBase; - drawmanaflag = TRUE; + drawmanaflag = true; } break; case IMISC_SCROLL: @@ -4347,7 +4347,7 @@ void UseItem(int p, item_misc_id Mid, spell_id spl) plr[p].destParam1 = cursmx; plr[p].destParam2 = cursmy; if (p == myplr && spl == SPL_NOVA) - NetSendCmdLoc(TRUE, CMD_NOVA, cursmx, cursmy); + NetSendCmdLoc(true, CMD_NOVA, cursmx, cursmy); } break; case IMISC_SCROLLT: @@ -4380,7 +4380,7 @@ void UseItem(int p, item_misc_id Mid, spell_id spl) } if (p == myplr) CalcPlrBookVals(p); - drawmanaflag = TRUE; + drawmanaflag = true; break; case IMISC_MAPOFDOOM: doom_init(); @@ -4400,10 +4400,10 @@ void UseItem(int p, item_misc_id Mid, spell_id spl) return; } if (sbookflag) { - sbookflag = FALSE; + sbookflag = false; } if (!invflag) { - invflag = TRUE; + invflag = true; } NewCursor(CURSOR_OIL); break; @@ -4452,13 +4452,13 @@ bool StoreStatOk(ItemStruct *h) { bool sf; - sf = TRUE; + sf = true; if (plr[myplr]._pStrength < h->_iMinStr) - sf = FALSE; + sf = false; if (plr[myplr]._pMagic < h->_iMinMag) - sf = FALSE; + sf = false; if (plr[myplr]._pDexterity < h->_iMinDex) - sf = FALSE; + sf = false; return sf; } @@ -4467,17 +4467,17 @@ bool SmithItemOk(int i) { bool rv; - rv = TRUE; + rv = true; if (AllItemsList[i].itype == ITYPE_MISC) - rv = FALSE; + rv = false; if (AllItemsList[i].itype == ITYPE_GOLD) - rv = FALSE; + rv = false; if (AllItemsList[i].itype == ITYPE_STAFF && (!gbIsHellfire || AllItemsList[i].iSpell)) - rv = FALSE; + rv = false; if (AllItemsList[i].itype == ITYPE_RING) - rv = FALSE; + rv = false; if (AllItemsList[i].itype == ITYPE_AMULET) - rv = FALSE; + rv = false; return rv; } @@ -4526,13 +4526,13 @@ void SortSmith() j++; } - sorted = FALSE; + sorted = false; while (j > 0 && !sorted) { - sorted = TRUE; + sorted = true; for (k = 0; k < j; k++) { if (smithitem[k].IDidx > smithitem[k + 1].IDidx) { BubbleSwapItem(&smithitem[k], &smithitem[k + 1]); - sorted = FALSE; + sorted = false; } } j--; @@ -4566,7 +4566,7 @@ void SpawnSmith(int lvl) } while (items[0]._iIvalue > maxValue); smithitem[i] = items[0]; smithitem[i]._iCreateInfo = lvl | CF_SMITH; - smithitem[i]._iIdentified = TRUE; + smithitem[i]._iIdentified = true; smithitem[i]._iStatFlag = StoreStatOk(&smithitem[i]); } for (i = iCnt; i < SMITH_ITEMS; i++) @@ -4580,21 +4580,21 @@ bool PremiumItemOk(int i) { bool rv; - rv = TRUE; + rv = true; if (AllItemsList[i].itype == ITYPE_MISC) - rv = FALSE; + rv = false; if (AllItemsList[i].itype == ITYPE_GOLD) - rv = FALSE; + rv = false; if (!gbIsHellfire && AllItemsList[i].itype == ITYPE_STAFF) - rv = FALSE; + rv = false; if (gbIsMultiplayer) { if (AllItemsList[i].iMiscId == IMISC_OILOF) - rv = FALSE; + rv = false; if (AllItemsList[i].itype == ITYPE_RING) - rv = FALSE; + rv = false; if (AllItemsList[i].itype == ITYPE_AMULET) - rv = FALSE; + rv = false; } return rv; @@ -4659,7 +4659,7 @@ static void SpawnOnePremium(int i, int plvl, int myplr) SetRndSeed(items[0]._iSeed); int itype = RndPremiumItem(plvl >> 2, plvl) - 1; GetItemAttrs(0, itype, plvl); - GetItemBonus(0, itype, plvl >> 1, plvl, TRUE, !gbIsHellfire); + GetItemBonus(0, itype, plvl >> 1, plvl, true, !gbIsHellfire); if (!gbIsHellfire) { if (items[0]._iIvalue > 140000) @@ -4715,7 +4715,7 @@ static void SpawnOnePremium(int i, int plvl, int myplr) && count < 150); premiumitem[i] = items[0]; premiumitem[i]._iCreateInfo = plvl | CF_SMITHPREMIUM; - premiumitem[i]._iIdentified = TRUE; + premiumitem[i]._iIdentified = true; premiumitem[i]._iStatFlag = StoreStatOk(&premiumitem[i]); items[0] = holditem; } @@ -4768,27 +4768,27 @@ bool WitchItemOk(int i) { bool rv; - rv = FALSE; + rv = false; if (AllItemsList[i].itype == ITYPE_MISC) - rv = TRUE; + rv = true; if (AllItemsList[i].itype == ITYPE_STAFF) - rv = TRUE; + rv = true; if (AllItemsList[i].iMiscId == IMISC_MANA) - rv = FALSE; + rv = false; if (AllItemsList[i].iMiscId == IMISC_FULLMANA) - rv = FALSE; + rv = false; if (AllItemsList[i].iSpell == SPL_TOWN) - rv = FALSE; + rv = false; if (AllItemsList[i].iMiscId == IMISC_FULLHEAL) - rv = FALSE; + rv = false; if (AllItemsList[i].iMiscId == IMISC_HEAL) - rv = FALSE; + rv = false; if (AllItemsList[i].iMiscId > IMISC_OILFIRST && AllItemsList[i].iMiscId < IMISC_OILLAST) - rv = FALSE; + rv = false; if (AllItemsList[i].iSpell == SPL_RESURRECT && !gbIsMultiplayer) - rv = FALSE; + rv = false; if (AllItemsList[i].iSpell == SPL_HEALOTHER && !gbIsMultiplayer) - rv = FALSE; + rv = false; return rv; } @@ -4824,13 +4824,13 @@ void SortWitch() j++; } - sorted = FALSE; + sorted = false; while (j > 3 && !sorted) { - sorted = TRUE; + sorted = true; for (k = 3; k < j; k++) { if (witchitem[k].IDidx > witchitem[k + 1].IDidx) { BubbleSwapItem(&witchitem[k], &witchitem[k + 1]); - sorted = FALSE; + sorted = false; } } j--; @@ -4866,17 +4866,17 @@ void SpawnWitch(int lvl) GetItemAttrs(0, IDI_MANA, 1); witchitem[0] = items[0]; witchitem[0]._iCreateInfo = lvl; - witchitem[0]._iStatFlag = TRUE; + witchitem[0]._iStatFlag = true; memset(&items[0], 0, sizeof(*items)); GetItemAttrs(0, IDI_FULLMANA, 1); witchitem[1] = items[0]; witchitem[1]._iCreateInfo = lvl; - witchitem[1]._iStatFlag = TRUE; + witchitem[1]._iStatFlag = true; memset(&items[0], 0, sizeof(*items)); GetItemAttrs(0, IDI_PORTAL, 1); witchitem[2] = items[0]; witchitem[2]._iCreateInfo = lvl; - witchitem[2]._iStatFlag = TRUE; + witchitem[2]._iStatFlag = true; if (gbIsHellfire) { iCnt = random_(51, WITCH_ITEMS - 10) + 10; @@ -4895,7 +4895,7 @@ void SpawnWitch(int lvl) GetItemAttrs(0, i, lvl); witchitem[j] = items[0]; witchitem[j]._iCreateInfo = lvl | CF_WITCH; - witchitem[j]._iIdentified = TRUE; + witchitem[j]._iIdentified = true; WitchBookLevel(j); witchitem[j]._iStatFlag = StoreStatOk(&witchitem[j]); j++; @@ -4920,11 +4920,11 @@ void SpawnWitch(int lvl) if (maxlvl == -1 && items[0]._iMiscId == IMISC_STAFF) maxlvl = 2 * lvl; if (maxlvl != -1) - GetItemBonus(0, idata, maxlvl >> 1, maxlvl, TRUE, TRUE); + GetItemBonus(0, idata, maxlvl >> 1, maxlvl, true, true); } while (items[0]._iIvalue > maxValue); witchitem[i] = items[0]; witchitem[i]._iCreateInfo = lvl | CF_WITCH; - witchitem[i]._iIdentified = TRUE; + witchitem[i]._iIdentified = true; WitchBookLevel(i); witchitem[i]._iStatFlag = StoreStatOk(&witchitem[i]); } @@ -4989,7 +4989,7 @@ void SpawnBoy(int lvl) SetRndSeed(items[0]._iSeed); itype = RndBoyItem(lvl) - 1; GetItemAttrs(0, itype, lvl); - GetItemBonus(0, itype, lvl, 2 * lvl, TRUE, TRUE); + GetItemBonus(0, itype, lvl, 2 * lvl, true, true); if (!gbIsHellfire) { if (items[0]._iIvalue > 140000) @@ -5077,7 +5077,7 @@ void SpawnBoy(int lvl) && count < 250); boyitem = items[0]; boyitem._iCreateInfo = lvl | CF_BOY; - boyitem._iIdentified = TRUE; + boyitem._iIdentified = true; boyitem._iStatFlag = StoreStatOk(&boyitem); boylevel = lvl >> 1; } @@ -5086,7 +5086,7 @@ void SpawnBoy(int lvl) bool HealerItemOk(int i) { if (AllItemsList[i].itype != ITYPE_MISC) - return FALSE; + return false; if (AllItemsList[i].iMiscId == IMISC_SCROLL) return AllItemsList[i].iSpell == SPL_HEAL; @@ -5105,11 +5105,11 @@ bool HealerItemOk(int i) } if (AllItemsList[i].iMiscId == IMISC_REJUV) - return TRUE; + return true; if (AllItemsList[i].iMiscId == IMISC_FULLREJUV) - return TRUE; + return true; - return FALSE; + return false; } int RndHealerItem(int lvl) @@ -5142,13 +5142,13 @@ void SortHealer() j++; } - sorted = FALSE; + sorted = false; while (j > 2 && !sorted) { - sorted = TRUE; + sorted = true; for (k = 2; k < j; k++) { if (healitem[k].IDidx > healitem[k + 1].IDidx) { BubbleSwapItem(&healitem[k], &healitem[k + 1]); - sorted = FALSE; + sorted = false; } } j--; @@ -5163,20 +5163,20 @@ void SpawnHealer(int lvl) GetItemAttrs(0, IDI_HEAL, 1); healitem[0] = items[0]; healitem[0]._iCreateInfo = lvl; - healitem[0]._iStatFlag = TRUE; + healitem[0]._iStatFlag = true; memset(&items[0], 0, sizeof(*items)); GetItemAttrs(0, IDI_FULLHEAL, 1); healitem[1] = items[0]; healitem[1]._iCreateInfo = lvl; - healitem[1]._iStatFlag = TRUE; + healitem[1]._iStatFlag = true; if (gbIsMultiplayer) { memset(&items[0], 0, sizeof(*items)); GetItemAttrs(0, IDI_RESURRECT, 1); healitem[2] = items[0]; healitem[2]._iCreateInfo = lvl; - healitem[2]._iStatFlag = TRUE; + healitem[2]._iStatFlag = true; srnd = 3; } else { @@ -5191,7 +5191,7 @@ void SpawnHealer(int lvl) GetItemAttrs(0, itype, lvl); healitem[i] = items[0]; healitem[i]._iCreateInfo = lvl | CF_HEALER; - healitem[i]._iIdentified = TRUE; + healitem[i]._iIdentified = true; healitem[i]._iStatFlag = StoreStatOk(&healitem[i]); } for (i = nsi; i < 20; i++) { @@ -5205,7 +5205,7 @@ void SpawnStoreGold() memset(&items[0], 0, sizeof(*items)); GetItemAttrs(0, IDI_GOLD, 1); golditem = items[0]; - golditem._iStatFlag = TRUE; + golditem._iStatFlag = true; } void RecreateSmithItem(int ii, int idx, int lvl, int iseed) @@ -5216,7 +5216,7 @@ void RecreateSmithItem(int ii, int idx, int lvl, int iseed) items[ii]._iSeed = iseed; items[ii]._iCreateInfo = lvl | CF_SMITH; - items[ii]._iIdentified = TRUE; + items[ii]._iIdentified = true; } void RecreatePremiumItem(int ii, int idx, int plvl, int iseed) @@ -5224,11 +5224,11 @@ void RecreatePremiumItem(int ii, int idx, int plvl, int iseed) SetRndSeed(iseed); int itype = RndPremiumItem(plvl >> 2, plvl) - 1; GetItemAttrs(ii, itype, plvl); - GetItemBonus(ii, itype, plvl >> 1, plvl, TRUE, !gbIsHellfire); + GetItemBonus(ii, itype, plvl >> 1, plvl, true, !gbIsHellfire); items[ii]._iSeed = iseed; items[ii]._iCreateInfo = plvl | CF_SMITHPREMIUM; - items[ii]._iIdentified = TRUE; + items[ii]._iIdentified = true; } void RecreateBoyItem(int ii, int idx, int lvl, int iseed) @@ -5236,11 +5236,11 @@ void RecreateBoyItem(int ii, int idx, int lvl, int iseed) SetRndSeed(iseed); int itype = RndBoyItem(lvl) - 1; GetItemAttrs(ii, itype, lvl); - GetItemBonus(ii, itype, lvl, 2 * lvl, TRUE, TRUE); + GetItemBonus(ii, itype, lvl, 2 * lvl, true, true); items[ii]._iSeed = iseed; items[ii]._iCreateInfo = lvl | CF_BOY; - items[ii]._iIdentified = TRUE; + items[ii]._iIdentified = true; } void RecreateWitchItem(int ii, int idx, int lvl, int iseed) @@ -5261,12 +5261,12 @@ void RecreateWitchItem(int ii, int idx, int lvl, int iseed) if (iblvl == -1 && items[ii]._iMiscId == IMISC_STAFF) iblvl = 2 * lvl; if (iblvl != -1) - GetItemBonus(ii, itype, iblvl >> 1, iblvl, TRUE, TRUE); + GetItemBonus(ii, itype, iblvl >> 1, iblvl, true, true); } items[ii]._iSeed = iseed; items[ii]._iCreateInfo = lvl | CF_WITCH; - items[ii]._iIdentified = TRUE; + items[ii]._iIdentified = true; } void RecreateHealerItem(int ii, int idx, int lvl, int iseed) @@ -5283,7 +5283,7 @@ void RecreateHealerItem(int ii, int idx, int lvl, int iseed) items[ii]._iSeed = iseed; items[ii]._iCreateInfo = lvl | CF_HEALER; - items[ii]._iIdentified = TRUE; + items[ii]._iIdentified = true; } void RecreateTownItem(int ii, int idx, WORD icreateinfo, int iseed, int ivalue) @@ -5331,7 +5331,7 @@ int ItemNoFlippy() { int r = itemactive[numitems - 1]; items[r]._iAnimFrame = items[r]._iAnimLen; - items[r]._iAnimFlag = FALSE; + items[r]._iAnimFlag = false; items[r]._iSelFlag = 1; return r; @@ -5356,14 +5356,14 @@ void CreateSpellBook(int x, int y, spell_id ispell, bool sendmsg, bool delta) while (true) { memset(&items[ii], 0, sizeof(*items)); - SetupAllItems(ii, idx, AdvanceRndSeed(), 2 * lvl, 1, TRUE, FALSE, delta); + SetupAllItems(ii, idx, AdvanceRndSeed(), 2 * lvl, 1, true, false, delta); if (items[ii]._iMiscId == IMISC_BOOK && items[ii]._iSpell == ispell) break; } GetSuperItemSpace(x, y, ii); if (sendmsg) - NetSendCmdDItem(FALSE, ii); + NetSendCmdDItem(false, ii); if (delta) DeltaAddItem(ii); } @@ -5378,7 +5378,7 @@ static void CreateMagicItem(int x, int y, int lvl, int imisc, int imid, int icur while (true) { memset(&items[ii], 0, sizeof(*items)); - SetupAllItems(ii, idx, AdvanceRndSeed(), 2 * lvl, 1, TRUE, FALSE, delta); + SetupAllItems(ii, idx, AdvanceRndSeed(), 2 * lvl, 1, true, false, delta); if (items[ii]._iCurs == icurs) break; @@ -5387,7 +5387,7 @@ static void CreateMagicItem(int x, int y, int lvl, int imisc, int imid, int icur GetSuperItemSpace(x, y, ii); if (sendmsg) - NetSendCmdDItem(FALSE, ii); + NetSendCmdDItem(false, ii); if (delta) DeltaAddItem(ii); } @@ -5440,11 +5440,11 @@ bool GetItemRecord(int nSeed, WORD wCI, int nIndex) NextItemRecord(i); i--; } else if (nSeed == itemrecord[i].nSeed && wCI == itemrecord[i].wCI && nIndex == itemrecord[i].nIndex) { - return FALSE; + return false; } } - return TRUE; + return true; } void SetItemRecord(int nSeed, WORD wCI, int nIndex) diff --git a/Source/lighting.cpp b/Source/lighting.cpp index 918812f7..88ed0bed 100644 --- a/Source/lighting.cpp +++ b/Source/lighting.cpp @@ -689,7 +689,7 @@ void DoVision(int nXPos, int nYPos, int nRadius, bool doautomap, bool visible) for (v = 0; v < 4; v++) { for (j = 0; j < 23; j++) { - nBlockerFlag = FALSE; + nBlockerFlag = false; nLineLen = 2 * (nRadius - RadiusAdj[j]); for (k = 0; k < nLineLen && !nBlockerFlag; k += 2) { x1adj = 0; @@ -749,7 +749,7 @@ void DoVision(int nXPos, int nYPos, int nRadius, bool doautomap, bool visible) if (!nBlockerFlag) { nTrans = dTransVal[nCrawlX][nCrawlY]; if (nTrans != 0) { - TransList[nTrans] = TRUE; + TransList[nTrans] = true; } } } @@ -981,7 +981,7 @@ void ToggleLighting() { int i; - lightflag ^= TRUE; + lightflag ^= true; if (lightflag) { memset(dLight, 0, sizeof(dLight)); @@ -1010,8 +1010,8 @@ void InitLighting() int i; numlights = 0; - dolighting = FALSE; - lightflag = FALSE; + dolighting = false; + lightflag = false; for (i = 0; i < MAXLIGHTS; i++) { lightactive[i] = i; @@ -1035,9 +1035,9 @@ int AddLight(int x, int y, int r) LightList[lid]._lradius = r; LightList[lid]._xoff = 0; LightList[lid]._yoff = 0; - LightList[lid]._ldel = FALSE; - LightList[lid]._lunflag = FALSE; - dolighting = TRUE; + LightList[lid]._ldel = false; + LightList[lid]._lunflag = false; + dolighting = true; } return lid; @@ -1049,8 +1049,8 @@ void AddUnLight(int i) return; } - LightList[i]._ldel = TRUE; - dolighting = TRUE; + LightList[i]._ldel = true; + dolighting = true; } void ChangeLightRadius(int i, int r) @@ -1059,12 +1059,12 @@ void ChangeLightRadius(int i, int r) return; } - LightList[i]._lunflag = TRUE; + LightList[i]._lunflag = true; LightList[i]._lunx = LightList[i]._lx; LightList[i]._luny = LightList[i]._ly; LightList[i]._lunr = LightList[i]._lradius; LightList[i]._lradius = r; - dolighting = TRUE; + dolighting = true; } void ChangeLightXY(int i, int x, int y) @@ -1073,13 +1073,13 @@ void ChangeLightXY(int i, int x, int y) return; } - LightList[i]._lunflag = TRUE; + LightList[i]._lunflag = true; LightList[i]._lunx = LightList[i]._lx; LightList[i]._luny = LightList[i]._ly; LightList[i]._lunr = LightList[i]._lradius; LightList[i]._lx = x; LightList[i]._ly = y; - dolighting = TRUE; + dolighting = true; } void ChangeLightOff(int i, int x, int y) @@ -1088,13 +1088,13 @@ void ChangeLightOff(int i, int x, int y) return; } - LightList[i]._lunflag = TRUE; + LightList[i]._lunflag = true; LightList[i]._lunx = LightList[i]._lx; LightList[i]._luny = LightList[i]._ly; LightList[i]._lunr = LightList[i]._lradius; LightList[i]._xoff = x; LightList[i]._yoff = y; - dolighting = TRUE; + dolighting = true; } void ChangeLight(int i, int x, int y, int r) @@ -1103,14 +1103,14 @@ void ChangeLight(int i, int x, int y, int r) return; } - LightList[i]._lunflag = TRUE; + LightList[i]._lunflag = true; LightList[i]._lunx = LightList[i]._lx; LightList[i]._luny = LightList[i]._ly; LightList[i]._lunr = LightList[i]._lradius; LightList[i]._lx = x; LightList[i]._ly = y; LightList[i]._lradius = r; - dolighting = TRUE; + dolighting = true; } void ProcessLightList() @@ -1130,7 +1130,7 @@ void ProcessLightList() } if (LightList[j]._lunflag) { DoUnLight(LightList[j]._lunx, LightList[j]._luny, LightList[j]._lunr); - LightList[j]._lunflag = FALSE; + LightList[j]._lunflag = false; } } for (i = 0; i < numlights; i++) { @@ -1152,7 +1152,7 @@ void ProcessLightList() } } - dolighting = FALSE; + dolighting = false; } void SavePreLighting() @@ -1165,11 +1165,11 @@ void InitVision() int i; numvision = 0; - dovision = FALSE; + dovision = false; visionid = 1; for (i = 0; i < TransVal; i++) { - TransList[i] = FALSE; + TransList[i] = false; } } @@ -1183,11 +1183,11 @@ int AddVision(int x, int y, int r, bool mine) VisionList[numvision]._lradius = r; vid = visionid++; VisionList[numvision]._lid = vid; - VisionList[numvision]._ldel = FALSE; - VisionList[numvision]._lunflag = FALSE; + VisionList[numvision]._ldel = false; + VisionList[numvision]._lunflag = false; VisionList[numvision]._lflags = mine != 0; numvision++; - dovision = TRUE; + dovision = true; } return vid; @@ -1199,12 +1199,12 @@ void ChangeVisionRadius(int id, int r) for (i = 0; i < numvision; i++) { if (VisionList[i]._lid == id) { - VisionList[i]._lunflag = TRUE; + VisionList[i]._lunflag = true; VisionList[i]._lunx = VisionList[i]._lx; VisionList[i]._luny = VisionList[i]._ly; VisionList[i]._lunr = VisionList[i]._lradius; VisionList[i]._lradius = r; - dovision = TRUE; + dovision = true; } } } @@ -1215,13 +1215,13 @@ void ChangeVisionXY(int id, int x, int y) for (i = 0; i < numvision; i++) { if (VisionList[i]._lid == id) { - VisionList[i]._lunflag = TRUE; + VisionList[i]._lunflag = true; VisionList[i]._lunx = VisionList[i]._lx; VisionList[i]._luny = VisionList[i]._ly; VisionList[i]._lunr = VisionList[i]._lradius; VisionList[i]._lx = x; VisionList[i]._ly = y; - dovision = TRUE; + dovision = true; } } } @@ -1238,11 +1238,11 @@ void ProcessVisionList() } if (VisionList[i]._lunflag) { DoUnVision(VisionList[i]._lunx, VisionList[i]._luny, VisionList[i]._lunr); - VisionList[i]._lunflag = FALSE; + VisionList[i]._lunflag = false; } } for (i = 0; i < TransVal; i++) { - TransList[i] = FALSE; + TransList[i] = false; } for (i = 0; i < numvision; i++) { if (!VisionList[i]._ldel) { @@ -1255,20 +1255,20 @@ void ProcessVisionList() } } do { - delflag = FALSE; + delflag = false; for (i = 0; i < numvision; i++) { if (VisionList[i]._ldel) { numvision--; if (numvision > 0 && i != numvision) { VisionList[i] = VisionList[numvision]; } - delflag = TRUE; + delflag = true; } } } while (delflag); } - dovision = FALSE; + dovision = false; } void lighting_color_cycling() diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp index aa54cdd4..ac5e463f 100644 --- a/Source/loadsave.cpp +++ b/Source/loadsave.cpp @@ -507,7 +507,7 @@ static void LoadPlayer(LoadHelper *file, int p) pPlayer->pDifficulty = file->nextLE(); pPlayer->pDamAcFlags = file->nextLE(); file->skip(20); // Available bytes - CalcPlrItemVals(p, FALSE); + CalcPlrItemVals(p, false); // Omit pointer _pNData // Omit pointer _pWData @@ -1166,7 +1166,7 @@ void LoadGame(bool firstflag) missiles_process_charge(); ResetPal(); SetCursor_(CURSOR_HAND); - gbProcessPlayers = TRUE; + gbProcessPlayers = true; if (gbIsHellfireSaveGame != gbIsHellfire) { RemoveEmptyLevelItems(); @@ -1903,7 +1903,7 @@ void SaveGame() file.flush(); - gbValidSaveFile = TRUE; + gbValidSaveFile = true; pfile_rename_temp_to_perm(); pfile_write_hero(); } @@ -1988,9 +1988,9 @@ void SaveLevel() } if (!setlevel) - plr[myplr]._pLvlVisited[currlevel] = TRUE; + plr[myplr]._pLvlVisited[currlevel] = true; else - plr[myplr]._pSLvlVisited[setlvlnum] = TRUE; + plr[myplr]._pSLvlVisited[setlvlnum] = true; } void LoadLevel() @@ -2081,12 +2081,12 @@ void LoadLevel() AutomapZoomReset(); ResyncQuests(); SyncPortals(); - dolighting = TRUE; + dolighting = true; } for (int i = 0; i < MAX_PLRS; i++) { if (plr[i].plractive && currlevel == plr[i].plrlevel) - LightList[plr[i]._plid]._lunflag = TRUE; + LightList[plr[i]._plid]._lunflag = true; } } diff --git a/Source/mainmenu.cpp b/Source/mainmenu.cpp index 89423213..061ef158 100644 --- a/Source/mainmenu.cpp +++ b/Source/mainmenu.cpp @@ -39,7 +39,7 @@ static bool mainmenu_init_menu(int type) bool success; if (type == SELHERO_PREVIOUS) - return TRUE; + return true; music_stop(); @@ -66,9 +66,9 @@ static void mainmenu_play_intro() { music_stop(); if (gbIsHellfire) - play_movie("gendata\\Hellfire.smk", TRUE); + play_movie("gendata\\Hellfire.smk", true); else - play_movie("gendata\\diablo1.smk", TRUE); + play_movie("gendata\\diablo1.smk", true); mainmenu_refresh_music(); } @@ -98,12 +98,12 @@ bool mainmenu_select_hero_dialog(GameData *gameData) } if (dlgresult == SELHERO_PREVIOUS) { SErrSetLastError(1223); - return FALSE; + return false; } pfile_create_player_description(); - return TRUE; + return true; } void mainmenu_loop() @@ -112,7 +112,7 @@ void mainmenu_loop() int menu; mainmenu_refresh_music(); - done = FALSE; + done = false; do { menu = 0; @@ -122,16 +122,16 @@ void mainmenu_loop() switch (menu) { case MAINMENU_SINGLE_PLAYER: if (!mainmenu_single_player()) - done = TRUE; + done = true; break; case MAINMENU_MULTIPLAYER: if (!mainmenu_multi_player()) - done = TRUE; + done = true; break; case MAINMENU_ATTRACT_MODE: case MAINMENU_REPLAY_INTRO: if (gbIsSpawn && !gbIsHellfire) - done = FALSE; + done = false; else if (gbActive) mainmenu_play_intro(); break; @@ -142,7 +142,7 @@ void mainmenu_loop() UiSupportDialog(); break; case MAINMENU_EXIT_DIABLO: - done = TRUE; + done = true; break; } } while (!done); diff --git a/Source/missiles.cpp b/Source/missiles.cpp index 7aca67b6..bf008bf6 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -221,13 +221,13 @@ bool CheckBlock(int fx, int fy, int tx, int ty) int pn; bool coll; - coll = FALSE; + coll = false; while (fx != tx || fy != ty) { pn = GetDirection(fx, fy, tx, ty); fx += XDirAdd[pn]; fy += YDirAdd[pn]; if (nSolidTable[dPiece[fx][fy]]) - coll = TRUE; + coll = true; } return coll; @@ -406,8 +406,8 @@ void DeleteMissile(int mi, int i) if (missile[mi]._mitype == MIS_MANASHIELD) { src = missile[mi]._misource; if (src == myplr) - NetSendCmd(TRUE, CMD_REMSHIELD); - plr[src].pManaShield = FALSE; + NetSendCmd(true, CMD_REMSHIELD); + plr[src].pManaShield = false; } missileavail[MAXMISSILES - nummissiles] = mi; @@ -439,7 +439,7 @@ void PutMissile(int i) x = missile[i]._mix; y = missile[i]._miy; if (x <= 0 || y <= 0 || x >= MAXDUNX || y >= MAXDUNY) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; if (!missile[i]._miDelFlag) { dFlags[x][y] |= BFLAG_MISSILE; if (dMissile[x][y] == 0) @@ -533,30 +533,30 @@ bool MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, bool shift) int hit, hper, dam, mor; bool resist, ret; - resist = FALSE; + resist = false; if (monster[m].mtalkmsg) { - return FALSE; + return false; } if (monster[m]._mhitpoints >> 6 <= 0) { - return FALSE; + return false; } if (monster[m].MType->mtype == MT_ILLWEAV && monster[m]._mgoal == MGOAL_RETREAT) - return FALSE; + return false; if (monster[m]._mmode == MM_CHARGE) - return FALSE; + return false; missile_resistance mir = missiledata[t].mResist; mor = monster[m].mMagicRes; if (mor & IMMUNE_MAGIC && mir == MISR_MAGIC || mor & IMMUNE_FIRE && mir == MISR_FIRE || mor & IMMUNE_LIGHTNING && mir == MISR_LIGHTNING) { - return FALSE; + return false; } if ((mor & RESIST_MAGIC && mir == MISR_MAGIC) || (mor & RESIST_FIRE && mir == MISR_FIRE) || (mor & RESIST_LIGHTNING && mir == MISR_LIGHTNING)) { - resist = TRUE; + resist = true; } hit = random_(68, 100); @@ -603,9 +603,9 @@ bool MonsterTrapHit(int m, int mindam, int maxdam, int dist, int t, bool shift) M_StartHit(m, -1, dam); } } - return TRUE; + return true; } else { - return FALSE; + return false; } } @@ -614,16 +614,16 @@ bool MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, bool int hit, hper, dam, mor; bool resist, ret; - resist = FALSE; + resist = false; if (monster[m].mtalkmsg || monster[m]._mhitpoints >> 6 <= 0 || t == MIS_HBOLT && monster[m].MType->mtype != MT_DIABLO && monster[m].MData->mMonstClass != MC_UNDEAD) { - return FALSE; + return false; } if (monster[m].MType->mtype == MT_ILLWEAV && monster[m]._mgoal == MGOAL_RETREAT) - return FALSE; + return false; if (monster[m]._mmode == MM_CHARGE) - return FALSE; + return false; mor = monster[m].mMagicRes; missile_resistance mir = missiledata[t].mResist; @@ -632,15 +632,15 @@ bool MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, bool || mor & IMMUNE_FIRE && mir == MISR_FIRE || mor & IMMUNE_LIGHTNING && mir == MISR_LIGHTNING || (mor & IMMUNE_ACID) && mir == MISR_ACID) - return FALSE; + return false; if (mor & RESIST_MAGIC && mir == MISR_MAGIC || mor & RESIST_FIRE && mir == MISR_FIRE || mor & RESIST_LIGHTNING && mir == MISR_LIGHTNING) - resist = TRUE; + resist = true; if (gbIsHellfire && t == MIS_HBOLT && (monster[m].MType->mtype == MT_DIABLO || monster[m].MType->mtype == MT_BONEDEMN)) - resist = TRUE; + resist = true; hit = random_(69, 100); if (pnum != -1) { @@ -729,10 +729,10 @@ bool MonsterMHit(int pnum, int m, int mindam, int maxdam, int dist, int t, bool monster[m]._lastx = plr[pnum]._px; monster[m]._lasty = plr[pnum]._py; } - return TRUE; + return true; } - return FALSE; + return false; } bool PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool shift, int earflag, bool *blocked) @@ -741,15 +741,15 @@ bool PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool s *blocked = false; if (plr[pnum]._pHitPoints >> 6 <= 0) { - return FALSE; + return false; } if (plr[pnum]._pInvincible) { - return FALSE; + return false; } if (plr[pnum]._pSpellFlags & 1 && missiledata[mtype].mType == 0) { - return FALSE; + return false; } hit = random_(72, 100); @@ -793,7 +793,7 @@ bool PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool s blk = 100; } - if (shift == TRUE) + if (shift == true) blk = 100; if (mtype == MIS_ACIDPUD) blk = 100; @@ -826,7 +826,7 @@ bool PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool s if (mtype == MIS_BONESPIRIT) { dam = plr[pnum]._pHitPoints / 3; } else { - if (shift == FALSE) { + if (shift == false) { dam = (mind << 6) + random_(75, (maxd - mind + 1) << 6); if (m == -1) @@ -851,7 +851,7 @@ bool PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool s } *blocked = true; StartPlrBlock(pnum, dir); - return TRUE; + return true; } if (resper > 0) { @@ -881,9 +881,9 @@ bool PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool s } else if (plr[pnum]._pClass == PC_BARBARIAN) { PlaySfxLoc(PS_WARR69, plr[pnum]._px, plr[pnum]._py); } - drawhpflag = TRUE; + drawhpflag = true; } - return TRUE; + return true; } if (pnum == myplr) { plr[pnum]._pHitPoints -= dam; @@ -896,11 +896,11 @@ bool PlayerMHit(int pnum, int m, int dist, int mind, int maxd, int mtype, bool s if (plr[pnum]._pHitPoints >> 6 <= 0) { SyncPlrKill(pnum, earflag); } else { - StartPlrHit(pnum, dam, FALSE); + StartPlrHit(pnum, dam, false); } - return TRUE; + return true; } - return FALSE; + return false; } bool Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, bool shift, bool *blocked) @@ -913,15 +913,15 @@ bool Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, b *blocked = false; if (plr[p]._pInvincible) { - return FALSE; + return false; } if (mtype == MIS_HBOLT) { - return FALSE; + return false; } if (plr[p]._pSpellFlags & 1 && missiledata[mtype].mType == 0) { - return FALSE; + return false; } switch (missiledata[mtype].mResist) { @@ -972,7 +972,7 @@ bool Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, b } else { blkper = 100; } - if (shift == TRUE) + if (shift == true) blkper = 100; blk = plr[p]._pDexterity + plr[p]._pBaseToBlk + (plr[p]._pLevel << 1) - (plr[pnum]._pLevel << 1); @@ -997,7 +997,7 @@ bool Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, b if (resper > 0) { dam -= (dam * resper) / 100; if (pnum == myplr) - NetSendCmdDamage(TRUE, p, dam); + NetSendCmdDamage(true, p, dam); if (plr[pnum]._pClass == PC_WARRIOR) { PlaySfxLoc(PS_WARR69, plr[pnum]._px, plr[pnum]._py); } else if (plr[pnum]._pClass == PC_ROGUE) { @@ -1011,20 +1011,20 @@ bool Plr2PlrMHit(int pnum, int p, int mindam, int maxdam, int dist, int mtype, b } else if (plr[pnum]._pClass == PC_BARBARIAN) { PlaySfxLoc(PS_WARR69, plr[pnum]._px, plr[pnum]._py); } - return TRUE; + return true; } else { if (blkper < blk) { StartPlrBlock(p, GetDirection(plr[p]._px, plr[p]._py, plr[pnum]._px, plr[pnum]._py)); *blocked = true; } else { if (pnum == myplr) - NetSendCmdDamage(TRUE, p, dam); - StartPlrHit(p, dam, FALSE); + NetSendCmdDamage(true, p, dam); + StartPlrHit(p, dam, false); } - return TRUE; + return true; } } - return FALSE; + return false; } void CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, bool nodel) @@ -1052,7 +1052,7 @@ void CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, shift)) { if (!nodel) missile[i]._mirange = 0; - missile[i]._miHitFlag = TRUE; + missile[i]._miHitFlag = true; } } else { if (dMonster[mx][my] < 0 @@ -1067,7 +1067,7 @@ void CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, shift)) { if (!nodel) missile[i]._mirange = 0; - missile[i]._miHitFlag = TRUE; + missile[i]._miHitFlag = true; } } if (dPlayer[mx][my] > 0 @@ -1093,7 +1093,7 @@ void CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, } else if (!nodel) { missile[i]._mirange = 0; } - missile[i]._miHitFlag = TRUE; + missile[i]._miHitFlag = true; } } else { if (monster[missile[i]._misource]._mFlags & MFLAG_TARGETS_MONSTER @@ -1102,7 +1102,7 @@ void CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, && MonsterTrapHit(dMonster[mx][my] - 1, mindam, maxdam, missile[i]._midist, missile[i]._mitype, shift)) { if (!nodel) missile[i]._mirange = 0; - missile[i]._miHitFlag = TRUE; + missile[i]._miHitFlag = true; } if (dPlayer[mx][my] > 0 && PlayerMHit( @@ -1127,7 +1127,7 @@ void CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, } else if (!nodel) { missile[i]._mirange = 0; } - missile[i]._miHitFlag = TRUE; + missile[i]._miHitFlag = true; } } } else { @@ -1143,12 +1143,12 @@ void CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, shift)) { if (!nodel) missile[i]._mirange = 0; - missile[i]._miHitFlag = TRUE; + missile[i]._miHitFlag = true; } } else if (MonsterTrapHit(dMonster[mx][my] - 1, mindam, maxdam, missile[i]._midist, missile[i]._mitype, shift)) { if (!nodel) missile[i]._mirange = 0; - missile[i]._miHitFlag = TRUE; + missile[i]._miHitFlag = true; } } if (dPlayer[mx][my] > 0) { @@ -1174,7 +1174,7 @@ void CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, } else if (!nodel) { missile[i]._mirange = 0; } - missile[i]._miHitFlag = TRUE; + missile[i]._miHitFlag = true; } } } @@ -1185,13 +1185,13 @@ void CheckMissileCol(int i, int mindam, int maxdam, bool shift, int mx, int my, BreakObject(-1, oi); if (!nodel) missile[i]._mirange = 0; - missile[i]._miHitFlag = FALSE; + missile[i]._miHitFlag = false; } } if (nMissileTable[dPiece[mx][my]]) { if (!nodel) missile[i]._mirange = 0; - missile[i]._miHitFlag = FALSE; + missile[i]._miHitFlag = false; } if (missile[i]._mirange == 0 && missiledata[missile[i]._mitype].miSFX != -1) PlaySfxLoc(missiledata[missile[i]._mitype].miSFX, missile[i]._mix, missile[i]._miy); @@ -1303,15 +1303,15 @@ void InitMissiles() { int mi, src, i, j; - AutoMapShowItems = FALSE; + AutoMapShowItems = false; plr[myplr]._pSpellFlags &= ~0x1; - if (plr[myplr]._pInfraFlag == TRUE) { + if (plr[myplr]._pInfraFlag == true) { for (i = 0; i < nummissiles; ++i) { mi = missileactive[i]; if (missile[mi]._mitype == MIS_INFRA) { src = missile[mi]._misource; if (src == myplr) - CalcPlrItemVals(src, TRUE); + CalcPlrItemVals(src, true); } } } @@ -1324,7 +1324,7 @@ void InitMissiles() if (missile[mi]._mitype == MIS_BLODBOIL) { if (missile[mi]._misource == myplr) { int missingHP = plr[myplr]._pMaxHP - plr[myplr]._pHitPoints; - CalcPlrItemVals(myplr, TRUE); + CalcPlrItemVals(myplr, true); plr[myplr]._pHitPoints -= missingHP + missile[mi]._miVar2; if (plr[myplr]._pHitPoints < 64) { plr[myplr]._pHitPoints = 64; @@ -1359,7 +1359,7 @@ void AddHiveExplosion(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sin AddMissile(80, 63, 80, 62, midir, MIS_HIVEEXP, mienemy, id, dam, 0); AddMissile(81, 62, 80, 62, midir, MIS_HIVEEXP, mienemy, id, dam, 0); AddMissile(81, 63, 80, 62, midir, MIS_HIVEEXP, mienemy, id, dam, 0); - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } static bool missiles_found_target(Sint32 mi, Sint32 *x, Sint32 *y, Sint32 rad) @@ -1402,13 +1402,13 @@ void AddFireRune(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m UseMana(id, SPL_RUNEFIRE); if (missiles_found_target(mi, &dx, &dy, 10)) { missile[mi]._miVar1 = MIS_HIVEEXP; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; missile[mi]._mlid = AddLight(dx, dy, 8); } else { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } } else { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } } @@ -1419,13 +1419,13 @@ void AddLightningRune(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sin UseMana(id, SPL_RUNELIGHT); if (missiles_found_target(mi, &dx, &dy, 10)) { missile[mi]._miVar1 = MIS_LIGHTBALL; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; missile[mi]._mlid = AddLight(dx, dy, 8); } else { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } } else { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } } @@ -1436,13 +1436,13 @@ void AddGreatLightningRune(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy UseMana(id, SPL_RUNENOVA); if (missiles_found_target(mi, &dx, &dy, 10)) { missile[mi]._miVar1 = MIS_NOVA; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; missile[mi]._mlid = AddLight(dx, dy, 8); } else { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } } else { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } } @@ -1453,13 +1453,13 @@ void AddImmolationRune(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Si UseMana(id, SPL_RUNEIMMOLAT); if (missiles_found_target(mi, &dx, &dy, 10)) { missile[mi]._miVar1 = MIS_IMMOLATION; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; missile[mi]._mlid = AddLight(dx, dy, 8); } else { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } } else { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } } @@ -1470,13 +1470,13 @@ void AddStoneRune(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 UseMana(id, SPL_RUNESTONE); if (missiles_found_target(mi, &dx, &dy, 10)) { missile[mi]._miVar1 = MIS_STONE; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; missile[mi]._mlid = AddLight(dx, dy, 8); } else { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } } else { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } } @@ -1539,7 +1539,7 @@ void AddBerserk(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mi } } missile[mi]._mirange = 0; - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } void AddHorkSpawn(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) @@ -1587,7 +1587,7 @@ void AddJester(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mid break; } AddMissile(sx, sy, dx, dy, midir, spell, missile[mi]._micaster, missile[mi]._misource, 0, missile[mi]._mispllvl); - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; missile[mi]._mirange = 0; } @@ -1608,7 +1608,7 @@ void AddStealPotions(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint if (pnum) { pnum = pnum > 0 ? pnum - 1 : -(pnum + 1); - hasPlayedSFX = FALSE; + hasPlayedSFX = false; for (si = 0; si < MAXBELTITEMS; si++) { ii = -1; if (plr[pnum].SpdList[si]._itype == ITYPE_MISC) { @@ -1653,12 +1653,12 @@ void AddStealPotions(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint if (ii != -1) { SetPlrHandItem(&plr[pnum].HoldItem, ii); GetPlrHandSeed(&plr[pnum].HoldItem); - plr[pnum].HoldItem._iStatFlag = TRUE; + plr[pnum].HoldItem._iStatFlag = true; plr[pnum].SpdList[si] = plr[pnum].HoldItem; } if (!hasPlayedSFX) { PlaySfxLoc(IS_POPPOP2, tx, ty); - hasPlayedSFX = TRUE; + hasPlayedSFX = true; } } force_redraw = 255; @@ -1667,7 +1667,7 @@ void AddStealPotions(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint } } missile[mi]._mirange = 0; - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } void AddManaTrap(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) @@ -1690,8 +1690,8 @@ void AddManaTrap(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m pid = -(pid + 1); plr[pid]._pMana = 0; plr[pid]._pManaBase = plr[pid]._pMana + plr[pid]._pMaxManaBase - plr[pid]._pMaxMana; - CalcPlrInv(pid, FALSE); - drawmanaflag = TRUE; + CalcPlrInv(pid, false); + drawmanaflag = true; PlaySfxLoc(TSFX_COW7, tx, ty); } } @@ -1699,7 +1699,7 @@ void AddManaTrap(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m } } missile[mi]._mirange = 0; - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } void AddSpecArrow(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) @@ -1927,8 +1927,8 @@ void AddMana(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir if (plr[id]._pManaBase > plr[id]._pMaxManaBase) plr[id]._pManaBase = plr[id]._pMaxManaBase; UseMana(id, SPL_MANA); - missile[mi]._miDelFlag = TRUE; - drawmanaflag = TRUE; + missile[mi]._miDelFlag = true; + drawmanaflag = true; } void AddMagi(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) @@ -1936,18 +1936,18 @@ void AddMagi(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir plr[id]._pMana = plr[id]._pMaxMana; plr[id]._pManaBase = plr[id]._pMaxManaBase; UseMana(id, SPL_MAGI); - missile[mi]._miDelFlag = TRUE; - drawmanaflag = TRUE; + missile[mi]._miDelFlag = true; + drawmanaflag = true; } void AddRing(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; if (mienemy == TARGET_MONSTERS) UseMana(id, SPL_FIRERING); missile[mi]._miVar1 = sx; missile[mi]._miVar2 = sy; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; missile[mi]._miVar3 = 0; missile[mi]._miVar4 = 0; missile[mi]._miVar5 = 0; @@ -1962,7 +1962,7 @@ void AddSearch(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mid int i, mx, r1, r2; MissileStruct *mis; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; missile[mi]._miVar1 = id; missile[mi]._miVar2 = 0; missile[mi]._miVar3 = 0; @@ -1971,7 +1971,7 @@ void AddSearch(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mid missile[mi]._miVar6 = 0; missile[mi]._miVar7 = 0; missile[mi]._miVar8 = 0; - AutoMapShowItems = TRUE; + AutoMapShowItems = true; int lvl = 2; if (id > 0) lvl = plr[id]._pLevel * 2; @@ -1988,7 +1988,7 @@ void AddSearch(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mid r2 = mis->_mirange; if (r2 < INT_MAX - r1) mis->_mirange = r1 + r2; - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; break; } } @@ -2248,7 +2248,7 @@ void AddTeleport(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m { int i, pn, k, j, tx, ty; - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; for (i = 0; i < 6; i++) { k = CrawlNum[i]; pn = k + 2; @@ -2261,7 +2261,7 @@ void AddTeleport(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m missile[mi]._miy = ty; missile[mi]._misx = tx; missile[mi]._misy = ty; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; i = 6; break; } @@ -2437,9 +2437,9 @@ bool CheckIfTrig(int x, int y) for (i = 0; i < numtrigs; i++) { if ((x == trigs[i]._tx && y == trigs[i]._ty) || (abs(trigs[i]._tx - x) < 2 && abs(trigs[i]._ty - y) < 2)) - return TRUE; + return true; } - return FALSE; + return false; } void AddTown(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) @@ -2447,7 +2447,7 @@ void AddTown(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir int i, j, k, mx, tx, ty, dp; if (currlevel != 0) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; for (j = 0; j < 6; j++) { k = CrawlNum[j] + 2; for (i = (BYTE)CrawlTable[CrawlNum[j]]; i > 0; i--) { @@ -2461,7 +2461,7 @@ void AddTown(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir missile[mi]._miy = ty; missile[mi]._misx = tx; missile[mi]._misy = ty; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; j = 6; break; } @@ -2477,7 +2477,7 @@ void AddTown(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir missile[mi]._miy = ty; missile[mi]._misx = tx; missile[mi]._misy = ty; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; } missile[mi]._mirange = 100; missile[mi]._miVar1 = missile[mi]._mirange - missile[mi]._miAnimLen; @@ -2490,9 +2490,9 @@ void AddTown(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir PutMissile(mi); if (id == myplr && !missile[mi]._miDelFlag && currlevel != 0) { if (!setlevel) { - NetSendCmdLocParam3(TRUE, CMD_ACTIVATEPORTAL, tx, ty, currlevel, leveltype, 0); + NetSendCmdLocParam3(true, CMD_ACTIVATEPORTAL, tx, ty, currlevel, leveltype, 0); } else { - NetSendCmdLocParam3(TRUE, CMD_ACTIVATEPORTAL, tx, ty, setlvlnum, leveltype, 1); + NetSendCmdLocParam3(true, CMD_ACTIVATEPORTAL, tx, ty, setlvlnum, leveltype, 1); } } } @@ -2539,7 +2539,7 @@ void AddFlash2(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mid missile[mi]._midam = currlevel >> 1; } } - missile[mi]._miPreFlag = TRUE; + missile[mi]._miPreFlag = true; missile[mi]._mirange = 19; } @@ -2552,8 +2552,8 @@ void AddManashield(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 if (mienemy == TARGET_MONSTERS) UseMana(id, SPL_MANASHIELD); if (id == myplr) - NetSendCmd(TRUE, CMD_SETSHIELD); - plr[id].pManaShield = TRUE; + NetSendCmd(true, CMD_SETSHIELD); + plr[id].pManaShield = true; } void AddFiremove(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) @@ -2577,7 +2577,7 @@ void AddGuardian(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m missile[mi]._midam += missile[mi]._midam >> 3; } - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; for (i = 0; i < 6; i++) { pn = CrawlNum[i]; k = pn + 2; @@ -2592,7 +2592,7 @@ void AddGuardian(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m missile[mi]._miy = ty; missile[mi]._misx = tx; missile[mi]._misy = ty; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; UseMana(id, SPL_GUARDIAN); i = 6; break; @@ -2603,7 +2603,7 @@ void AddGuardian(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m } } - if (missile[mi]._miDelFlag != TRUE) { + if (missile[mi]._miDelFlag != true) { missile[mi]._misource = id; missile[mi]._mlid = AddLight(missile[mi]._mix, missile[mi]._miy, 1); missile[mi]._mirange = missile[mi]._mispllvl + (plr[id]._pLevel >> 1); @@ -2633,7 +2633,7 @@ void AddBloodStar(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 { SetMissDir(mi, dx); missile[mi]._midam = 0; - missile[mi]._miLightFlag = TRUE; + missile[mi]._miLightFlag = true; missile[mi]._mirange = 250; } @@ -2643,7 +2643,7 @@ void AddBone(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir dx = 2; SetMissDir(mi, dx); missile[mi]._midam = 0; - missile[mi]._miLightFlag = TRUE; + missile[mi]._miLightFlag = true; missile[mi]._mirange = 250; } @@ -2653,7 +2653,7 @@ void AddMetlHit(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mi dx = 2; SetMissDir(mi, dx); missile[mi]._midam = 0; - missile[mi]._miLightFlag = TRUE; + missile[mi]._miLightFlag = true; missile[mi]._mirange = missile[mi]._miAnimLen; } @@ -2683,7 +2683,7 @@ void AddRhino(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midi missile[mi]._miAnimFrame = 7; missile[mi]._miVar1 = 0; missile[mi]._miVar2 = 0; - missile[mi]._miLightFlag = TRUE; + missile[mi]._miLightFlag = true; if (monster[id]._uniqtype != 0) { missile[mi]._miUniqTrans = monster[id]._uniqtrans + 1; missile[mi]._mlid = monster[id].mlid; @@ -2709,7 +2709,7 @@ void AddFireman(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mi missile[mi]._miAnimAdd = 1; missile[mi]._miVar1 = 0; missile[mi]._miVar2 = 0; - missile[mi]._miLightFlag = TRUE; + missile[mi]._miLightFlag = true; if (monster[id]._uniqtype != 0) missile[mi]._miUniqTrans = monster[id]._uniqtrans + 1; mon = &monster[id]; @@ -2733,7 +2733,7 @@ void AddFlare(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midi UseMana(id, SPL_FLARE); plr[id]._pHitPoints -= 320; plr[id]._pHPBase -= 320; - drawhpflag = TRUE; + drawhpflag = true; if (plr[id]._pHitPoints <= 0) SyncPlrKill(id, 0); } else { @@ -2786,10 +2786,10 @@ void AddAcidpud(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mi missile[mi]._miyvel = 0; missile[mi]._mixoff = 0; missile[mi]._miyoff = 0; - missile[mi]._miLightFlag = TRUE; + missile[mi]._miLightFlag = true; monst = missile[mi]._misource; missile[mi]._mirange = random_(50, 15) + 40 * (monster[monst]._mint + 1); - missile[mi]._miPreFlag = TRUE; + missile[mi]._miPreFlag = true; } void AddStone(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) @@ -2822,7 +2822,7 @@ void AddStone(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midi } if (j != -99) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } else { missile[mi]._mix = tx; missile[mi]._miy = ty; @@ -2843,12 +2843,12 @@ void AddGolem(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midi int i; int mx; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; for (i = 0; i < nummissiles; i++) { mx = missileactive[i]; if (missile[mx]._mitype == MIS_GOLEM) { if (mx != mi && missile[mx]._misource == id) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; return; } } @@ -2879,7 +2879,7 @@ void AddEtherealize(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint3 void AddDummy(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } void AddBlodbur(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) @@ -2894,7 +2894,7 @@ void AddBlodbur(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mi SetMissDir(mi, 0); else SetMissDir(mi, 1); - missile[mi]._miLightFlag = TRUE; + missile[mi]._miLightFlag = true; missile[mi]._mirange = missile[mi]._miAnimLen; } @@ -2938,13 +2938,13 @@ void AddHeal(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir plr[id]._pHPBase = plr[id]._pMaxHPBase; UseMana(id, SPL_HEAL); - missile[mi]._miDelFlag = TRUE; - drawhpflag = TRUE; + missile[mi]._miDelFlag = true; + drawhpflag = true; } void AddHealOther(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; UseMana(id, SPL_HEALOTHER); if (id == myplr) { SetCursor_(CURSOR_HEALOTHER); @@ -2982,13 +2982,13 @@ extern void FocusOnInventory(); void AddIdentify(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; UseMana(id, SPL_IDENTIFY); if (id == myplr) { if (sbookflag) - sbookflag = FALSE; + sbookflag = false; if (!invflag) { - invflag = TRUE; + invflag = true; if (sgbControllerActive) FocusOnInventory(); } @@ -3000,7 +3000,7 @@ void AddFirewallC(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 { int i, j, k, tx, ty, pn; - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; for (i = 0; i < 6; i++) { k = CrawlNum[i]; pn = k + 2; @@ -3015,7 +3015,7 @@ void AddFirewallC(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 missile[mi]._miVar2 = ty; missile[mi]._miVar5 = tx; missile[mi]._miVar6 = ty; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; i = 6; break; } @@ -3025,7 +3025,7 @@ void AddFirewallC(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 } } - if (missile[mi]._miDelFlag != TRUE) { + if (missile[mi]._miDelFlag != true) { missile[mi]._miVar7 = 0; missile[mi]._miVar8 = 0; missile[mi]._miVar3 = (midir - 2) & 7; @@ -3083,7 +3083,7 @@ void AddNova(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir void AddBlodboil(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) { if (id == -1 || plr[id]._pSpellFlags & 6 || plr[id]._pHitPoints <= plr[id]._pLevel << 6) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } else { _sfx_id blodboilSFX[NUM_CLASSES] = { PS_WARR70, @@ -3103,7 +3103,7 @@ void AddBlodboil(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m if (id > 0) lvl = plr[id]._pLevel * 2; missile[mi]._mirange = lvl + 10 * missile[mi]._mispllvl + 245; - CalcPlrItemVals(id, TRUE); + CalcPlrItemVals(id, true); force_redraw = 255; PlaySfxLoc(blodboilSFX[plr[id]._pClass], plr[id]._px, plr[id]._py); } @@ -3111,13 +3111,13 @@ void AddBlodboil(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m void AddRepair(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; UseMana(id, SPL_REPAIR); if (id == myplr) { if (sbookflag) - sbookflag = FALSE; + sbookflag = false; if (!invflag) { - invflag = TRUE; + invflag = true; if (sgbControllerActive) FocusOnInventory(); } @@ -3127,13 +3127,13 @@ void AddRepair(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 mid void AddRecharge(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; UseMana(id, SPL_RECHARGE); if (id == myplr) { if (sbookflag) - sbookflag = FALSE; + sbookflag = false; if (!invflag) { - invflag = TRUE; + invflag = true; if (sgbControllerActive) FocusOnInventory(); } @@ -3143,7 +3143,7 @@ void AddRecharge(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 m void AddDisarm(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; UseMana(id, SPL_DISARM); if (id == myplr) { SetCursor_(CURSOR_DISARM); @@ -3178,7 +3178,7 @@ void AddApoca(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midi missile[mi]._midam += random_(67, 6) + 1; } missile[mi]._mirange = 255; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; UseMana(id, SPL_APOCA); } @@ -3287,7 +3287,7 @@ void AddResurrect(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 if (sgbControllerActive) TryIconCurs(); } - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } void AddResurrectBeam(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) @@ -3303,7 +3303,7 @@ void AddResurrectBeam(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sin void AddTelekinesis(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 midir, Sint8 mienemy, Sint32 id, Sint32 dam) { - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; UseMana(id, SPL_TELEKINESIS); if (id == myplr) SetCursor_(CURSOR_TELEKINESIS); @@ -3329,7 +3329,7 @@ void AddBoneSpirit(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 UseMana(id, SPL_BONESPIRIT); plr[id]._pHitPoints -= 384; plr[id]._pHPBase -= 384; - drawhpflag = TRUE; + drawhpflag = true; if (plr[id]._pHitPoints <= 0) SyncPlrKill(id, 0); } @@ -3359,7 +3359,7 @@ void AddDiabApoca(Sint32 mi, Sint32 sx, Sint32 sy, Sint32 dx, Sint32 dy, Sint32 } } } - missile[mi]._miDelFlag = TRUE; + missile[mi]._miDelFlag = true; } int AddMissile(int sx, int sy, int dx, int dy, int midir, int mitype, int8_t micaster, int id, int midam, int spllvl) @@ -3369,7 +3369,7 @@ int AddMissile(int sx, int sy, int dx, int dy, int midir, int mitype, int8_t mic if (nummissiles >= MAXMISSILES - 1) return -1; - if (mitype == MIS_MANASHIELD && plr[id].pManaShield == TRUE) { + if (mitype == MIS_MANASHIELD && plr[id].pManaShield == true) { if (currlevel != plr[id].plrlevel) return -1; @@ -3409,13 +3409,13 @@ int AddMissile(int sx, int sy, int dx, int dy, int midir, int mitype, int8_t mic missile[mi]._misy = sy; missile[mi]._mitxoff = 0; missile[mi]._mityoff = 0; - missile[mi]._miDelFlag = FALSE; + missile[mi]._miDelFlag = false; missile[mi]._miAnimAdd = 1; - missile[mi]._miLightFlag = FALSE; - missile[mi]._miPreFlag = FALSE; + missile[mi]._miLightFlag = false; + missile[mi]._miPreFlag = false; missile[mi]._miUniqTrans = 0; missile[mi]._midam = midam; - missile[mi]._miHitFlag = FALSE; + missile[mi]._miHitFlag = false; missile[mi]._midist = 0; missile[mi]._mlid = NO_LIGHT; missile[mi]._mirnd = 0; @@ -3483,7 +3483,7 @@ void MI_Golem(Sint32 i) } } } - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } void MI_SetManashield(Sint32 i) @@ -3509,7 +3509,7 @@ void MI_LArrow(Sint32 i) maxd = random_(68, 10) + 1 + currlevel * 2; } missiledata[MIS_LARROW].mResist = MISR_LIGHTNING; - CheckMissileCol(i, mind, maxd, FALSE, missile[i]._mix, missile[i]._miy, TRUE); + CheckMissileCol(i, mind, maxd, false, missile[i]._mix, missile[i]._miy, true); } if (missile[i]._mitype == MIS_FARROW) { if (p != -1) { @@ -3520,7 +3520,7 @@ void MI_LArrow(Sint32 i) maxd = random_(68, 10) + 1 + currlevel * 2; } missiledata[MIS_FARROW].mResist = MISR_FIRE; - CheckMissileCol(i, mind, maxd, FALSE, missile[i]._mix, missile[i]._miy, TRUE); + CheckMissileCol(i, mind, maxd, false, missile[i]._mix, missile[i]._miy, true); } missiledata[missile[i]._mitype].mResist = rst; } else { @@ -3545,7 +3545,7 @@ void MI_LArrow(Sint32 i) if (missile[i]._mix != missile[i]._misx || missile[i]._miy != missile[i]._misy) { missile_resistance rst = missiledata[missile[i]._mitype].mResist; missiledata[missile[i]._mitype].mResist = MISR_NONE; - CheckMissileCol(i, mind, maxd, FALSE, missile[i]._mix, missile[i]._miy, FALSE); + CheckMissileCol(i, mind, maxd, false, missile[i]._mix, missile[i]._miy, false); missiledata[missile[i]._mitype].mResist = rst; } if (missile[i]._mirange == 0) { @@ -3567,7 +3567,7 @@ void MI_LArrow(Sint32 i) } } if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } PutMissile(i); @@ -3596,9 +3596,9 @@ void MI_Arrow(Sint32 i) maxd = 2 * currlevel; } if (missile[i]._mix != missile[i]._misx || missile[i]._miy != missile[i]._misy) - CheckMissileCol(i, mind, maxd, FALSE, missile[i]._mix, missile[i]._miy, FALSE); + CheckMissileCol(i, mind, maxd, false, missile[i]._mix, missile[i]._miy, false); if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; PutMissile(i); } @@ -3635,10 +3635,10 @@ void MI_Firebolt(Sint32 i) d = currlevel + random_(78, 2 * currlevel); } if (missile[i]._mix != missile[i]._misx || missile[i]._miy != missile[i]._misy) { - CheckMissileCol(i, d, d, FALSE, missile[i]._mix, missile[i]._miy, FALSE); + CheckMissileCol(i, d, d, false, missile[i]._mix, missile[i]._miy, false); } if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; missile[i]._mitxoff = omx; missile[i]._mityoff = omy; GetMissilePos(i); @@ -3656,7 +3656,7 @@ void MI_Firebolt(Sint32 i) case MIS_BONESPIRIT: SetMissDir(i, 8); missile[i]._mirange = 7; - missile[i]._miDelFlag = FALSE; + missile[i]._miDelFlag = false; PutMissile(i); return; case MIS_LICH: @@ -3690,7 +3690,7 @@ void MI_Firebolt(Sint32 i) } else if (missile[i]._mirange == 0) { if (missile[i]._mlid != NO_LIGHT) AddUnLight(missile[i]._mlid); - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; PlaySfxLoc(LS_BSIMPCT, missile[i]._mix, missile[i]._miy); PutMissile(i); } else @@ -3709,8 +3709,8 @@ void MI_Lightball(Sint32 i) missile[i]._mityoff += missile[i]._miyvel; GetMissilePos(i); j = missile[i]._mirange; - CheckMissileCol(i, missile[i]._midam, missile[i]._midam, FALSE, missile[i]._mix, missile[i]._miy, FALSE); - if (missile[i]._miHitFlag == TRUE) + 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]; if (obj && tx == missile[i]._mix && ty == missile[i]._miy) { @@ -3723,7 +3723,7 @@ void MI_Lightball(Sint32 i) missile[i]._mirange = j; } if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; PutMissile(i); } @@ -3733,9 +3733,9 @@ void MI_Krull(Sint32 i) missile[i]._mitxoff += missile[i]._mixvel; missile[i]._mityoff += missile[i]._miyvel; GetMissilePos(i); - CheckMissileCol(i, missile[i]._midam, missile[i]._midam, FALSE, missile[i]._mix, missile[i]._miy, FALSE); + CheckMissileCol(i, missile[i]._midam, missile[i]._midam, false, missile[i]._mix, missile[i]._miy, false); if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; PutMissile(i); } @@ -3745,11 +3745,11 @@ void MI_Acidpud(Sint32 i) missile[i]._mirange--; range = missile[i]._mirange; - CheckMissileCol(i, missile[i]._midam, missile[i]._midam, TRUE, missile[i]._mix, missile[i]._miy, FALSE); + CheckMissileCol(i, missile[i]._midam, missile[i]._midam, true, missile[i]._mix, missile[i]._miy, false); missile[i]._mirange = range; if (range == 0) { if (missile[i]._mimfnum != 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } else { SetMissDir(i, 1); missile[i]._mirange = missile[i]._miAnimLen; @@ -3772,9 +3772,9 @@ void MI_Firewall(Sint32 i) missile[i]._miAnimFrame = 13; missile[i]._miAnimAdd = -1; } - 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, missile[i]._miy, true); if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } if (missile[i]._mimfnum != 0 && missile[i]._mirange != 0 && missile[i]._miAnimAdd != -1 && missile[i]._miVar2 < 12) { @@ -3804,7 +3804,7 @@ void MI_Fireball(Sint32 i) if (missile[i]._miAnimType == MFILE_BIGEXP) { if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } } else { @@ -3871,7 +3871,7 @@ void MI_HorkSpawn(Sint32 i) missile[i]._mirange--; CheckMissileCol(i, 0, 0, 0, missile[i]._mix, missile[i]._miy, 0); if (missile[i]._mirange <= 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; for (j = 0; j < 2; j++) { k = CrawlNum[j] + 2; for (t = CrawlTable[CrawlNum[j]]; t > 0; t--, k += 2) { @@ -3881,7 +3881,7 @@ void MI_HorkSpawn(Sint32 i) dp = dPiece[tx][ty]; if (!nSolidTable[dp] && dMonster[tx][ty] == 0 && dPlayer[tx][ty] == 0 && dObject[tx][ty] == 0) { j = 6; - int mon = AddMonster(tx, ty, missile[i]._miVar1, 1, TRUE); + int mon = AddMonster(tx, ty, missile[i]._miVar1, 1, true); M_StartStand(mon, missile[i]._miVar1); break; } @@ -3919,7 +3919,7 @@ void MI_Rune(Sint32 i) pid = -(pid + 1); dir = GetDirection(missile[i]._mix, missile[i]._miy, plr[pid]._px, plr[pid]._py); } - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); AddMissile(mx, my, mx, my, dir, missile[i]._miVar1, TARGET_BOTH, missile[i]._misource, missile[i]._midam, missile[i]._mispllvl); } @@ -3933,10 +3933,10 @@ void MI_LightningWall(Sint32 i) missile[i]._mirange--; range = missile[i]._mirange; CheckMissileCol(i, missile[i]._midam, missile[i]._midam, 1, missile[i]._mix, missile[i]._miy, 0); - if (missile[i]._miHitFlag == TRUE) + if (missile[i]._miHitFlag == true) missile[i]._mirange = range; if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; PutMissile(i); } @@ -3944,7 +3944,7 @@ void MI_HiveExplode(Sint32 i) { missile[i]._mirange--; if (missile[i]._mirange <= 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } PutMissile(i); @@ -4014,7 +4014,7 @@ void MI_Immolation(Sint32 i) if (missile[i]._miAnimType == MFILE_BIGEXP) { if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } } else { @@ -4022,29 +4022,29 @@ void MI_Immolation(Sint32 i) missile[i]._mityoff += yof; GetMissilePos(i); if (missile[i]._mix != missile[i]._misx || missile[i]._miy != missile[i]._misy) - CheckMissileCol(i, dam, dam, FALSE, missile[i]._mix, missile[i]._miy, FALSE); + CheckMissileCol(i, dam, dam, false, missile[i]._mix, missile[i]._miy, false); if (missile[i]._mirange == 0) { 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, FALSE, mx, my, TRUE); + CheckMissileCol(i, dam, dam, false, mx, my, true); if (!CheckBlock(px, py, mx, my + 1)) - CheckMissileCol(i, dam, dam, FALSE, mx, my + 1, TRUE); + CheckMissileCol(i, dam, dam, false, mx, my + 1, true); if (!CheckBlock(px, py, mx, my - 1)) - CheckMissileCol(i, dam, dam, FALSE, mx, my - 1, TRUE); + CheckMissileCol(i, dam, dam, false, mx, my - 1, true); if (!CheckBlock(px, py, mx + 1, my)) - CheckMissileCol(i, dam, dam, FALSE, mx + 1, my, TRUE); + CheckMissileCol(i, dam, dam, false, mx + 1, my, true); if (!CheckBlock(px, py, mx + 1, my - 1)) - CheckMissileCol(i, dam, dam, FALSE, mx + 1, my - 1, TRUE); + CheckMissileCol(i, dam, dam, false, mx + 1, my - 1, true); if (!CheckBlock(px, py, mx + 1, my + 1)) - CheckMissileCol(i, dam, dam, FALSE, mx + 1, my + 1, TRUE); + CheckMissileCol(i, dam, dam, false, mx + 1, my + 1, true); if (!CheckBlock(px, py, mx - 1, my)) - CheckMissileCol(i, dam, dam, FALSE, mx - 1, my, TRUE); + CheckMissileCol(i, dam, dam, false, mx - 1, my, true); if (!CheckBlock(px, py, mx - 1, my + 1)) - CheckMissileCol(i, dam, dam, FALSE, mx - 1, my + 1, TRUE); + CheckMissileCol(i, dam, dam, false, mx - 1, my + 1, true); if (!CheckBlock(px, py, mx - 1, my - 1)) - CheckMissileCol(i, dam, dam, FALSE, mx - 1, my - 1, TRUE); + 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++; @@ -4069,7 +4069,7 @@ void MI_Immolation(Sint32 i) missile[i]._miVar2 = missile[i]._miy; ChangeLight(missile[i]._mlid, missile[i]._miVar1, missile[i]._miVar2, 8); } - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } PutMissile(i); @@ -4148,7 +4148,7 @@ void MI_LightningArrow(Sint32 i) } if (missile[i]._mirange == 0 || mx <= 0 || my <= 0 || mx >= MAXDUNX || my > MAXDUNY) { // BUGFIX my >= MAXDUNY - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } } @@ -4165,7 +4165,7 @@ void MI_FlashFront(Sint32 i) } missile[i]._mirange--; if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; if (missile[i]._micaster == TARGET_MONSTERS) { src = missile[i]._misource; if (src != -1) @@ -4185,7 +4185,7 @@ void MI_FlashBack(Sint32 i) } missile[i]._mirange--; if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; PutMissile(i); } @@ -4211,10 +4211,10 @@ void MI_Reflect(Sint32 i) missile[i]._miy++; } if (src != myplr && currlevel != plr[src].plrlevel) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; if (plr[src].wReflections <= 0) { - missile[i]._miDelFlag = TRUE; - NetSendCmd(TRUE, CMD_REFLECT); + missile[i]._miDelFlag = true; + NetSendCmd(true, CMD_REFLECT); } PutMissile(i); } @@ -4285,9 +4285,9 @@ void MI_Search(Sint32 i) { missile[i]._mirange--; if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; PlaySfxLoc(IS_CAST7, plr[missile[i]._miVar1]._px, plr[missile[i]._miVar1]._py); - AutoMapShowItems = FALSE; + AutoMapShowItems = false; } } @@ -4300,7 +4300,7 @@ void MI_LightningWallC(Sint32 i) lvl = plr[id]._pLevel; int dmg = 16 * (random_(53, 10) + random_(53, 10) + lvl + 2); if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } else { int dp = dPiece[missile[i]._miVar1][missile[i]._miVar2]; assert(dp <= MAXTILES && dp >= 0); @@ -4353,7 +4353,7 @@ void MI_FireNova(Sint32 i) } missile[i]._mirange--; if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } void MI_SpecArrow(Sint32 i) @@ -4394,7 +4394,7 @@ void MI_SpecArrow(Sint32 i) } missile[i]._mirange--; if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } void MI_Lightctrl(Sint32 i) @@ -4481,7 +4481,7 @@ void MI_Lightctrl(Sint32 i) } } if (missile[i]._mirange == 0 || mx <= 0 || my <= 0 || mx >= MAXDUNX || my > MAXDUNY) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } } @@ -4492,11 +4492,11 @@ void MI_Lightning(Sint32 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, TRUE, missile[i]._mix, missile[i]._miy, FALSE); - if (missile[i]._miHitFlag == TRUE) + 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 == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } PutMissile(i); @@ -4522,14 +4522,14 @@ void MI_Town(Sint32 i) if (plr[p].plractive && currlevel == plr[p].plrlevel && !plr[p]._pLvlChanging && plr[p]._pmode == PM_STAND && plr[p]._px == missile[i]._mix && plr[p]._py == missile[i]._miy) { ClrPlrPath(p); if (p == myplr) { - NetSendCmdParam1(TRUE, CMD_WARP, missile[i]._misource); + NetSendCmdParam1(true, CMD_WARP, missile[i]._misource); plr[p]._pmode = PM_NEWLVL; } } } if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } PutMissile(i); @@ -4539,20 +4539,20 @@ void MI_Flash(Sint32 i) { if (missile[i]._micaster == TARGET_MONSTERS) { if (missile[i]._misource != -1) - plr[missile[i]._misource]._pInvincible = TRUE; + plr[missile[i]._misource]._pInvincible = true; } missile[i]._mirange--; - 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); + 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 == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; if (missile[i]._micaster == TARGET_MONSTERS) { if (missile[i]._misource != -1) - plr[missile[i]._misource]._pInvincible = FALSE; + plr[missile[i]._misource]._pInvincible = false; } } PutMissile(i); @@ -4562,17 +4562,17 @@ void MI_Flash2(Sint32 i) { if (missile[i]._micaster == TARGET_MONSTERS) { if (missile[i]._misource != -1) - plr[missile[i]._misource]._pInvincible = TRUE; + plr[missile[i]._misource]._pInvincible = true; } missile[i]._mirange--; - 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); + 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 == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; if (missile[i]._micaster == TARGET_MONSTERS) { if (missile[i]._misource != -1) - plr[missile[i]._misource]._pInvincible = FALSE; + plr[missile[i]._misource]._pInvincible = false; } } PutMissile(i); @@ -4603,7 +4603,7 @@ void MI_Manashield(Sint32 i) } if (id != myplr) { if (currlevel != plr[id].plrlevel) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } else { if (plr[id]._pMana <= 0 || !plr[id].plractive) missile[i]._mirange = 0; @@ -4615,8 +4615,8 @@ void MI_Manashield(Sint32 i) if (diff < 0) diff = 0; - drawmanaflag = TRUE; - drawhpflag = TRUE; + drawmanaflag = true; + drawhpflag = true; if (plr[id]._pMana >= diff) { plr[id]._pHitPoints = missile[i]._miVar1; @@ -4629,7 +4629,7 @@ void MI_Manashield(Sint32 i) plr[id]._pMana = 0; plr[id]._pManaBase = plr[id]._pMaxManaBase - plr[id]._pMaxMana; missile[i]._mirange = 0; - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; if (plr[id]._pHitPoints < 0) SetPlayerHitPoints(id, 0); if ((plr[id]._pHitPoints >> 6) == 0 && id == myplr) { @@ -4640,15 +4640,15 @@ void MI_Manashield(Sint32 i) if (id == myplr && plr[id]._pHitPoints == 0 && missile[i]._miVar1 == 0 && plr[id]._pmode != PM_DEATH) { missile[i]._mirange = 0; - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; SyncPlrKill(id, -1); } missile[i]._miVar1 = plr[id]._pHitPoints; missile[i]._miVar2 = plr[id]._pHPBase; if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; - NetSendCmd(TRUE, CMD_ENDSHIELD); + missile[i]._miDelFlag = true; + NetSendCmd(true, CMD_ENDSHIELD); } } PutMissile(i); @@ -4680,7 +4680,7 @@ void MI_Etherealize(Sint32 i) } plr[src]._pSpellFlags |= 1; if (missile[i]._mirange == 0 || plr[src]._pHitPoints <= 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; plr[src]._pSpellFlags &= ~0x1; } PutMissile(i); @@ -4703,11 +4703,11 @@ void MI_Firemove(Sint32 i) missile[i]._mityoff += missile[i]._miyvel; GetMissilePos(i); j = missile[i]._mirange; - CheckMissileCol(i, missile[i]._midam, missile[i]._midam, FALSE, missile[i]._mix, missile[i]._miy, FALSE); - if (missile[i]._miHitFlag == TRUE) + 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 == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } if (missile[i]._mimfnum != 0 || missile[i]._mirange == 0) { @@ -4797,7 +4797,7 @@ void MI_Guardian(Sint32 i) } if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } @@ -4831,16 +4831,16 @@ void MI_Chain(Sint32 i) } missile[i]._mirange--; if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } void MI_Blood(Sint32 i) { missile[i]._mirange--; if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; if (missile[i]._miAnimFrame == missile[i]._miAnimLen) - missile[i]._miPreFlag = TRUE; + missile[i]._miPreFlag = true; PutMissile(i); } @@ -4860,7 +4860,7 @@ void MI_Weapexp(Sint32 i) maxd = plr[id]._pILMaxDam; missiledata[missile[i]._mitype].mResist = MISR_LIGHTNING; } - CheckMissileCol(i, mind, maxd, FALSE, missile[i]._mix, missile[i]._miy, FALSE); + CheckMissileCol(i, mind, maxd, false, missile[i]._mix, missile[i]._miy, false); if (missile[i]._miVar1 == 0) { missile[i]._mlid = AddLight(missile[i]._mix, missile[i]._miy, 9); } else { @@ -4869,7 +4869,7 @@ void MI_Weapexp(Sint32 i) } missile[i]._miVar1++; if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } else { PutMissile(i); @@ -4882,7 +4882,7 @@ void MI_Misexp(Sint32 i) missile[i]._mirange--; if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } else { if (missile[i]._miVar1 == 0) @@ -4905,7 +4905,7 @@ void MI_Acidsplat(Sint32 i) } missile[i]._mirange--; if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; monst = missile[i]._misource; dam = (monster[monst].MData->mLevel >= 2 ? 2 : 1); AddMissile(missile[i]._mix, missile[i]._miy, i, 0, missile[i]._mimfnum, MIS_ACIDPUD, TARGET_PLAYERS, monst, dam, missile[i]._mispllvl); @@ -4921,7 +4921,7 @@ void MI_Teleport(Sint32 i) id = missile[i]._misource; missile[i]._mirange--; if (missile[i]._mirange <= 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } else { dPlayer[plr[id]._px][plr[id]._py] = 0; PlrClrTrans(plr[id]._px, plr[id]._py); @@ -4953,17 +4953,17 @@ void MI_Stone(Sint32 i) m = missile[i]._miVar2; if (monster[m]._mhitpoints == 0 && missile[i]._miAnimType != MFILE_SHATTER1) { missile[i]._mimfnum = 0; - missile[i]._miDrawFlag = TRUE; + missile[i]._miDrawFlag = true; SetMissAnim(i, MFILE_SHATTER1); missile[i]._mirange = 11; } if (monster[m]._mmode != MM_STONE) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; return; } if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; if (monster[m]._mhitpoints > 0) monster[m]._mmode = (MON_MODE)missile[i]._miVar1; else @@ -4977,11 +4977,11 @@ void MI_Boom(Sint32 i) { missile[i]._mirange--; if (missile[i]._miVar1 == 0) - CheckMissileCol(i, missile[i]._midam, missile[i]._midam, FALSE, missile[i]._mix, missile[i]._miy, TRUE); - if (missile[i]._miHitFlag == TRUE) + 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 == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; PutMissile(i); } @@ -4991,7 +4991,7 @@ void MI_Rhino(Sint32 i) monst = missile[i]._misource; if (monster[monst]._mmode != MM_CHARGE) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; return; } GetMissilePos(i); @@ -5015,7 +5015,7 @@ void MI_Rhino(Sint32 i) omy = missile[i]._miy; if (!PosOkMonst(monst, missile[i]._mix, missile[i]._miy) || (monster[monst]._mAi == AI_SNAKE && !PosOkMonst(monst, mix2, miy2))) { MissToMonst(i, mix, miy); - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; return; } monster[monst]._mfutx = omx; @@ -5054,7 +5054,7 @@ void MI_Fireman(Sint32 i) } if ((bx != ax || by != ay) && (missile[i]._miVar1 & 1 && (abs(ax - cx) >= 4 || abs(ay - cy) >= 4) || missile[i]._miVar2 > 1) && PosOkMonst(missile[i]._misource, ax, ay)) { MissToMonst(i, ax, ay); - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } else if (!(monster[src]._mFlags & MFLAG_TARGETS_MONSTER)) { j = dPlayer[bx][by]; } else { @@ -5078,7 +5078,7 @@ void MI_FirewallC(Sint32 i) missile[i]._mirange--; int id = missile[i]._misource; if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } else { int dp = dPiece[missile[i]._miVar1][missile[i]._miVar2]; assert(dp <= MAXTILES && dp >= 0); @@ -5108,10 +5108,10 @@ void MI_FirewallC(Sint32 i) void MI_Infra(Sint32 i) { missile[i]._mirange--; - plr[missile[i]._misource]._pInfraFlag = TRUE; + plr[missile[i]._misource]._pInfraFlag = true; if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; - CalcPlrItemVals(missile[i]._misource, TRUE); + missile[i]._miDelFlag = true; + CalcPlrItemVals(missile[i]._misource, true); } } @@ -5121,13 +5121,13 @@ void MI_Apoca(Sint32 i) bool exit; id = missile[i]._misource; - exit = FALSE; + exit = false; for (j = missile[i]._miVar2; j < missile[i]._miVar3 && !exit; j++) { for (k = missile[i]._miVar4; k < missile[i]._miVar5 && !exit; k++) { if (dMonster[k][j] > MAX_PLRS - 1 && !nSolidTable[dPiece[k][j]]) { if (!gbIsHellfire || LineClear(missile[i]._mix, missile[i]._miy, k, j)) { AddMissile(k, j, k, j, plr[id]._pdir, MIS_BOOM, TARGET_MONSTERS, id, missile[i]._midam, 0); - exit = TRUE; + exit = true; } } } @@ -5136,11 +5136,11 @@ void MI_Apoca(Sint32 i) } } - if (exit == TRUE) { + if (exit == true) { missile[i]._miVar2 = j - 1; missile[i]._miVar4 = k; } else { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } } @@ -5151,8 +5151,8 @@ void MI_Wave(Sint32 i) bool f1, f2; int v1, v2; - f1 = FALSE; - f2 = FALSE; + f1 = false; + f2 = false; assert((DWORD)i < MAXMISSILES); id = missile[i]._misource; @@ -5177,7 +5177,7 @@ void MI_Wave(Sint32 i) pn = dPiece[nxa][nya]; // BUGFIX: dPiece is accessed before check against dungeon size and 0 assert((DWORD)pn <= MAXTILES); if (nMissileTable[pn] || f1 || nxa <= 0 || nxa >= MAXDUNX || nya <= 0 || nya >= MAXDUNY) { - f1 = TRUE; + f1 = true; } else { AddMissile(nxa, nya, nxa + XDirAdd[sd], nya + YDirAdd[sd], plr[id]._pdir, MIS_FIREMOVE, TARGET_MONSTERS, id, 0, missile[i]._mispllvl); nxa += XDirAdd[dira]; @@ -5186,7 +5186,7 @@ void MI_Wave(Sint32 i) pn = dPiece[nxb][nyb]; // BUGFIX: dPiece is accessed before check against dungeon size and 0 assert((DWORD)pn <= MAXTILES); if (nMissileTable[pn] || f2 || nxb <= 0 || nxb >= MAXDUNX || nyb <= 0 || nyb >= MAXDUNY) { - f2 = TRUE; + f2 = true; } else { AddMissile(nxb, nyb, nxb + XDirAdd[sd], nyb + YDirAdd[sd], plr[id]._pdir, MIS_FIREMOVE, TARGET_MONSTERS, id, 0, missile[i]._mispllvl); nxb += XDirAdd[dirb]; @@ -5196,7 +5196,7 @@ void MI_Wave(Sint32 i) } missile[i]._mirange--; if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } void MI_Nova(Sint32 i) @@ -5225,7 +5225,7 @@ void MI_Nova(Sint32 i) } missile[i]._mirange--; if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } void MI_Blodboil(Sint32 i) @@ -5251,7 +5251,7 @@ void MI_Blodboil(Sint32 i) lvl = plr[id]._pLevel * 2; missile[i]._mirange = lvl + 10 * missile[i]._mispllvl + 245; hpdif = plr[id]._pMaxHP - plr[id]._pHitPoints; - CalcPlrItemVals(id, TRUE); + CalcPlrItemVals(id, true); plr[id]._pHitPoints -= hpdif; if (plr[id]._pHitPoints < 64) plr[id]._pHitPoints = 64; @@ -5266,10 +5266,10 @@ void MI_Blodboil(Sint32 i) PS_ROGUE72, PS_WARR72 }; - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; plr[id]._pSpellFlags &= ~0x4; hpdif = plr[id]._pMaxHP - plr[id]._pHitPoints; - CalcPlrItemVals(id, TRUE); + CalcPlrItemVals(id, true); plr[id]._pHitPoints -= hpdif + missile[i]._miVar2; if (plr[id]._pHitPoints < 64) plr[id]._pHitPoints = 64; @@ -5286,8 +5286,8 @@ void MI_Flame(Sint32 i) missile[i]._mirange--; missile[i]._miVar2--; k = missile[i]._mirange; - 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) + 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 == 0) missile[i]._miAnimFrame = 20; @@ -5298,7 +5298,7 @@ void MI_Flame(Sint32 i) ChangeLight(missile[i]._mlid, missile[i]._mix, missile[i]._miy, k); } if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } if (missile[i]._miVar2 <= 0) @@ -5336,7 +5336,7 @@ void MI_Flamec(Sint32 i) missile[i]._miVar3++; } if (missile[i]._mirange == 0 || missile[i]._miVar3 == 3) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; } void MI_Cbolt(Sint32 i) @@ -5357,8 +5357,8 @@ void MI_Cbolt(Sint32 i) missile[i]._mitxoff += missile[i]._mixvel; missile[i]._mityoff += missile[i]._miyvel; GetMissilePos(i); - CheckMissileCol(i, missile[i]._midam, missile[i]._midam, FALSE, missile[i]._mix, missile[i]._miy, FALSE); - if (missile[i]._miHitFlag == TRUE) { + 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; missile[i]._mixoff = 0; @@ -5370,7 +5370,7 @@ void MI_Cbolt(Sint32 i) ChangeLight(missile[i]._mlid, missile[i]._mix, missile[i]._miy, missile[i]._miVar1); } if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } PutMissile(i); @@ -5387,7 +5387,7 @@ void MI_Hbolt(Sint32 i) GetMissilePos(i); dam = missile[i]._midam; if (missile[i]._mix != missile[i]._misx || missile[i]._miy != missile[i]._misy) { - CheckMissileCol(i, dam, dam, FALSE, missile[i]._mix, missile[i]._miy, FALSE); + CheckMissileCol(i, dam, dam, false, missile[i]._mix, missile[i]._miy, false); } if (missile[i]._mirange == 0) { missile[i]._mitxoff -= missile[i]._mixvel; @@ -5406,7 +5406,7 @@ void MI_Hbolt(Sint32 i) } else { ChangeLight(missile[i]._mlid, missile[i]._mix, missile[i]._miy, missile[i]._miAnimFrame + 7); if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } } @@ -5427,25 +5427,25 @@ void MI_Element(Sint32 i) py = plr[id]._py; ChangeLight(missile[i]._mlid, cx, cy, missile[i]._miAnimFrame); if (!CheckBlock(px, py, cx, cy)) - CheckMissileCol(i, dam, dam, TRUE, cx, cy, TRUE); + CheckMissileCol(i, dam, dam, true, cx, cy, true); if (!CheckBlock(px, py, cx, cy + 1)) - CheckMissileCol(i, dam, dam, TRUE, cx, cy + 1, TRUE); + CheckMissileCol(i, dam, dam, true, cx, cy + 1, true); if (!CheckBlock(px, py, cx, cy - 1)) - CheckMissileCol(i, dam, dam, TRUE, cx, cy - 1, TRUE); + CheckMissileCol(i, dam, dam, true, cx, cy - 1, true); if (!CheckBlock(px, py, cx + 1, cy)) - CheckMissileCol(i, dam, dam, TRUE, cx + 1, cy, TRUE); /* 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, TRUE, cx + 1, cy - 1, TRUE); + CheckMissileCol(i, dam, dam, true, cx + 1, cy - 1, true); if (!CheckBlock(px, py, cx + 1, cy + 1)) - CheckMissileCol(i, dam, dam, TRUE, cx + 1, cy + 1, TRUE); + CheckMissileCol(i, dam, dam, true, cx + 1, cy + 1, true); if (!CheckBlock(px, py, cx - 1, cy)) - CheckMissileCol(i, dam, dam, TRUE, cx - 1, cy, TRUE); + CheckMissileCol(i, dam, dam, true, cx - 1, cy, true); if (!CheckBlock(px, py, cx - 1, cy + 1)) - CheckMissileCol(i, dam, dam, TRUE, cx - 1, cy + 1, TRUE); + CheckMissileCol(i, dam, dam, true, cx - 1, cy + 1, true); if (!CheckBlock(px, py, cx - 1, cy - 1)) - CheckMissileCol(i, dam, dam, TRUE, cx - 1, cy - 1, TRUE); + CheckMissileCol(i, dam, dam, true, cx - 1, cy - 1, true); if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } } else { @@ -5454,7 +5454,7 @@ void MI_Element(Sint32 i) GetMissilePos(i); cx = missile[i]._mix; cy = missile[i]._miy; - CheckMissileCol(i, dam, dam, FALSE, cx, cy, FALSE); + 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) { @@ -5496,7 +5496,7 @@ void MI_Bonespirit(Sint32 i) if (missile[i]._mimfnum == 8) { ChangeLight(missile[i]._mlid, missile[i]._mix, missile[i]._miy, missile[i]._miAnimFrame); if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } PutMissile(i); @@ -5506,7 +5506,7 @@ void MI_Bonespirit(Sint32 i) GetMissilePos(i); cx = missile[i]._mix; cy = missile[i]._miy; - CheckMissileCol(i, dam, dam, FALSE, cx, cy, FALSE); + 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) { @@ -5540,7 +5540,7 @@ void MI_ResurrectBeam(Sint32 i) { missile[i]._mirange--; if (missile[i]._mirange == 0) - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; PutMissile(i); } @@ -5560,7 +5560,7 @@ void MI_Rportal(Sint32 i) missile[i]._miVar2++; } if (missile[i]._mirange == 0) { - missile[i]._miDelFlag = TRUE; + missile[i]._miDelFlag = true; AddUnLight(missile[i]._mlid); } PutMissile(i); @@ -5574,7 +5574,7 @@ void ProcessMissiles() dFlags[missile[missileactive[i]]._mix][missile[missileactive[i]]._miy] &= ~BFLAG_MISSILE; dMissile[missile[missileactive[i]]._mix][missile[missileactive[i]]._miy] = 0; if (missile[missileactive[i]]._mix < 0 || missile[missileactive[i]]._mix >= MAXDUNX - 1 || missile[missileactive[i]]._miy < 0 || missile[missileactive[i]]._miy >= MAXDUNY - 1) - missile[missileactive[i]]._miDelFlag = TRUE; + missile[missileactive[i]]._miDelFlag = true; } i = 0; diff --git a/Source/monstdat.cpp b/Source/monstdat.cpp index 9639e2ff..21bb9365 100644 --- a/Source/monstdat.cpp +++ b/Source/monstdat.cpp @@ -11,144 +11,144 @@ namespace devilution { const MonsterData monsterdata[] = { // clang-format off // mName, GraphicType, sndfile, TransFile, width, mImage, has_special, snd_special, has_trans, Frames[6], Rate[6], mMinDLvl, mMaxDLvl, mLevel, mMinHP, mMaxHP, mAi, mFlags , mInt, mHit, mAFNum, mMinDamage, mMaxDamage, mHit2, mAFNum2, mMinDamage2, mMaxDamage2, mArmorClass, mMonstClass, mMagicRes , mMagicRes2 , mSelFlag, mTreasure, mExp - { "Zombie", "Monsters\\Zombie\\Zombie%c.CL2", "Monsters\\Zombie\\Zombie%c%i.WAV", NULL, 128, 799, FALSE, FALSE, FALSE, { 11, 24, 12, 6, 16, 0 }, { 4, 0, 0, 0, 0, 0 }, 1, 3, 1, 4, 7, AI_ZOMBIE, 0 , 0, 10, 8, 2, 5, 0, 0, 0, 0, 5, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 54 }, - { "Ghoul", "Monsters\\Zombie\\Zombie%c.CL2", "Monsters\\Zombie\\Zombie%c%i.WAV", "Monsters\\Zombie\\Bluered.TRN", 128, 799, FALSE, FALSE, TRUE, { 11, 24, 12, 6, 16, 0 }, { 4, 0, 0, 0, 0, 0 }, 2, 4, 2, 7, 11, AI_ZOMBIE, 0 , 1, 10, 8, 3, 10, 0, 0, 0, 0, 10, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 58 }, - { "Rotting Carcass", "Monsters\\Zombie\\Zombie%c.CL2", "Monsters\\Zombie\\Zombie%c%i.WAV", "Monsters\\Zombie\\Grey.TRN", 128, 799, FALSE, FALSE, TRUE, { 11, 24, 12, 6, 16, 0 }, { 4, 0, 0, 0, 0, 0 }, 2, 6, 4, 15, 25, AI_ZOMBIE, 0 , 2, 25, 8, 5, 15, 0, 0, 0, 0, 15, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , 3, 0, 136 }, - { "Black Death", "Monsters\\Zombie\\Zombie%c.CL2", "Monsters\\Zombie\\Zombie%c%i.WAV", "Monsters\\Zombie\\Yellow.TRN", 128, 799, FALSE, FALSE, TRUE, { 11, 24, 12, 6, 16, 0 }, { 4, 0, 0, 0, 0, 0 }, 4, 8, 6, 25, 40, AI_ZOMBIE, 0 , 3, 30, 8, 6, 22, 0, 0, 0, 0, 20, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 240 }, - { "Fallen One", "Monsters\\FalSpear\\Phall%c.CL2", "Monsters\\FalSpear\\Phall%c%i.WAV", "Monsters\\FalSpear\\FallenT.TRN", 128, 543, TRUE, TRUE, TRUE, { 11, 11, 13, 11, 18, 13 }, { 3, 0, 0, 0, 0, 0 }, 1, 3, 1, 1, 4, AI_FALLEN, 0 , 0, 15, 7, 1, 3, 0, 5, 0, 0, 0, MC_ANIMAL, 0 , 0 , 3, 0, 46 }, - { "Carver", "Monsters\\FalSpear\\Phall%c.CL2", "Monsters\\FalSpear\\Phall%c%i.WAV", "Monsters\\FalSpear\\Dark.TRN", 128, 543, TRUE, TRUE, TRUE, { 11, 11, 13, 11, 18, 13 }, { 3, 0, 0, 0, 0, 0 }, 2, 5, 3, 4, 8, AI_FALLEN, 0 , 2, 20, 7, 2, 5, 0, 5, 0, 0, 5, MC_ANIMAL, 0 , 0 , 3, 0, 80 }, - { "Devil Kin", "Monsters\\FalSpear\\Phall%c.CL2", "Monsters\\FalSpear\\Phall%c%i.WAV", NULL, 128, 543, TRUE, TRUE, FALSE, { 11, 11, 13, 11, 18, 13 }, { 3, 0, 0, 0, 0, 0 }, 3, 7, 5, 12, 24, AI_FALLEN, 0 , 2, 25, 7, 3, 7, 0, 5, 0, 0, 10, MC_ANIMAL, 0 , RESIST_FIRE , 3, 0, 155 }, - { "Dark One", "Monsters\\FalSpear\\Phall%c.CL2", "Monsters\\FalSpear\\Phall%c%i.WAV", "Monsters\\FalSpear\\Blue.TRN", 128, 543, TRUE, TRUE, TRUE, { 11, 11, 13, 11, 18, 13 }, { 3, 0, 0, 0, 0, 0 }, 5, 9, 7, 20, 36, AI_FALLEN, 0 , 3, 30, 7, 4, 8, 0, 5, 0, 0, 15, MC_ANIMAL, IMMUNE_NULL_40 , RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 255 }, - { "Skeleton", "Monsters\\SkelAxe\\SklAx%c.CL2", "Monsters\\SkelAxe\\SklAx%c%i.WAV", "Monsters\\SkelAxe\\White.TRN", 128, 553, TRUE, FALSE, TRUE, { 12, 8, 13, 6, 17, 16 }, { 5, 0, 0, 0, 0, 0 }, 1, 3, 1, 2, 4, AI_SKELSD, 0 , 0, 20, 8, 1, 4, 0, 0, 0, 0, 0, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 64 }, - { "Corpse Axe", "Monsters\\SkelAxe\\SklAx%c.CL2", "Monsters\\SkelAxe\\SklAx%c%i.WAV", "Monsters\\SkelAxe\\Skelt.TRN", 128, 553, TRUE, FALSE, TRUE, { 12, 8, 13, 6, 17, 16 }, { 4, 0, 0, 0, 0, 0 }, 2, 5, 2, 4, 7, AI_SKELSD, 0 , 1, 25, 8, 3, 5, 0, 0, 0, 0, 0, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 68 }, - { "Burning Dead", "Monsters\\SkelAxe\\SklAx%c.CL2", "Monsters\\SkelAxe\\SklAx%c%i.WAV", NULL, 128, 553, TRUE, FALSE, FALSE, { 12, 8, 13, 6, 17, 16 }, { 2, 0, 0, 0, 0, 0 }, 2, 6, 4, 8, 12, AI_SKELSD, 0 , 2, 30, 8, 3, 7, 0, 0, 0, 0, 5, MC_UNDEAD, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , 3, 0, 154 }, - { "Horror", "Monsters\\SkelAxe\\SklAx%c.CL2", "Monsters\\SkelAxe\\SklAx%c%i.WAV", "Monsters\\SkelAxe\\Black.TRN", 128, 553, TRUE, FALSE, TRUE, { 12, 8, 13, 6, 17, 16 }, { 3, 0, 0, 0, 0, 0 }, 4, 8, 6, 12, 20, AI_SKELSD, 0 , 3, 35, 8, 4, 9, 0, 0, 0, 0, 15, MC_UNDEAD, IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 264 }, - { "Fallen One", "Monsters\\FalSword\\Fall%c.CL2", "Monsters\\FalSword\\Fall%c%i.WAV", "Monsters\\FalSword\\FallenT.TRN", 128, 623, TRUE, TRUE, TRUE, { 12, 12, 13, 11, 14, 15 }, { 3, 0, 0, 0, 0, 0 }, 1, 3, 1, 2, 5, AI_FALLEN, 0 , 0, 15, 8, 1, 4, 0, 5, 0, 0, 10, MC_ANIMAL, 0 , 0 , 3, 0, 52 }, - { "Carver", "Monsters\\FalSword\\Fall%c.CL2", "Monsters\\FalSword\\Fall%c%i.WAV", "Monsters\\FalSword\\Dark.TRN", 128, 623, TRUE, TRUE, TRUE, { 12, 12, 13, 11, 14, 15 }, { 3, 0, 0, 0, 0, 0 }, 2, 5, 3, 5, 9, AI_FALLEN, 0 , 1, 20, 8, 2, 7, 0, 5, 0, 0, 15, MC_ANIMAL, 0 , 0 , 3, 0, 90 }, - { "Devil Kin", "Monsters\\FalSword\\Fall%c.CL2", "Monsters\\FalSword\\Fall%c%i.WAV", NULL, 128, 623, TRUE, TRUE, FALSE, { 12, 12, 13, 11, 14, 15 }, { 3, 0, 0, 0, 0, 0 }, 3, 7, 5, 16, 24, AI_FALLEN, 0 , 2, 25, 8, 4, 10, 0, 5, 0, 0, 20, MC_ANIMAL, 0 , RESIST_FIRE , 3, 0, 180 }, - { "Dark One", "Monsters\\FalSword\\Fall%c.CL2", "Monsters\\FalSword\\Fall%c%i.WAV", "Monsters\\FalSword\\Blue.TRN", 128, 623, TRUE, TRUE, TRUE, { 12, 12, 13, 11, 14, 15 }, { 3, 0, 0, 0, 0, 0 }, 5, 9, 7, 24, 36, AI_FALLEN, 0 , 3, 30, 8, 4, 12, 0, 5, 0, 0, 25, MC_ANIMAL, IMMUNE_NULL_40 , RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 280 }, - { "Scavenger", "Monsters\\Scav\\Scav%c.CL2", "Monsters\\Scav\\Scav%c%i.WAV", NULL, 128, 410, TRUE, FALSE, FALSE, { 12, 8, 12, 6, 20, 11 }, { 2, 0, 0, 0, 0, 0 }, 1, 4, 2, 3, 6, AI_SCAV, 0 , 0, 20, 7, 1, 5, 0, 0, 0, 0, 10, MC_ANIMAL, 0 , RESIST_FIRE , 3, 0, 80 }, - { "Plague Eater", "Monsters\\Scav\\Scav%c.CL2", "Monsters\\Scav\\Scav%c%i.WAV", "Monsters\\Scav\\ScavBr.TRN", 128, 410, TRUE, FALSE, TRUE, { 12, 8, 12, 6, 20, 11 }, { 2, 0, 0, 0, 0, 0 }, 3, 6, 4, 12, 24, AI_SCAV, 0 , 1, 30, 7, 1, 8, 0, 0, 0, 0, 20, MC_ANIMAL, 0 , RESIST_LIGHTNING , 3, 0, 188 }, - { "Shadow Beast", "Monsters\\Scav\\Scav%c.CL2", "Monsters\\Scav\\Scav%c%i.WAV", "Monsters\\Scav\\ScavBe.TRN", 128, 410, TRUE, FALSE, TRUE, { 12, 8, 12, 6, 20, 11 }, { 2, 0, 0, 0, 0, 0 }, 4, 8, 6, 24, 36, AI_SCAV, 0 , 2, 35, 7, 3, 12, 0, 0, 0, 0, 25, MC_ANIMAL, IMMUNE_NULL_40 , RESIST_FIRE | IMMUNE_NULL_40 , 3, 0, 375 }, - { "Bone Gasher", "Monsters\\Scav\\Scav%c.CL2", "Monsters\\Scav\\Scav%c%i.WAV", "Monsters\\Scav\\ScavW.TRN", 128, 410, TRUE, FALSE, TRUE, { 12, 8, 12, 6, 20, 11 }, { 2, 0, 0, 0, 0, 0 }, 6, 10, 8, 28, 40, AI_SCAV, 0 , 3, 35, 7, 5, 15, 0, 0, 0, 0, 30, MC_ANIMAL, RESIST_MAGIC | IMMUNE_NULL_40 , RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 552 }, - { "Skeleton", "Monsters\\SkelBow\\SklBw%c.CL2", "Monsters\\SkelBow\\SklBw%c%i.WAV", "Monsters\\SkelBow\\White.TRN", 128, 567, TRUE, FALSE, TRUE, { 9, 8, 16, 5, 16, 16 }, { 4, 0, 0, 0, 0, 0 }, 2, 5, 3, 2, 4, AI_SKELBOW, 0 , 0, 15, 12, 1, 2, 0, 0, 0, 0, 0, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 110 }, - { "Corpse Bow", "Monsters\\SkelBow\\SklBw%c.CL2", "Monsters\\SkelBow\\SklBw%c%i.WAV", "Monsters\\SkelBow\\Skelt.TRN", 128, 567, TRUE, FALSE, TRUE, { 9, 8, 16, 5, 16, 16 }, { 4, 0, 0, 0, 0, 0 }, 3, 7, 5, 8, 16, AI_SKELBOW, 0 , 1, 25, 12, 1, 4, 0, 0, 0, 0, 0, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 210 }, - { "Burning Dead", "Monsters\\SkelBow\\SklBw%c.CL2", "Monsters\\SkelBow\\SklBw%c%i.WAV", NULL, 128, 567, TRUE, FALSE, FALSE, { 9, 8, 16, 5, 16, 16 }, { 2, 0, 0, 0, 0, 0 }, 5, 9, 7, 10, 24, AI_SKELBOW, 0 , 2, 30, 12, 1, 6, 0, 0, 0, 0, 5, MC_UNDEAD, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , 3, 0, 364 }, - { "Horror", "Monsters\\SkelBow\\SklBw%c.CL2", "Monsters\\SkelBow\\SklBw%c%i.WAV", "Monsters\\SkelBow\\Black.TRN", 128, 567, TRUE, FALSE, TRUE, { 9, 8, 16, 5, 16, 16 }, { 3, 0, 0, 0, 0, 0 }, 7, 11, 9, 15, 45, AI_SKELBOW, 0 , 3, 35, 12, 2, 9, 0, 0, 0, 0, 15, MC_UNDEAD, IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 594 }, - { "Skeleton Captain", "Monsters\\SkelSd\\SklSr%c.CL2", "Monsters\\SkelSd\\SklSr%c%i.WAV", "Monsters\\SkelSd\\White.TRN", 128, 575, TRUE, TRUE, TRUE, { 13, 8, 12, 7, 15, 16 }, { 4, 0, 0, 0, 0, 0 }, 1, 4, 2, 3, 6, AI_SKELSD, 0 , 0, 20, 8, 2, 7, 0, 0, 0, 0, 10, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 90 }, - { "Corpse Captain", "Monsters\\SkelSd\\SklSr%c.CL2", "Monsters\\SkelSd\\SklSr%c%i.WAV", "Monsters\\SkelSd\\Skelt.TRN", 128, 575, TRUE, FALSE, TRUE, { 13, 8, 12, 7, 15, 16 }, { 4, 0, 0, 0, 0, 0 }, 2, 6, 4, 12, 20, AI_SKELSD, 0 , 1, 30, 8, 3, 9, 0, 0, 0, 0, 5, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 200 }, - { "Burning Dead Captain", "Monsters\\SkelSd\\SklSr%c.CL2", "Monsters\\SkelSd\\SklSr%c%i.WAV", NULL, 128, 575, TRUE, FALSE, FALSE, { 13, 8, 12, 7, 15, 16 }, { 4, 0, 0, 0, 0, 0 }, 4, 8, 6, 16, 30, AI_SKELSD, 0 , 2, 35, 8, 4, 10, 0, 0, 0, 0, 15, MC_UNDEAD, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , 3, 0, 393 }, - { "Horror Captain", "Monsters\\SkelSd\\SklSr%c.CL2", "Monsters\\SkelSd\\SklSr%c%i.WAV", "Monsters\\SkelSd\\Black.TRN", 128, 575, TRUE, FALSE, TRUE, { 13, 8, 12, 7, 15, 16 }, { 4, 0, 0, 0, 0, 0 }, 6, 10, 8, 35, 50, AI_SKELSD, MFLAG_SEARCH , 3, 40, 8, 5, 14, 0, 0, 0, 0, 30, MC_UNDEAD, IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 604 }, - { "Invisible Lord", "Monsters\\TSneak\\TSneak%c.CL2", "Monsters\\TSneak\\Sneakl%c%i.WAV", NULL, 128, 800, FALSE, FALSE, FALSE, { 13, 13, 15, 11, 16, 0 }, { 2, 0, 0, 0, 0, 0 }, 36, 39, 14, 278, 278, AI_SKELSD, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 65, 8, 16, 30, 0, 0, 0, 0, 60, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 2000 }, - { "Hidden", "Monsters\\Sneak\\Sneak%c.CL2", "Monsters\\Sneak\\Sneak%c%i.WAV", NULL, 128, 992, TRUE, FALSE, FALSE, { 16, 8, 12, 8, 24, 15 }, { 2, 0, 0, 0, 0, 0 }, 3, 8, 5, 8, 24, AI_SNEAK, MFLAG_HIDDEN , 0, 35, 8, 3, 6, 0, 0, 0, 0, 25, MC_DEMON, 0 , IMMUNE_NULL_40 , 3, 0, 278 }, - { "Stalker", "Monsters\\Sneak\\Sneak%c.CL2", "Monsters\\Sneak\\Sneak%c%i.WAV", "Monsters\\Sneak\\Sneakv2.TRN", 128, 992, TRUE, FALSE, TRUE, { 16, 8, 12, 8, 24, 15 }, { 2, 0, 0, 0, 0, 0 }, 8, 12, 9, 30, 45, AI_SNEAK, MFLAG_HIDDEN | MFLAG_SEARCH , 1, 40, 8, 8, 16, 0, 0, 0, 0, 30, MC_DEMON, 0 , IMMUNE_NULL_40 , 3, 0, 630 }, - { "Unseen", "Monsters\\Sneak\\Sneak%c.CL2", "Monsters\\Sneak\\Sneak%c%i.WAV", "Monsters\\Sneak\\Sneakv3.TRN", 128, 992, TRUE, FALSE, TRUE, { 16, 8, 12, 8, 24, 15 }, { 2, 0, 0, 0, 0, 0 }, 10, 14, 11, 35, 50, AI_SNEAK, MFLAG_HIDDEN | MFLAG_SEARCH , 2, 45, 8, 12, 20, 0, 0, 0, 0, 30, MC_DEMON, RESIST_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 935 }, - { "Illusion Weaver", "Monsters\\Sneak\\Sneak%c.CL2", "Monsters\\Sneak\\Sneak%c%i.WAV", "Monsters\\Sneak\\Sneakv1.TRN", 128, 992, TRUE, FALSE, TRUE, { 16, 8, 12, 8, 24, 15 }, { 2, 0, 0, 0, 0, 0 }, 14, 18, 13, 40, 60, AI_SNEAK, MFLAG_HIDDEN | MFLAG_SEARCH , 3, 60, 8, 16, 24, 0, 0, 0, 0, 30, MC_DEMON, RESIST_MAGIC | RESIST_FIRE , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , 3, 0, 1500 }, - { "Satyr Lord", "Monsters\\GoatLord\\GoatL%c.CL2", "Monsters\\newsfx\\Satyr%c%i.WAV", NULL, 160, 800, FALSE, FALSE, FALSE, { 13, 13, 14, 9, 16, 0 }, { 2, 0, 0, 0, 0, 0 }, 40, 43, 28, 160, 200, AI_SKELSD, MFLAG_SEARCH , 3, 90, 8, 20, 30, 0, 0, 0, 0, 70, MC_ANIMAL, RESIST_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 3, 0, 2800 }, - { "Flesh Clan", "Monsters\\GoatMace\\Goat%c.CL2", "Monsters\\GoatMace\\Goat%c%i.WAV", NULL, 128, 1030, TRUE, FALSE, FALSE, { 12, 8, 12, 6, 20, 12 }, { 2, 0, 0, 0, 1, 0 }, 6, 10, 8, 30, 45, AI_GOATMC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 0, 50, 8, 4, 10, 0, 0, 0, 0, 40, MC_DEMON, 0 , 0 , 3, 0, 460 }, - { "Stone Clan", "Monsters\\GoatMace\\Goat%c.CL2", "Monsters\\GoatMace\\Goat%c%i.WAV", "Monsters\\GoatMace\\Beige.TRN", 128, 1030, TRUE, FALSE, TRUE, { 12, 8, 12, 6, 20, 12 }, { 2, 0, 0, 0, 1, 0 }, 8, 12, 10, 40, 55, AI_GOATMC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 1, 60, 8, 6, 12, 0, 0, 0, 0, 40, MC_DEMON, RESIST_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 685 }, - { "Fire Clan", "Monsters\\GoatMace\\Goat%c.CL2", "Monsters\\GoatMace\\Goat%c%i.WAV", "Monsters\\GoatMace\\Red.TRN", 128, 1030, TRUE, FALSE, TRUE, { 12, 8, 12, 6, 20, 12 }, { 2, 0, 0, 0, 1, 0 }, 10, 14, 12, 50, 65, AI_GOATMC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 70, 8, 8, 16, 0, 0, 0, 0, 45, MC_DEMON, RESIST_FIRE , IMMUNE_FIRE , 3, 0, 906 }, - { "Night Clan", "Monsters\\GoatMace\\Goat%c.CL2", "Monsters\\GoatMace\\Goat%c%i.WAV", "Monsters\\GoatMace\\Gray.TRN", 128, 1030, TRUE, FALSE, TRUE, { 12, 8, 12, 6, 20, 12 }, { 2, 0, 0, 0, 1, 0 }, 12, 16, 14, 55, 70, AI_GOATMC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 80, 8, 10, 20, 15, 0, 30, 30, 50, MC_DEMON, RESIST_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 1190 }, - { "Fiend", "Monsters\\Bat\\Bat%c.CL2", "Monsters\\Bat\\Bat%c%i.WAV", "Monsters\\Bat\\red.trn", 96, 364, FALSE, FALSE, TRUE, { 9, 13, 10, 9, 13, 0 }, { 0, 0, 0, 0, 0, 0 }, 2, 5, 3, 3, 6, AI_BAT, 0 , 0, 35, 5, 1, 6, 0, 0, 0, 0, 0, MC_ANIMAL, 0 , 0 , 6, 0x4000, 102 }, - { "Blink", "Monsters\\Bat\\Bat%c.CL2", "Monsters\\Bat\\Bat%c%i.WAV", NULL, 96, 364, FALSE, FALSE, FALSE, { 9, 13, 10, 9, 13, 0 }, { 0, 0, 0, 0, 0, 0 }, 5, 9, 7, 12, 28, AI_BAT, 0 , 1, 45, 5, 1, 8, 0, 0, 0, 0, 15, MC_ANIMAL, 0 , 0 , 6, 0x4000, 340 }, - { "Gloom", "Monsters\\Bat\\Bat%c.CL2", "Monsters\\Bat\\Bat%c%i.WAV", "Monsters\\Bat\\grey.trn", 96, 364, FALSE, FALSE, TRUE, { 9, 13, 10, 9, 13, 0 }, { 0, 0, 0, 0, 0, 0 }, 7, 11, 9, 28, 36, AI_BAT, MFLAG_SEARCH , 2, 70, 5, 4, 12, 0, 0, 0, 0, 35, MC_ANIMAL, RESIST_MAGIC , RESIST_MAGIC | IMMUNE_NULL_40 , 6, 0x4000, 509 }, - { "Familiar", "Monsters\\Bat\\Bat%c.CL2", "Monsters\\Bat\\Bat%c%i.WAV", "Monsters\\Bat\\orange.trn", 96, 364, FALSE, FALSE, TRUE, { 9, 13, 10, 9, 13, 0 }, { 0, 0, 0, 0, 0, 0 }, 11, 15, 13, 20, 35, AI_BAT, MFLAG_SEARCH , 3, 50, 5, 4, 16, 0, 0, 0, 0, 35, MC_DEMON, RESIST_MAGIC | IMMUNE_LIGHTNING , RESIST_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 6, 0x4000, 448 }, - { "Flesh Clan", "Monsters\\GoatBow\\GoatB%c.CL2", "Monsters\\GoatBow\\GoatB%c%i.WAV", NULL, 128, 1040, FALSE, FALSE, FALSE, { 12, 8, 16, 6, 20, 0 }, { 3, 0, 0, 0, 0, 0 }, 6, 10, 8, 20, 35, AI_GOATBOW, MFLAG_CAN_OPEN_DOOR, 0, 35, 13, 1, 7, 0, 0, 0, 0, 35, MC_DEMON, 0 , 0 , 3, 0, 448 }, - { "Stone Clan", "Monsters\\GoatBow\\GoatB%c.CL2", "Monsters\\GoatBow\\GoatB%c%i.WAV", "Monsters\\GoatBow\\Beige.TRN", 128, 1040, FALSE, FALSE, TRUE, { 12, 8, 16, 6, 20, 0 }, { 3, 0, 0, 0, 0, 0 }, 8, 12, 10, 30, 40, AI_GOATBOW, MFLAG_CAN_OPEN_DOOR, 1, 40, 13, 2, 9, 0, 0, 0, 0, 35, MC_DEMON, RESIST_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 645 }, - { "Fire Clan", "Monsters\\GoatBow\\GoatB%c.CL2", "Monsters\\GoatBow\\GoatB%c%i.WAV", "Monsters\\GoatBow\\Red.TRN", 128, 1040, FALSE, FALSE, TRUE, { 12, 8, 16, 6, 20, 0 }, { 3, 0, 0, 0, 0, 0 }, 10, 14, 12, 40, 50, AI_GOATBOW, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 45, 13, 3, 11, 0, 0, 0, 0, 35, MC_DEMON, RESIST_FIRE , IMMUNE_FIRE , 3, 0, 822 }, - { "Night Clan", "Monsters\\GoatBow\\GoatB%c.CL2", "Monsters\\GoatBow\\GoatB%c%i.WAV", "Monsters\\GoatBow\\Gray.TRN", 128, 1040, FALSE, FALSE, TRUE, { 12, 8, 16, 6, 20, 0 }, { 3, 0, 0, 0, 0, 0 }, 12, 16, 14, 50, 65, AI_GOATBOW, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 50, 13, 4, 13, 15, 0, 0, 0, 40, MC_DEMON, RESIST_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 1092 }, - { "Acid Beast", "Monsters\\Acid\\Acid%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 128, 716, TRUE, TRUE, FALSE, { 13, 8, 12, 8, 16, 12 }, { 0, 0, 0, 0, 0, 0 }, 10, 14, 11, 40, 66, AI_ACID, 0 , 0, 40, 8, 4, 12, 25, 8, 0, 0, 30, MC_ANIMAL, IMMUNE_ACID , IMMUNE_MAGIC | IMMUNE_ACID , 3, 0, 846 }, - { "Poison Spitter", "Monsters\\Acid\\Acid%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", "Monsters\\Acid\\AcidBlk.TRN", 128, 716, TRUE, TRUE, TRUE, { 13, 8, 12, 8, 16, 12 }, { 0, 0, 0, 0, 0, 0 }, 14, 18, 15, 60, 85, AI_ACID, 0 , 1, 45, 8, 4, 16, 25, 8, 0, 0, 30, MC_ANIMAL, IMMUNE_ACID , IMMUNE_MAGIC | IMMUNE_ACID , 3, 0, 1248 }, - { "Pit Beast", "Monsters\\Acid\\Acid%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", "Monsters\\Acid\\AcidB.TRN", 128, 716, TRUE, TRUE, TRUE, { 13, 8, 12, 8, 16, 12 }, { 0, 0, 0, 0, 0, 0 }, 18, 22, 21, 80, 110, AI_ACID, 0 , 2, 55, 8, 8, 18, 35, 8, 0, 0, 35, MC_ANIMAL, RESIST_MAGIC | IMMUNE_ACID , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_ACID , 3, 0, 2060 }, - { "Lava Maw", "Monsters\\Acid\\Acid%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", "Monsters\\Acid\\AcidR.TRN", 128, 716, TRUE, TRUE, TRUE, { 13, 8, 12, 8, 16, 12 }, { 0, 0, 0, 0, 0, 0 }, 22, 27, 25, 100, 150, AI_ACID, 0 , 3, 65, 8, 10, 20, 40, 8, 0, 0, 35, MC_ANIMAL, RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_ACID , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_ACID , 3, 0, 2940 }, - { "Skeleton King", "Monsters\\SKing\\SKing%c.CL2", "Monsters\\SKing\\SKing%c%i.WAV", "Monsters\\SkelAxe\\White.TRN", 160, 1010, TRUE, TRUE, TRUE, { 8, 6, 16, 6, 16, 6 }, { 2, 0, 0, 0, 0, 2 }, 6, 6, 9, 140, 140, AI_SKELKING, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 60, 8, 6, 16, 0, 0, 0, 0, 70, MC_UNDEAD, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0x8001, 570 }, - { "The Butcher", "Monsters\\FatC\\FatC%c.CL2", "Monsters\\FatC\\FatC%c%i.WAV", NULL, 128, 980, FALSE, FALSE, FALSE, { 10, 8, 12, 6, 16, 0 }, { 1, 0, 0, 0, 0, 0 }, 0, 0, 1, 320, 320, AI_CLEAVER, 0 , 3, 50, 8, 6, 12, 0, 0, 0, 0, 50, MC_DEMON, RESIST_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 3, 0x8000, 710 }, - { "Overlord", "Monsters\\Fat\\Fat%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", NULL, 128, 1130, TRUE, FALSE, FALSE, { 8, 10, 15, 6, 16, 10 }, { 4, 0, 0, 0, 0, 0 }, 8, 12, 10, 60, 80, AI_FAT, 0 , 0, 55, 8, 6, 12, 0, 0, 0, 0, 55, MC_DEMON, 0 , RESIST_FIRE , 3, 0, 635 }, - { "Mud Man", "Monsters\\Fat\\Fat%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", "Monsters\\Fat\\Blue.TRN", 128, 1130, TRUE, FALSE, TRUE, { 8, 10, 15, 6, 16, 10 }, { 4, 0, 0, 0, 0, 0 }, 13, 17, 14, 100, 125, AI_FAT, MFLAG_SEARCH , 1, 60, 8, 8, 16, 0, 0, 0, 0, 60, MC_DEMON, 0 , IMMUNE_LIGHTNING , 3, 0, 1165 }, - { "Toad Demon", "Monsters\\Fat\\Fat%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", "Monsters\\Fat\\FatB.TRN", 128, 1130, TRUE, FALSE, TRUE, { 8, 10, 15, 6, 16, 10 }, { 4, 0, 0, 0, 0, 0 }, 15, 19, 16, 135, 160, AI_FAT, MFLAG_SEARCH , 2, 70, 8, 8, 16, 40, 0, 8, 20, 65, MC_DEMON, IMMUNE_MAGIC , IMMUNE_MAGIC | RESIST_LIGHTNING , 3, 0, 1380 }, - { "Flayed One", "Monsters\\Fat\\Fat%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", "Monsters\\Fat\\FatF.TRN", 128, 1130, TRUE, FALSE, TRUE, { 8, 10, 15, 6, 16, 10 }, { 4, 0, 0, 0, 0, 0 }, 19, 23, 20, 160, 200, AI_FAT, MFLAG_SEARCH , 3, 85, 8, 10, 20, 0, 0, 0, 0, 70, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 3, 0, 2058 }, - { "Wyrm", "Monsters\\Worm\\Worm%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", NULL, 160, 2420, FALSE, FALSE, FALSE, { 13, 13, 13, 11, 19, 0 }, { 0, 0, 0, 0, 0, 0 }, 9, 13, 11, 60, 90, AI_SKELSD, 0 , 0, 40, 8, 4, 10, 0, 0, 0, 0, 25, MC_ANIMAL, RESIST_MAGIC , RESIST_MAGIC , 3, 0, 660 }, - { "Cave Slug", "Monsters\\Worm\\Worm%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", NULL, 160, 2420, FALSE, FALSE, FALSE, { 13, 13, 13, 11, 19, 0 }, { 0, 0, 0, 0, 0, 0 }, 11, 15, 13, 75, 110, AI_SKELSD, 0 , 1, 50, 8, 6, 13, 0, 0, 0, 0, 30, MC_ANIMAL, RESIST_MAGIC , RESIST_MAGIC , 3, 0, 994 }, - { "Devil Wyrm", "Monsters\\Worm\\Worm%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", NULL, 160, 2420, FALSE, FALSE, FALSE, { 13, 13, 13, 11, 19, 0 }, { 0, 0, 0, 0, 0, 0 }, 13, 17, 15, 100, 140, AI_SKELSD, 0 , 2, 55, 8, 8, 16, 0, 0, 0, 0, 30, MC_ANIMAL, RESIST_MAGIC | RESIST_FIRE , RESIST_MAGIC | RESIST_FIRE , 3, 0, 1320 }, - { "Devourer", "Monsters\\Worm\\Worm%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", NULL, 160, 2420, FALSE, FALSE, FALSE, { 13, 13, 13, 11, 19, 0 }, { 0, 0, 0, 0, 0, 0 }, 15, 19, 17, 125, 200, AI_SKELSD, 0 , 3, 60, 8, 10, 20, 0, 0, 0, 0, 35, MC_ANIMAL, RESIST_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , RESIST_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , 3, 0, 1827 }, - { "Magma Demon", "Monsters\\Magma\\Magma%c.CL2", "Monsters\\Magma\\Magma%c%i.WAV", NULL, 128, 1680, TRUE, TRUE, FALSE, { 8, 10, 14, 7, 18, 18 }, { 2, 0, 0, 0, 1, 0 }, 14, 17, 13, 50, 70, AI_MAGMA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 0, 45, 4, 2, 10, 50, 13, 0, 0, 45, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 1076 }, - { "Blood Stone", "Monsters\\Magma\\Magma%c.CL2", "Monsters\\Magma\\Magma%c%i.WAV", "Monsters\\Magma\\Yellow.TRN", 128, 1680, TRUE, TRUE, TRUE, { 8, 10, 14, 7, 18, 18 }, { 2, 0, 0, 0, 1, 0 }, 15, 19, 14, 55, 75, AI_MAGMA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 1, 50, 4, 2, 12, 50, 14, 0, 0, 45, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 1309 }, - { "Hell Stone", "Monsters\\Magma\\Magma%c.CL2", "Monsters\\Magma\\Magma%c%i.WAV", "Monsters\\Magma\\Blue.TRN", 128, 1680, TRUE, TRUE, TRUE, { 8, 10, 14, 7, 18, 18 }, { 2, 0, 0, 0, 1, 0 }, 16, 20, 16, 60, 80, AI_MAGMA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 60, 4, 2, 20, 60, 14, 0, 0, 50, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 1680 }, - { "Lava Lord", "Monsters\\Magma\\Magma%c.CL2", "Monsters\\Magma\\Magma%c%i.WAV", "Monsters\\Magma\\Wierd.TRN", 128, 1680, TRUE, TRUE, TRUE, { 8, 10, 14, 7, 18, 18 }, { 2, 0, 0, 0, 1, 0 }, 17, 21, 18, 70, 85, AI_MAGMA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 75, 4, 4, 24, 60, 14, 0, 0, 60, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 2124 }, - { "Horned Demon", "Monsters\\Rhino\\Rhino%c.CL2", "Monsters\\Rhino\\Rhino%c%i.WAV", NULL, 160, 1630, TRUE, TRUE, FALSE, { 8, 8, 14, 6, 16, 6 }, { 2, 0, 0, 0, 0, 0 }, 12, 16, 13, 40, 80, AI_RHINO, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 0, 60, 7, 2, 16, 100, 0, 5, 32, 40, MC_ANIMAL, 0 , RESIST_FIRE , 7, 0, 1172 }, - { "Mud Runner", "Monsters\\Rhino\\Rhino%c.CL2", "Monsters\\Rhino\\Rhino%c%i.WAV", "Monsters\\Rhino\\Orange.TRN", 160, 1630, TRUE, TRUE, TRUE, { 8, 8, 14, 6, 16, 6 }, { 2, 0, 0, 0, 0, 0 }, 14, 18, 15, 50, 90, AI_RHINO, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 1, 70, 7, 6, 18, 100, 0, 12, 36, 45, MC_ANIMAL, 0 , RESIST_FIRE , 7, 0, 1404 }, - { "Frost Charger", "Monsters\\Rhino\\Rhino%c.CL2", "Monsters\\Rhino\\Rhino%c%i.WAV", "Monsters\\Rhino\\Blue.TRN", 160, 1630, TRUE, TRUE, TRUE, { 8, 8, 14, 6, 16, 6 }, { 2, 0, 0, 0, 0, 0 }, 16, 20, 17, 60, 100, AI_RHINO, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 80, 7, 8, 20, 100, 0, 20, 40, 50, MC_ANIMAL, IMMUNE_MAGIC | RESIST_LIGHTNING , IMMUNE_MAGIC | RESIST_LIGHTNING , 7, 0, 1720 }, - { "Obsidian Lord", "Monsters\\Rhino\\Rhino%c.CL2", "Monsters\\Rhino\\Rhino%c%i.WAV", "Monsters\\Rhino\\RhinoB.TRN", 160, 1630, TRUE, TRUE, TRUE, { 8, 8, 14, 6, 16, 6 }, { 2, 0, 0, 0, 0, 0 }, 18, 22, 19, 70, 110, AI_RHINO, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 90, 7, 10, 22, 100, 0, 20, 50, 55, MC_ANIMAL, IMMUNE_MAGIC | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 7, 0, 1809 }, - { "oldboned", "Monsters\\Demskel\\Demskl%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 128, 1740, TRUE, TRUE, FALSE, { 10, 8, 20, 6, 24, 16 }, { 3, 0, 0, 0, 0, 0 }, 46, 47, 12, 70, 70, AI_STORM, 0 , 0, 60, 8, 6, 14, 12, 0, 0, 0, 50, MC_DEMON, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 7, 0, 1344 }, - { "Red Death", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 160, 1740, TRUE, TRUE, TRUE, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 14, 18, 16, 96, 96, AI_STORM, 0 , 1, 75, 5, 10, 20, 0, 0, 0, 0, 60, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 2168 }, - { "Litch Demon", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 160, 1740, TRUE, TRUE, TRUE, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 16, 20, 18, 110, 110, AI_STORM, 0 , 2, 80, 5, 10, 24, 0, 0, 0, 0, 45, MC_DEMON, IMMUNE_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 2736 }, - { "Undead Balrog", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 160, 1740, TRUE, TRUE, TRUE, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 20, 24, 22, 130, 130, AI_STORM, 0 , 3, 85, 5, 12, 30, 0, 0, 0, 0, 65, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3575 }, - { "Incinerator", "Monsters\\Fireman\\FireM%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 128, 1460, TRUE, FALSE, FALSE, { 14, 19, 20, 8, 14, 23 }, { 0, 0, 0, 0, 0, 0 }, 40, 43, 16, 30, 45, AI_FIREMAN, 0 , 0, 75, 8, 8, 16, 0, 0, 0, 0, 25, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 3, 0, 1888 }, - { "Flame Lord", "Monsters\\Fireman\\FireM%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 128, 1460, TRUE, FALSE, FALSE, { 14, 19, 20, 8, 14, 23 }, { 0, 0, 0, 0, 0, 0 }, 42, 45, 18, 40, 55, AI_FIREMAN, 0 , 1, 75, 8, 10, 20, 0, 0, 0, 0, 25, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 3, 0, 2250 }, - { "Doom Fire", "Monsters\\Fireman\\FireM%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 128, 1460, TRUE, FALSE, FALSE, { 14, 19, 20, 8, 14, 23 }, { 0, 0, 0, 0, 0, 0 }, 44, 47, 20, 50, 65, AI_FIREMAN, 0 , 2, 80, 8, 12, 24, 0, 0, 0, 0, 30, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 3, 0, 2740 }, - { "Hell Burner", "Monsters\\Fireman\\FireM%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 128, 1460, TRUE, FALSE, FALSE, { 14, 19, 20, 8, 14, 23 }, { 0, 0, 0, 0, 0, 0 }, 46, 47, 22, 60, 80, AI_FIREMAN, 0 , 3, 85, 8, 15, 30, 0, 0, 0, 0, 30, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 3, 0, 3355 }, - { "Red Storm", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 160, 1740, TRUE, TRUE, TRUE, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 17, 21, 18, 55, 110, AI_STORM, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 0, 80, 5, 8, 18, 75, 8, 4, 16, 30, MC_DEMON, IMMUNE_MAGIC | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_LIGHTNING , 7, 0, 2160 }, - { "Storm Rider", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", NULL, 160, 1740, TRUE, TRUE, FALSE, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 19, 23, 20, 60, 120, AI_STORM, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 1, 80, 5, 8, 18, 80, 8, 4, 16, 30, MC_DEMON, RESIST_MAGIC | IMMUNE_LIGHTNING , IMMUNE_MAGIC | IMMUNE_LIGHTNING , 7, 0, 2391 }, - { "Storm Lord", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv2.TRN", 160, 1740, TRUE, TRUE, TRUE, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 21, 25, 22, 75, 135, AI_STORM, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 85, 5, 12, 24, 75, 8, 4, 16, 35, MC_DEMON, RESIST_MAGIC | IMMUNE_LIGHTNING , IMMUNE_MAGIC | IMMUNE_LIGHTNING , 7, 0, 2775 }, - { "Maelstorm", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv1.TRN", 160, 1740, TRUE, TRUE, TRUE, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 23, 27, 24, 90, 150, AI_STORM, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 90, 5, 12, 28, 75, 8, 4, 16, 40, MC_DEMON, RESIST_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3177 }, - { "Devil Kin Brute", "Monsters\\BigFall\\Fallg%c.CL2", "Monsters\\newsfx\\KBrute%c%i.WAV", NULL, 128, 800, TRUE, FALSE, FALSE, { 10, 8, 11, 8, 17, 0 }, { 0, 0, 0, 0, 2, 2 }, 40, 43, 27, 120, 160, AI_SKELSD, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 100, 6, 18, 24, 0, 0, 0, 0, 70, MC_ANIMAL, RESIST_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , 3, 0, 2400 }, - { "Winged-Demon", "Monsters\\Gargoyle\\Gargo%c.CL2", "Monsters\\Gargoyle\\Gargo%c%i.WAV", NULL, 160, 1650, TRUE, FALSE, FALSE, { 14, 14, 14, 10, 18, 14 }, { 0, 0, 0, 0, 0, 2 }, 8, 12, 9, 45, 60, AI_GARG, MFLAG_CAN_OPEN_DOOR, 0, 50, 7, 10, 16, 0, 0, 0, 0, 45, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , 6, 0, 662 }, - { "Gargoyle", "Monsters\\Gargoyle\\Gargo%c.CL2", "Monsters\\Gargoyle\\Gargo%c%i.WAV", "Monsters\\Gargoyle\\GarE.TRN", 160, 1650, TRUE, FALSE, TRUE, { 14, 14, 14, 10, 18, 14 }, { 0, 0, 0, 0, 0, 2 }, 12, 16, 13, 60, 90, AI_GARG, MFLAG_CAN_OPEN_DOOR, 1, 65, 7, 10, 16, 0, 0, 0, 0, 45, MC_DEMON, IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 6, 0, 1205 }, - { "Blood Claw", "Monsters\\Gargoyle\\Gargo%c.CL2", "Monsters\\Gargoyle\\Gargo%c%i.WAV", "Monsters\\Gargoyle\\GargBr.TRN", 160, 1650, TRUE, FALSE, TRUE, { 14, 14, 14, 10, 18, 14 }, { 0, 0, 0, 0, 0, 0 }, 16, 20, 19, 75, 125, AI_GARG, MFLAG_CAN_OPEN_DOOR, 2, 80, 7, 14, 22, 0, 0, 0, 0, 50, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 6, 0, 1873 }, - { "Death Wing", "Monsters\\Gargoyle\\Gargo%c.CL2", "Monsters\\Gargoyle\\Gargo%c%i.WAV", "Monsters\\Gargoyle\\GargB.TRN", 160, 1650, TRUE, FALSE, TRUE, { 14, 14, 14, 10, 18, 14 }, { 0, 0, 0, 0, 0, 0 }, 18, 22, 23, 90, 150, AI_GARG, MFLAG_CAN_OPEN_DOOR, 3, 95, 7, 16, 28, 0, 0, 0, 0, 60, MC_DEMON, IMMUNE_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 6, 0, 2278 }, - { "Slayer", "Monsters\\Mega\\Mega%c.CL2", "Monsters\\Mega\\Mega%c%i.WAV", NULL, 160, 2220, TRUE, TRUE, FALSE, { 6, 7, 14, 1, 24, 5 }, { 3, 0, 0, 0, 2, 0 }, 19, 23, 20, 120, 140, AI_MEGA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 0, 100, 8, 12, 20, 0, 3, 0, 0, 60, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE , RESIST_MAGIC | IMMUNE_FIRE , 7, 0, 2300 }, - { "Guardian", "Monsters\\Mega\\Mega%c.CL2", "Monsters\\Mega\\Mega%c%i.WAV", "Monsters\\Mega\\Guard.TRN", 160, 2220, TRUE, TRUE, TRUE, { 6, 7, 14, 1, 24, 5 }, { 3, 0, 0, 0, 2, 0 }, 21, 25, 22, 140, 160, AI_MEGA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 1, 110, 8, 14, 22, 0, 3, 0, 0, 65, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE , RESIST_MAGIC | IMMUNE_FIRE , 7, 0, 2714 }, - { "Vortex Lord", "Monsters\\Mega\\Mega%c.CL2", "Monsters\\Mega\\Mega%c%i.WAV", "Monsters\\Mega\\Vtexl.TRN", 160, 2220, TRUE, TRUE, TRUE, { 6, 7, 14, 1, 24, 5 }, { 3, 0, 0, 0, 2, 0 }, 23, 26, 24, 160, 180, AI_MEGA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 120, 8, 18, 24, 0, 3, 0, 0, 70, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3252 }, - { "Balrog", "Monsters\\Mega\\Mega%c.CL2", "Monsters\\Mega\\Mega%c%i.WAV", "Monsters\\Mega\\Balr.TRN", 160, 2220, TRUE, TRUE, TRUE, { 6, 7, 14, 1, 24, 5 }, { 3, 0, 0, 0, 2, 0 }, 25, 29, 26, 180, 200, AI_MEGA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 130, 8, 22, 30, 0, 3, 0, 0, 75, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3643 }, - { "Cave Viper", "Monsters\\Snake\\Snake%c.CL2", "Monsters\\Snake\\Snake%c%i.WAV", NULL, 160, 1270, FALSE, FALSE, FALSE, { 12, 11, 13, 5, 18, 0 }, { 2, 0, 0, 0, 1, 0 }, 20, 24, 21, 100, 150, AI_SNAKE, MFLAG_SEARCH , 0, 90, 8, 8, 20, 0, 0, 0, 0, 60, MC_DEMON, IMMUNE_MAGIC , IMMUNE_MAGIC , 7, 0, 2725 }, - { "Fire Drake", "Monsters\\Snake\\Snake%c.CL2", "Monsters\\Snake\\Snake%c%i.WAV", "Monsters\\Snake\\SnakR.TRN", 160, 1270, FALSE, FALSE, TRUE, { 12, 11, 13, 5, 18, 0 }, { 2, 0, 0, 0, 1, 0 }, 22, 26, 23, 120, 170, AI_SNAKE, MFLAG_SEARCH , 1, 105, 8, 12, 24, 0, 0, 0, 0, 65, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 3139 }, - { "Gold Viper", "Monsters\\Snake\\Snake%c.CL2", "Monsters\\Snake\\Snake%c%i.WAV", "Monsters\\Snake\\Snakg.TRN", 160, 1270, FALSE, FALSE, TRUE, { 12, 11, 13, 5, 18, 0 }, { 2, 0, 0, 0, 1, 0 }, 24, 27, 25, 140, 180, AI_SNAKE, MFLAG_SEARCH , 2, 120, 8, 15, 26, 0, 0, 0, 0, 70, MC_DEMON, IMMUNE_MAGIC | RESIST_LIGHTNING , IMMUNE_MAGIC | RESIST_LIGHTNING , 7, 0, 3540 }, - { "Azure Drake", "Monsters\\Snake\\Snake%c.CL2", "Monsters\\Snake\\Snake%c%i.WAV", "Monsters\\Snake\\Snakb.TRN", 160, 1270, FALSE, FALSE, TRUE, { 12, 11, 13, 5, 18, 0 }, { 2, 0, 0, 0, 1, 0 }, 28, 30, 27, 160, 200, AI_SNAKE, MFLAG_SEARCH , 3, 130, 8, 18, 30, 0, 0, 0, 0, 75, MC_DEMON, RESIST_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING , 7, 0, 3791 }, - { "Black Knight", "Monsters\\Black\\Black%c.CL2", "Monsters\\Black\\Black%c%i.WAV", NULL, 160, 2120, FALSE, FALSE, FALSE, { 8, 8, 16, 4, 24, 0 }, { 2, 0, 0, 0, 0, 0 }, 23, 27, 24, 150, 150, AI_SKELSD, MFLAG_SEARCH , 0, 110, 8, 15, 20, 0, 0, 0, 0, 75, MC_DEMON, RESIST_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , RESIST_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3360 }, - { "Doom Guard", "Monsters\\Black\\Black%c.CL2", "Monsters\\Black\\Black%c%i.WAV", "Monsters\\Black\\BlkKntRT.TRN", 160, 2120, FALSE, FALSE, TRUE, { 8, 8, 16, 4, 24, 0 }, { 2, 0, 0, 0, 0, 0 }, 25, 29, 26, 165, 165, AI_SKELSD, MFLAG_SEARCH , 0, 130, 8, 18, 25, 0, 0, 0, 0, 75, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , 7, 0, 3650 }, - { "Steel Lord", "Monsters\\Black\\Black%c.CL2", "Monsters\\Black\\Black%c%i.WAV", "Monsters\\Black\\BlkKntBT.TRN", 160, 2120, FALSE, FALSE, TRUE, { 8, 8, 16, 4, 24, 0 }, { 2, 0, 0, 0, 0, 0 }, 27, 30, 28, 180, 180, AI_SKELSD, MFLAG_SEARCH , 1, 120, 8, 20, 30, 0, 0, 0, 0, 80, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 4252 }, - { "Blood Knight", "Monsters\\Black\\Black%c.CL2", "Monsters\\Black\\Black%c%i.WAV", "Monsters\\Black\\BlkKntBe.TRN", 160, 2120, FALSE, FALSE, TRUE, { 8, 8, 16, 4, 24, 0 }, { 2, 0, 0, 0, 0, 0 }, 24, 26, 30, 200, 200, AI_SKELSD, MFLAG_SEARCH , 1, 130, 8, 25, 35, 0, 0, 0, 0, 85, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 5130 }, - { "The Shredded", "Monsters\\Unrav\\Unrav%c.CL2", "Monsters\\newsfx\\Shred%c%i.WAV", NULL, 96, 484, FALSE, FALSE, FALSE, { 10, 10, 12, 5, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 32, 35, 23, 70, 90, AI_SKELSD, 0 , 0, 75, 7, 4, 12, 0, 0, 0, 0, 65, MC_UNDEAD, RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 900 }, - { "Hollow One", "Monsters\\Unrav\\Unrav%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 96, 484, FALSE, FALSE, FALSE, { 10, 10, 12, 5, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 34, 37, 27, 135, 240, AI_SKELSD, 0 , 1, 75, 7, 12, 24, 0, 0, 0, 0, 75, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 4374 }, - { "Pain Master", "Monsters\\Unrav\\Unrav%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 96, 484, FALSE, FALSE, FALSE, { 10, 10, 12, 5, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 36, 39, 29, 110, 200, AI_SKELSD, 0 , 2, 80, 7, 16, 30, 0, 0, 0, 0, 80, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 5147 }, - { "Reality Weaver", "Monsters\\Unrav\\Unrav%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 96, 484, FALSE, FALSE, FALSE, { 10, 10, 12, 5, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 38, 39, 30, 135, 240, AI_SKELSD, 0 , 3, 85, 7, 20, 35, 0, 0, 0, 0, 85, MC_UNDEAD, RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 5925 }, - { "Succubus", "Monsters\\Succ\\Scbs%c.CL2", "Monsters\\Succ\\Scbs%c%i.WAV", NULL, 128, 980, FALSE, FALSE, FALSE, { 14, 8, 16, 7, 24, 0 }, { 0, 0, 0, 0, 0, 0 }, 22, 26, 24, 120, 150, AI_SUCC, MFLAG_CAN_OPEN_DOOR, 0, 100, 10, 1, 20, 0, 0, 0, 0, 60, MC_DEMON, RESIST_MAGIC , IMMUNE_MAGIC | RESIST_FIRE , 3, 0, 3696 }, - { "Snow Witch", "Monsters\\Succ\\Scbs%c.CL2", "Monsters\\Succ\\Scbs%c%i.WAV", "Monsters\\Succ\\Succb.TRN", 128, 980, FALSE, FALSE, TRUE, { 14, 8, 16, 7, 24, 0 }, { 0, 0, 0, 0, 0, 0 }, 25, 28, 26, 135, 175, AI_SUCC, MFLAG_CAN_OPEN_DOOR, 1, 110, 10, 1, 24, 0, 0, 0, 0, 65, MC_DEMON, RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 4084 }, - { "Hell Spawn", "Monsters\\Succ\\Scbs%c.CL2", "Monsters\\Succ\\Scbs%c%i.WAV", "Monsters\\Succ\\Succrw.TRN", 128, 980, FALSE, FALSE, TRUE, { 14, 8, 16, 7, 24, 0 }, { 0, 0, 0, 0, 0, 0 }, 27, 30, 28, 150, 200, AI_SUCC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 115, 10, 1, 30, 0, 0, 0, 0, 75, MC_DEMON, RESIST_MAGIC | IMMUNE_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 3, 0, 4480 }, - { "Soul Burner", "Monsters\\Succ\\Scbs%c.CL2", "Monsters\\Succ\\Scbs%c%i.WAV", "Monsters\\Succ\\Succbw.TRN", 128, 980, FALSE, FALSE, TRUE, { 14, 8, 16, 7, 24, 0 }, { 0, 0, 0, 0, 0, 0 }, 28, 30, 30, 140, 225, AI_SUCC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 120, 10, 1, 35, 0, 0, 0, 0, 85, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 3, 0, 4644 }, - { "Counselor", "Monsters\\Mage\\Mage%c.CL2", "Monsters\\Mage\\Mage%c%i.WAV", NULL, 128, 2000, TRUE, FALSE, FALSE, { 12, 1, 20, 8, 28, 20 }, { 0, 0, 0, 0, 0, 0 }, 24, 26, 25, 70, 70, AI_COUNSLR, MFLAG_CAN_OPEN_DOOR, 0, 90, 8, 8, 20, 0, 0, 0, 0, 0, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , 7, 0, 4070 }, - { "Magistrate", "Monsters\\Mage\\Mage%c.CL2", "Monsters\\Mage\\Mage%c%i.WAV", "Monsters\\Mage\\Cnselg.TRN", 128, 2000, TRUE, FALSE, TRUE, { 12, 1, 20, 8, 28, 20 }, { 0, 0, 0, 0, 0, 0 }, 26, 28, 27, 85, 85, AI_COUNSLR, MFLAG_CAN_OPEN_DOOR, 1, 100, 8, 10, 24, 0, 0, 0, 0, 0, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 4478 }, - { "Cabalist", "Monsters\\Mage\\Mage%c.CL2", "Monsters\\Mage\\Mage%c%i.WAV", "Monsters\\Mage\\Cnselgd.TRN", 128, 2000, TRUE, FALSE, TRUE, { 12, 1, 20, 8, 28, 20 }, { 0, 0, 0, 0, 0, 0 }, 28, 30, 29, 120, 120, AI_COUNSLR, MFLAG_CAN_OPEN_DOOR, 2, 110, 8, 14, 30, 0, 0, 0, 0, 0, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 4929 }, - { "Advocate", "Monsters\\Mage\\Mage%c.CL2", "Monsters\\Mage\\Mage%c%i.WAV", "Monsters\\Mage\\Cnselbk.TRN", 128, 2000, TRUE, FALSE, TRUE, { 12, 1, 20, 8, 28, 20 }, { 0, 0, 0, 0, 0, 0 }, 30, 30, 30, 145, 145, AI_COUNSLR, MFLAG_CAN_OPEN_DOOR, 3, 120, 8, 15, 25, 0, 0, 0, 0, 0, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 4968 }, - { "Golem", "Monsters\\Golem\\Golem%c.CL2", "Monsters\\Golem\\Golm%c%i.WAV", NULL, 96, 386, TRUE, FALSE, FALSE, { 0, 16, 12, 0, 12, 20 }, { 0, 0, 0, 0, 0, 0 }, 0, 0, 12, 1, 1, AI_GOLUM, MFLAG_CAN_OPEN_DOOR, 0, 0, 7, 1, 1, 0, 0, 0, 0, 1, MC_DEMON, 0 , 0 , 0, 0, 0 }, - { "The Dark Lord", "Monsters\\Diablo\\Diablo%c.CL2", "Monsters\\Diablo\\Diablo%c%i.WAV", NULL, 160, 2000, TRUE, TRUE, FALSE, { 16, 6, 16, 6, 16, 16 }, { 0, 0, 0, 0, 0, 0 }, 50, 50, 45, 3333, 3333, AI_DIABLO, MFLAG_KNOCKBACK | MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 220, 4, 30, 60, 0, 11, 0, 0, 90, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 31666 }, - { "The Arch-Litch Malignus", "Monsters\\DarkMage\\Dmage%c.CL2", "Monsters\\DarkMage\\Dmag%c%i.WAV", NULL, 128, 1060, TRUE, FALSE, FALSE, { 6, 1, 21, 6, 23, 18 }, { 0, 0, 0, 0, 0, 0 }, 40, 41, 30, 160, 160, AI_COUNSLR, MFLAG_CAN_OPEN_DOOR, 3, 120, 8, 20, 40, 0, 0, 0, 0, 70, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 4968 }, - { "Hellboar", "Monsters\\Fork\\Fork%c.CL2", "Monsters\\newsfx\\HBoar%c%i.WAV", NULL, 188, 800, FALSE, FALSE, FALSE, { 10, 10, 15, 6, 16, 0 }, { 2, 0, 0, 0, 0, 0 }, 32, 35, 23, 80, 100, AI_SKELSD, MFLAG_KNOCKBACK | MFLAG_SEARCH , 2, 70, 7, 16, 24, 0, 0, 0, 0, 60, MC_DEMON, 0 , RESIST_FIRE | RESIST_LIGHTNING , 3, 0, 750 }, - { "Stinger", "Monsters\\Scorp\\Scorp%c.CL2", "Monsters\\newsfx\\Stingr%c%i.WAV", NULL, 64, 305, FALSE, FALSE, FALSE, { 10, 10, 12, 6, 15, 0 }, { 2, 0, 0, 0, 0, 0 }, 32, 35, 22, 30, 40, AI_SKELSD, 0 , 3, 85, 8, 1, 20, 0, 0, 0, 0, 50, MC_ANIMAL, 0 , RESIST_LIGHTNING , 1, 0, 500 }, - { "Psychorb", "Monsters\\Eye\\Eye%c.CL2", "Monsters\\newsfx\\psyco%c%i.WAV", NULL, 156, 800, FALSE, FALSE, FALSE, { 12, 13, 13, 7, 21, 0 }, { 2, 0, 0, 0, 0, 0 }, 32, 35, 22, 20, 30, AI_PSYCHORB, 0 , 3, 80, 8, 10, 10, 0, 0, 0, 0, 40, MC_ANIMAL, 0 , RESIST_FIRE , 6, 0, 450 }, - { "Arachnon", "Monsters\\Spider\\Spider%c.CL2", "Monsters\\newsfx\\SLord%c%i.WAV", NULL, 148, 800, FALSE, FALSE, FALSE, { 12, 10, 15, 6, 20, 0 }, { 2, 0, 0, 0, 0, 0 }, 32, 35, 22, 60, 80, AI_SKELSD, MFLAG_SEARCH , 3, 50, 8, 5, 15, 0, 0, 0, 0, 50, MC_ANIMAL, 0 , RESIST_LIGHTNING , 7, 0, 500 }, - { "Felltwin", "Monsters\\TSneak\\TSneak%c.CL2", "Monsters\\newsfx\\FTwin%c%i.WAV", NULL, 128, 800, FALSE, FALSE, FALSE, { 13, 13, 15, 11, 16, 0 }, { 2, 0, 0, 0, 0, 0 }, 32, 35, 22, 50, 70, AI_SKELSD, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 70, 8, 10, 18, 0, 0, 0, 0, 50, MC_DEMON, IMMUNE_NULL_40 , RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 600 }, - { "Hork Spawn", "Monsters\\Spawn\\Spawn%c.CL2", "Monsters\\newsfx\\HSpawn%c%i.WAV", NULL, 164, 520, FALSE, TRUE, FALSE, { 15, 12, 14, 11, 14, 0 }, { 0, 0, 0, 0, 0, 0 }, 34, 37, 22, 30, 30, AI_SKELSD, 0 , 3, 60, 8, 10, 25, 0, 0, 0, 0, 25, MC_DEMON, RESIST_MAGIC , RESIST_MAGIC , 3, 0, 250 }, - { "Venomtail", "Monsters\\WScorp\\WScorp%c.CL2", "Monsters\\newsfx\\Stingr%c%i.WAV", NULL, 86, 305, FALSE, FALSE, FALSE, { 10, 10, 12, 6, 15, 0 }, { 2, 0, 0, 0, 0, 0 }, 36, 39, 24, 40, 50, AI_SKELSD, 0 , 3, 85, 8, 1, 30, 0, 0, 0, 0, 60, MC_ANIMAL, RESIST_LIGHTNING , IMMUNE_LIGHTNING , 1, 0, 1000 }, - { "Necromorb", "Monsters\\Eye2\\Eye2%c.CL2", "Monsters\\newsfx\\Psyco%c%i.WAV", NULL, 140, 800, FALSE, FALSE, FALSE, { 12, 13, 13, 7, 21, 0 }, { 2, 0, 0, 0, 0, 0 }, 36, 39, 24, 30, 40, AI_NECROMORB, 0 , 3, 80, 8, 20, 20, 0, 0, 0, 0, 50, MC_ANIMAL, RESIST_FIRE , IMMUNE_FIRE | RESIST_LIGHTNING , 6, 0, 1100 }, - { "Spider Lord", "Monsters\\bSpidr\\bSpidr%c.CL2", "Monsters\\newsfx\\SLord%c%i.WAV", NULL, 148, 800, TRUE, TRUE, FALSE, { 12, 10, 15, 6, 20, 10 }, { 2, 0, 0, 0, 0, 0 }, 36, 39, 24, 80, 100, AI_ACID, MFLAG_SEARCH , 3, 60, 8, 8, 20, 75, 8, 10, 10, 60, MC_ANIMAL, RESIST_LIGHTNING , RESIST_FIRE | IMMUNE_LIGHTNING , 7, 0, 1250 }, - { "Lashworm", "Monsters\\Clasp\\Clasp%c.CL2", "Monsters\\newsfx\\Lworm%c%i.WAV", NULL, 176, 800, FALSE, FALSE, FALSE, { 10, 12, 15, 6, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 36, 39, 20, 30, 30, AI_SKELSD, 0 , 3, 90, 8, 12, 20, 0, 0, 0, 0, 50, MC_ANIMAL, 0 , RESIST_FIRE , 3, 0, 600 }, - { "Torchant", "Monsters\\AntWorm\\Worm%c.CL2", "Monsters\\newsfx\\TchAnt%c%i.WAV", NULL, 192, 800, FALSE, FALSE, FALSE, { 14, 12, 12, 6, 20, 0 }, { 2, 0, 0, 0, 0, 0 }, 36, 39, 22, 60, 80, AI_TORCHANT, 0 , 3, 75, 8, 20, 30, 0, 0, 0, 0, 70, MC_ANIMAL, IMMUNE_FIRE , RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 7, 0, 1250 }, - { "Hork Demon", "Monsters\\HorkD\\HorkD%c.CL2", "Monsters\\newsfx\\HDemon%c%i.WAV", NULL, 138, 800, TRUE, TRUE, FALSE, { 15, 8, 16, 6, 16, 9 }, { 2, 0, 0, 0, 0, 2 }, 36, 37, 27, 120, 160, AI_SKELSD, 0 , 3, 60, 8, 20, 35, 80, 8, 0, 0, 80, MC_DEMON, RESIST_LIGHTNING , RESIST_MAGIC | IMMUNE_LIGHTNING , 7, 0, 2000 }, - { "Hell Bug", "Monsters\\Hellbug\\Hellbg%c.CL2", "Monsters\\newsfx\\Defile%c%i.WAV", NULL, 198, 800, TRUE, TRUE, FALSE, { 8, 8, 14, 6, 14, 12 }, { 0, 0, 0, 0, 0, 0 }, 38, 39, 30, 240, 240, AI_SKELSD, MFLAG_SEARCH , 3, 110, 8, 20, 30, 90, 8, 50, 60, 80, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 7, 0, 5000 }, - { "Gravedigger", "Monsters\\Gravdg\\Gravdg%c.CL2", "Monsters\\newsfx\\GDiggr%c%i.WAV", NULL, 124, 800, TRUE, TRUE, FALSE, { 24, 24, 12, 6, 16, 16 }, { 2, 0, 0, 0, 0, 0 }, 40, 41, 26, 120, 240, AI_SCAV, MFLAG_CAN_OPEN_DOOR, 3, 80, 6, 2, 12, 0, 0, 0, 0, 20, MC_UNDEAD, IMMUNE_LIGHTNING | IMMUNE_NULL_40 , RESIST_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 2000 }, - { "Tomb Rat", "Monsters\\Rat\\Rat%c.CL2", "Monsters\\newsfx\\TmbRat%c%i.WAV", NULL, 104, 550, FALSE, FALSE, FALSE, { 11, 8, 12, 6, 20, 0 }, { 2, 0, 0, 0, 0, 0 }, 40, 43, 24, 80, 120, AI_SKELSD, 0 , 3, 120, 8, 12, 25, 0, 0, 0, 0, 30, MC_ANIMAL, 0 , RESIST_FIRE | RESIST_LIGHTNING , 3, 0, 1800 }, - { "Firebat", "Monsters\\Hellbat\\Helbat%c.CL2", "Monsters\\newsfx\\HelBat%c%i.WAV", NULL, 96, 550, FALSE, FALSE, FALSE, { 18, 16, 14, 6, 18, 11 }, { 2, 0, 0, 0, 0, 0 }, 40, 43, 24, 60, 80, AI_FIREBAT, 0 , 3, 100, 8, 15, 20, 0, 0, 0, 0, 70, MC_ANIMAL, IMMUNE_FIRE , RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 7, 0, 2400 }, - { "Skullwing", "Monsters\\Demskel\\Demskl%c.CL2", "Monsters\\newsfx\\SWing%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 128, 1740, TRUE, FALSE, FALSE, { 10, 8, 20, 6, 24, 16 }, { 3, 0, 0, 0, 0, 0 }, 40, 43, 27, 70, 70, AI_SKELSD, 0 , 0, 75, 7, 15, 20, 75, 9, 15, 20, 80, MC_UNDEAD, RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3000 }, - { "Lich", "Monsters\\Lich\\Lich%c.CL2", "Monsters\\newsfx\\Lich%c%i.WAV", NULL, 96, 800, FALSE, TRUE, FALSE, { 12, 10, 10, 7, 21, 0 }, { 2, 0, 0, 0, 2, 0 }, 40, 43, 25, 80, 100, AI_LICH, 0 , 3, 100, 8, 15, 20, 0, 0, 0, 0, 60, MC_UNDEAD, RESIST_LIGHTNING | IMMUNE_NULL_40 , RESIST_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 3000 }, - { "Crypt Demon", "Monsters\\Bubba\\Bubba%c.CL2", "Monsters\\newsfx\\Crypt%c%i.WAV", NULL, 154, 800, FALSE, TRUE, FALSE, { 8, 18, 12, 8, 21, 0 }, { 3, 0, 0, 0, 0, 0 }, 42, 45, 28, 200, 240, AI_SKELSD, 0 , 3, 100, 8, 20, 40, 0, 0, 0, 0, 85, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 3, 0, 3200 }, - { "Hellbat", "Monsters\\Hellbat2\\bhelbt%c.CL2", "Monsters\\newsfx\\HelBat%c%i.WAV", NULL, 96, 550, TRUE, FALSE, FALSE, { 18, 16, 14, 6, 18, 11 }, { 2, 0, 0, 0, 0, 0 }, 44, 47, 29, 100, 140, AI_TORCHANT, 0 , 3, 110, 8, 30, 30, 0, 0, 0, 0, 80, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 7, 0, 3600 }, - { "Bone Demon", "Monsters\\Demskel\\Demskl%c.CL2", "Monsters\\newsfx\\SWing%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 128, 1740, TRUE, TRUE, FALSE, { 10, 8, 20, 6, 24, 16 }, { 3, 0, 0, 0, 0, 0 }, 44, 47, 30, 240, 280, AI_BONEDEMON, 0 , 0, 100, 8, 40, 50, 160, 12, 50, 50, 50, MC_UNDEAD, IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 5000 }, - { "Arch Lich", "Monsters\\Lich2\\Lich2%c.CL2", "Monsters\\newsfx\\Lich%c%i.WAV", NULL, 136, 800, FALSE, TRUE, FALSE, { 12, 10, 10, 7, 21, 0 }, { 2, 0, 0, 0, 2, 0 }, 44, 47, 30, 180, 200, AI_ARCHLICH, 0 , 3, 120, 8, 30, 30, 0, 0, 0, 0, 75, MC_UNDEAD, RESIST_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 4000 }, - { "Biclops", "Monsters\\Byclps\\Byclps%c.CL2", "Monsters\\newsfx\\Biclop%c%i.WAV", NULL, 180, 800, FALSE, FALSE, FALSE, { 10, 11, 16, 6, 16, 0 }, { 2, 0, 0, 0, 2, 0 }, 44, 47, 30, 200, 240, AI_SKELSD, MFLAG_KNOCKBACK | MFLAG_CAN_OPEN_DOOR, 3, 90, 8, 40, 50, 0, 0, 0, 0, 80, MC_DEMON, RESIST_LIGHTNING , RESIST_FIRE | RESIST_LIGHTNING , 3, 0, 4000 }, - { "Flesh Thing", "Monsters\\Flesh\\Flesh%c.CL2", "Monsters\\newsfx\\FleshT%c%i.WAV", NULL, 164, 800, FALSE, TRUE, FALSE, { 15, 24, 15, 6, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 44, 47, 28, 300, 400, AI_SKELSD, 0 , 3, 150, 8, 12, 18, 0, 0, 0, 0, 70, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , 3, 0, 4000 }, - { "Reaper", "Monsters\\Reaper\\Reap%c.CL2", "Monsters\\newsfx\\Reaper%c%i.WAV", NULL, 180, 800, FALSE, FALSE, FALSE, { 12, 10, 14, 6, 16, 0 }, { 2, 0, 0, 0, 0, 0 }, 44, 47, 30, 260, 300, AI_SKELSD, 0 , 3, 120, 8, 30, 35, 0, 0, 0, 0, 90, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 3, 0, 6000 }, - { "Na-Krul", "Monsters\\Nkr\\Nkr%c.CL2", "Monsters\\newsfx\\Nakrul%c%i.WAV", NULL, 226, 1200, TRUE, TRUE, FALSE, { 2, 6, 16, 3, 16, 16 }, { 0, 0, 0, 0, 0, 0 }, 60, 60, 40, 1332, 1332, AI_SKELSD, MFLAG_KNOCKBACK | MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 150, 7, 40, 50, 150, 10, 40, 50, 125, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 13333 }, + { "Zombie", "Monsters\\Zombie\\Zombie%c.CL2", "Monsters\\Zombie\\Zombie%c%i.WAV", NULL, 128, 799, false, false, false, { 11, 24, 12, 6, 16, 0 }, { 4, 0, 0, 0, 0, 0 }, 1, 3, 1, 4, 7, AI_ZOMBIE, 0 , 0, 10, 8, 2, 5, 0, 0, 0, 0, 5, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 54 }, + { "Ghoul", "Monsters\\Zombie\\Zombie%c.CL2", "Monsters\\Zombie\\Zombie%c%i.WAV", "Monsters\\Zombie\\Bluered.TRN", 128, 799, false, false, true, { 11, 24, 12, 6, 16, 0 }, { 4, 0, 0, 0, 0, 0 }, 2, 4, 2, 7, 11, AI_ZOMBIE, 0 , 1, 10, 8, 3, 10, 0, 0, 0, 0, 10, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 58 }, + { "Rotting Carcass", "Monsters\\Zombie\\Zombie%c.CL2", "Monsters\\Zombie\\Zombie%c%i.WAV", "Monsters\\Zombie\\Grey.TRN", 128, 799, false, false, true, { 11, 24, 12, 6, 16, 0 }, { 4, 0, 0, 0, 0, 0 }, 2, 6, 4, 15, 25, AI_ZOMBIE, 0 , 2, 25, 8, 5, 15, 0, 0, 0, 0, 15, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , 3, 0, 136 }, + { "Black Death", "Monsters\\Zombie\\Zombie%c.CL2", "Monsters\\Zombie\\Zombie%c%i.WAV", "Monsters\\Zombie\\Yellow.TRN", 128, 799, false, false, true, { 11, 24, 12, 6, 16, 0 }, { 4, 0, 0, 0, 0, 0 }, 4, 8, 6, 25, 40, AI_ZOMBIE, 0 , 3, 30, 8, 6, 22, 0, 0, 0, 0, 20, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 240 }, + { "Fallen One", "Monsters\\FalSpear\\Phall%c.CL2", "Monsters\\FalSpear\\Phall%c%i.WAV", "Monsters\\FalSpear\\FallenT.TRN", 128, 543, true, true, true, { 11, 11, 13, 11, 18, 13 }, { 3, 0, 0, 0, 0, 0 }, 1, 3, 1, 1, 4, AI_FALLEN, 0 , 0, 15, 7, 1, 3, 0, 5, 0, 0, 0, MC_ANIMAL, 0 , 0 , 3, 0, 46 }, + { "Carver", "Monsters\\FalSpear\\Phall%c.CL2", "Monsters\\FalSpear\\Phall%c%i.WAV", "Monsters\\FalSpear\\Dark.TRN", 128, 543, true, true, true, { 11, 11, 13, 11, 18, 13 }, { 3, 0, 0, 0, 0, 0 }, 2, 5, 3, 4, 8, AI_FALLEN, 0 , 2, 20, 7, 2, 5, 0, 5, 0, 0, 5, MC_ANIMAL, 0 , 0 , 3, 0, 80 }, + { "Devil Kin", "Monsters\\FalSpear\\Phall%c.CL2", "Monsters\\FalSpear\\Phall%c%i.WAV", NULL, 128, 543, true, true, false, { 11, 11, 13, 11, 18, 13 }, { 3, 0, 0, 0, 0, 0 }, 3, 7, 5, 12, 24, AI_FALLEN, 0 , 2, 25, 7, 3, 7, 0, 5, 0, 0, 10, MC_ANIMAL, 0 , RESIST_FIRE , 3, 0, 155 }, + { "Dark One", "Monsters\\FalSpear\\Phall%c.CL2", "Monsters\\FalSpear\\Phall%c%i.WAV", "Monsters\\FalSpear\\Blue.TRN", 128, 543, true, true, true, { 11, 11, 13, 11, 18, 13 }, { 3, 0, 0, 0, 0, 0 }, 5, 9, 7, 20, 36, AI_FALLEN, 0 , 3, 30, 7, 4, 8, 0, 5, 0, 0, 15, MC_ANIMAL, IMMUNE_NULL_40 , RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 255 }, + { "Skeleton", "Monsters\\SkelAxe\\SklAx%c.CL2", "Monsters\\SkelAxe\\SklAx%c%i.WAV", "Monsters\\SkelAxe\\White.TRN", 128, 553, true, false, true, { 12, 8, 13, 6, 17, 16 }, { 5, 0, 0, 0, 0, 0 }, 1, 3, 1, 2, 4, AI_SKELSD, 0 , 0, 20, 8, 1, 4, 0, 0, 0, 0, 0, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 64 }, + { "Corpse Axe", "Monsters\\SkelAxe\\SklAx%c.CL2", "Monsters\\SkelAxe\\SklAx%c%i.WAV", "Monsters\\SkelAxe\\Skelt.TRN", 128, 553, true, false, true, { 12, 8, 13, 6, 17, 16 }, { 4, 0, 0, 0, 0, 0 }, 2, 5, 2, 4, 7, AI_SKELSD, 0 , 1, 25, 8, 3, 5, 0, 0, 0, 0, 0, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 68 }, + { "Burning Dead", "Monsters\\SkelAxe\\SklAx%c.CL2", "Monsters\\SkelAxe\\SklAx%c%i.WAV", NULL, 128, 553, true, false, false, { 12, 8, 13, 6, 17, 16 }, { 2, 0, 0, 0, 0, 0 }, 2, 6, 4, 8, 12, AI_SKELSD, 0 , 2, 30, 8, 3, 7, 0, 0, 0, 0, 5, MC_UNDEAD, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , 3, 0, 154 }, + { "Horror", "Monsters\\SkelAxe\\SklAx%c.CL2", "Monsters\\SkelAxe\\SklAx%c%i.WAV", "Monsters\\SkelAxe\\Black.TRN", 128, 553, true, false, true, { 12, 8, 13, 6, 17, 16 }, { 3, 0, 0, 0, 0, 0 }, 4, 8, 6, 12, 20, AI_SKELSD, 0 , 3, 35, 8, 4, 9, 0, 0, 0, 0, 15, MC_UNDEAD, IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 264 }, + { "Fallen One", "Monsters\\FalSword\\Fall%c.CL2", "Monsters\\FalSword\\Fall%c%i.WAV", "Monsters\\FalSword\\FallenT.TRN", 128, 623, true, true, true, { 12, 12, 13, 11, 14, 15 }, { 3, 0, 0, 0, 0, 0 }, 1, 3, 1, 2, 5, AI_FALLEN, 0 , 0, 15, 8, 1, 4, 0, 5, 0, 0, 10, MC_ANIMAL, 0 , 0 , 3, 0, 52 }, + { "Carver", "Monsters\\FalSword\\Fall%c.CL2", "Monsters\\FalSword\\Fall%c%i.WAV", "Monsters\\FalSword\\Dark.TRN", 128, 623, true, true, true, { 12, 12, 13, 11, 14, 15 }, { 3, 0, 0, 0, 0, 0 }, 2, 5, 3, 5, 9, AI_FALLEN, 0 , 1, 20, 8, 2, 7, 0, 5, 0, 0, 15, MC_ANIMAL, 0 , 0 , 3, 0, 90 }, + { "Devil Kin", "Monsters\\FalSword\\Fall%c.CL2", "Monsters\\FalSword\\Fall%c%i.WAV", NULL, 128, 623, true, true, false, { 12, 12, 13, 11, 14, 15 }, { 3, 0, 0, 0, 0, 0 }, 3, 7, 5, 16, 24, AI_FALLEN, 0 , 2, 25, 8, 4, 10, 0, 5, 0, 0, 20, MC_ANIMAL, 0 , RESIST_FIRE , 3, 0, 180 }, + { "Dark One", "Monsters\\FalSword\\Fall%c.CL2", "Monsters\\FalSword\\Fall%c%i.WAV", "Monsters\\FalSword\\Blue.TRN", 128, 623, true, true, true, { 12, 12, 13, 11, 14, 15 }, { 3, 0, 0, 0, 0, 0 }, 5, 9, 7, 24, 36, AI_FALLEN, 0 , 3, 30, 8, 4, 12, 0, 5, 0, 0, 25, MC_ANIMAL, IMMUNE_NULL_40 , RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 280 }, + { "Scavenger", "Monsters\\Scav\\Scav%c.CL2", "Monsters\\Scav\\Scav%c%i.WAV", NULL, 128, 410, true, false, false, { 12, 8, 12, 6, 20, 11 }, { 2, 0, 0, 0, 0, 0 }, 1, 4, 2, 3, 6, AI_SCAV, 0 , 0, 20, 7, 1, 5, 0, 0, 0, 0, 10, MC_ANIMAL, 0 , RESIST_FIRE , 3, 0, 80 }, + { "Plague Eater", "Monsters\\Scav\\Scav%c.CL2", "Monsters\\Scav\\Scav%c%i.WAV", "Monsters\\Scav\\ScavBr.TRN", 128, 410, true, false, true, { 12, 8, 12, 6, 20, 11 }, { 2, 0, 0, 0, 0, 0 }, 3, 6, 4, 12, 24, AI_SCAV, 0 , 1, 30, 7, 1, 8, 0, 0, 0, 0, 20, MC_ANIMAL, 0 , RESIST_LIGHTNING , 3, 0, 188 }, + { "Shadow Beast", "Monsters\\Scav\\Scav%c.CL2", "Monsters\\Scav\\Scav%c%i.WAV", "Monsters\\Scav\\ScavBe.TRN", 128, 410, true, false, true, { 12, 8, 12, 6, 20, 11 }, { 2, 0, 0, 0, 0, 0 }, 4, 8, 6, 24, 36, AI_SCAV, 0 , 2, 35, 7, 3, 12, 0, 0, 0, 0, 25, MC_ANIMAL, IMMUNE_NULL_40 , RESIST_FIRE | IMMUNE_NULL_40 , 3, 0, 375 }, + { "Bone Gasher", "Monsters\\Scav\\Scav%c.CL2", "Monsters\\Scav\\Scav%c%i.WAV", "Monsters\\Scav\\ScavW.TRN", 128, 410, true, false, true, { 12, 8, 12, 6, 20, 11 }, { 2, 0, 0, 0, 0, 0 }, 6, 10, 8, 28, 40, AI_SCAV, 0 , 3, 35, 7, 5, 15, 0, 0, 0, 0, 30, MC_ANIMAL, RESIST_MAGIC | IMMUNE_NULL_40 , RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 552 }, + { "Skeleton", "Monsters\\SkelBow\\SklBw%c.CL2", "Monsters\\SkelBow\\SklBw%c%i.WAV", "Monsters\\SkelBow\\White.TRN", 128, 567, true, false, true, { 9, 8, 16, 5, 16, 16 }, { 4, 0, 0, 0, 0, 0 }, 2, 5, 3, 2, 4, AI_SKELBOW, 0 , 0, 15, 12, 1, 2, 0, 0, 0, 0, 0, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 110 }, + { "Corpse Bow", "Monsters\\SkelBow\\SklBw%c.CL2", "Monsters\\SkelBow\\SklBw%c%i.WAV", "Monsters\\SkelBow\\Skelt.TRN", 128, 567, true, false, true, { 9, 8, 16, 5, 16, 16 }, { 4, 0, 0, 0, 0, 0 }, 3, 7, 5, 8, 16, AI_SKELBOW, 0 , 1, 25, 12, 1, 4, 0, 0, 0, 0, 0, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 210 }, + { "Burning Dead", "Monsters\\SkelBow\\SklBw%c.CL2", "Monsters\\SkelBow\\SklBw%c%i.WAV", NULL, 128, 567, true, false, false, { 9, 8, 16, 5, 16, 16 }, { 2, 0, 0, 0, 0, 0 }, 5, 9, 7, 10, 24, AI_SKELBOW, 0 , 2, 30, 12, 1, 6, 0, 0, 0, 0, 5, MC_UNDEAD, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , 3, 0, 364 }, + { "Horror", "Monsters\\SkelBow\\SklBw%c.CL2", "Monsters\\SkelBow\\SklBw%c%i.WAV", "Monsters\\SkelBow\\Black.TRN", 128, 567, true, false, true, { 9, 8, 16, 5, 16, 16 }, { 3, 0, 0, 0, 0, 0 }, 7, 11, 9, 15, 45, AI_SKELBOW, 0 , 3, 35, 12, 2, 9, 0, 0, 0, 0, 15, MC_UNDEAD, IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 594 }, + { "Skeleton Captain", "Monsters\\SkelSd\\SklSr%c.CL2", "Monsters\\SkelSd\\SklSr%c%i.WAV", "Monsters\\SkelSd\\White.TRN", 128, 575, true, true, true, { 13, 8, 12, 7, 15, 16 }, { 4, 0, 0, 0, 0, 0 }, 1, 4, 2, 3, 6, AI_SKELSD, 0 , 0, 20, 8, 2, 7, 0, 0, 0, 0, 10, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 90 }, + { "Corpse Captain", "Monsters\\SkelSd\\SklSr%c.CL2", "Monsters\\SkelSd\\SklSr%c%i.WAV", "Monsters\\SkelSd\\Skelt.TRN", 128, 575, true, false, true, { 13, 8, 12, 7, 15, 16 }, { 4, 0, 0, 0, 0, 0 }, 2, 6, 4, 12, 20, AI_SKELSD, 0 , 1, 30, 8, 3, 9, 0, 0, 0, 0, 5, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 200 }, + { "Burning Dead Captain", "Monsters\\SkelSd\\SklSr%c.CL2", "Monsters\\SkelSd\\SklSr%c%i.WAV", NULL, 128, 575, true, false, false, { 13, 8, 12, 7, 15, 16 }, { 4, 0, 0, 0, 0, 0 }, 4, 8, 6, 16, 30, AI_SKELSD, 0 , 2, 35, 8, 4, 10, 0, 0, 0, 0, 15, MC_UNDEAD, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , 3, 0, 393 }, + { "Horror Captain", "Monsters\\SkelSd\\SklSr%c.CL2", "Monsters\\SkelSd\\SklSr%c%i.WAV", "Monsters\\SkelSd\\Black.TRN", 128, 575, true, false, true, { 13, 8, 12, 7, 15, 16 }, { 4, 0, 0, 0, 0, 0 }, 6, 10, 8, 35, 50, AI_SKELSD, MFLAG_SEARCH , 3, 40, 8, 5, 14, 0, 0, 0, 0, 30, MC_UNDEAD, IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 604 }, + { "Invisible Lord", "Monsters\\TSneak\\TSneak%c.CL2", "Monsters\\TSneak\\Sneakl%c%i.WAV", NULL, 128, 800, false, false, false, { 13, 13, 15, 11, 16, 0 }, { 2, 0, 0, 0, 0, 0 }, 36, 39, 14, 278, 278, AI_SKELSD, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 65, 8, 16, 30, 0, 0, 0, 0, 60, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 2000 }, + { "Hidden", "Monsters\\Sneak\\Sneak%c.CL2", "Monsters\\Sneak\\Sneak%c%i.WAV", NULL, 128, 992, true, false, false, { 16, 8, 12, 8, 24, 15 }, { 2, 0, 0, 0, 0, 0 }, 3, 8, 5, 8, 24, AI_SNEAK, MFLAG_HIDDEN , 0, 35, 8, 3, 6, 0, 0, 0, 0, 25, MC_DEMON, 0 , IMMUNE_NULL_40 , 3, 0, 278 }, + { "Stalker", "Monsters\\Sneak\\Sneak%c.CL2", "Monsters\\Sneak\\Sneak%c%i.WAV", "Monsters\\Sneak\\Sneakv2.TRN", 128, 992, true, false, true, { 16, 8, 12, 8, 24, 15 }, { 2, 0, 0, 0, 0, 0 }, 8, 12, 9, 30, 45, AI_SNEAK, MFLAG_HIDDEN | MFLAG_SEARCH , 1, 40, 8, 8, 16, 0, 0, 0, 0, 30, MC_DEMON, 0 , IMMUNE_NULL_40 , 3, 0, 630 }, + { "Unseen", "Monsters\\Sneak\\Sneak%c.CL2", "Monsters\\Sneak\\Sneak%c%i.WAV", "Monsters\\Sneak\\Sneakv3.TRN", 128, 992, true, false, true, { 16, 8, 12, 8, 24, 15 }, { 2, 0, 0, 0, 0, 0 }, 10, 14, 11, 35, 50, AI_SNEAK, MFLAG_HIDDEN | MFLAG_SEARCH , 2, 45, 8, 12, 20, 0, 0, 0, 0, 30, MC_DEMON, RESIST_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 935 }, + { "Illusion Weaver", "Monsters\\Sneak\\Sneak%c.CL2", "Monsters\\Sneak\\Sneak%c%i.WAV", "Monsters\\Sneak\\Sneakv1.TRN", 128, 992, true, false, true, { 16, 8, 12, 8, 24, 15 }, { 2, 0, 0, 0, 0, 0 }, 14, 18, 13, 40, 60, AI_SNEAK, MFLAG_HIDDEN | MFLAG_SEARCH , 3, 60, 8, 16, 24, 0, 0, 0, 0, 30, MC_DEMON, RESIST_MAGIC | RESIST_FIRE , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , 3, 0, 1500 }, + { "Satyr Lord", "Monsters\\GoatLord\\GoatL%c.CL2", "Monsters\\newsfx\\Satyr%c%i.WAV", NULL, 160, 800, false, false, false, { 13, 13, 14, 9, 16, 0 }, { 2, 0, 0, 0, 0, 0 }, 40, 43, 28, 160, 200, AI_SKELSD, MFLAG_SEARCH , 3, 90, 8, 20, 30, 0, 0, 0, 0, 70, MC_ANIMAL, RESIST_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 3, 0, 2800 }, + { "Flesh Clan", "Monsters\\GoatMace\\Goat%c.CL2", "Monsters\\GoatMace\\Goat%c%i.WAV", NULL, 128, 1030, true, false, false, { 12, 8, 12, 6, 20, 12 }, { 2, 0, 0, 0, 1, 0 }, 6, 10, 8, 30, 45, AI_GOATMC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 0, 50, 8, 4, 10, 0, 0, 0, 0, 40, MC_DEMON, 0 , 0 , 3, 0, 460 }, + { "Stone Clan", "Monsters\\GoatMace\\Goat%c.CL2", "Monsters\\GoatMace\\Goat%c%i.WAV", "Monsters\\GoatMace\\Beige.TRN", 128, 1030, true, false, true, { 12, 8, 12, 6, 20, 12 }, { 2, 0, 0, 0, 1, 0 }, 8, 12, 10, 40, 55, AI_GOATMC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 1, 60, 8, 6, 12, 0, 0, 0, 0, 40, MC_DEMON, RESIST_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 685 }, + { "Fire Clan", "Monsters\\GoatMace\\Goat%c.CL2", "Monsters\\GoatMace\\Goat%c%i.WAV", "Monsters\\GoatMace\\Red.TRN", 128, 1030, true, false, true, { 12, 8, 12, 6, 20, 12 }, { 2, 0, 0, 0, 1, 0 }, 10, 14, 12, 50, 65, AI_GOATMC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 70, 8, 8, 16, 0, 0, 0, 0, 45, MC_DEMON, RESIST_FIRE , IMMUNE_FIRE , 3, 0, 906 }, + { "Night Clan", "Monsters\\GoatMace\\Goat%c.CL2", "Monsters\\GoatMace\\Goat%c%i.WAV", "Monsters\\GoatMace\\Gray.TRN", 128, 1030, true, false, true, { 12, 8, 12, 6, 20, 12 }, { 2, 0, 0, 0, 1, 0 }, 12, 16, 14, 55, 70, AI_GOATMC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 80, 8, 10, 20, 15, 0, 30, 30, 50, MC_DEMON, RESIST_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 1190 }, + { "Fiend", "Monsters\\Bat\\Bat%c.CL2", "Monsters\\Bat\\Bat%c%i.WAV", "Monsters\\Bat\\red.trn", 96, 364, false, false, true, { 9, 13, 10, 9, 13, 0 }, { 0, 0, 0, 0, 0, 0 }, 2, 5, 3, 3, 6, AI_BAT, 0 , 0, 35, 5, 1, 6, 0, 0, 0, 0, 0, MC_ANIMAL, 0 , 0 , 6, 0x4000, 102 }, + { "Blink", "Monsters\\Bat\\Bat%c.CL2", "Monsters\\Bat\\Bat%c%i.WAV", NULL, 96, 364, false, false, false, { 9, 13, 10, 9, 13, 0 }, { 0, 0, 0, 0, 0, 0 }, 5, 9, 7, 12, 28, AI_BAT, 0 , 1, 45, 5, 1, 8, 0, 0, 0, 0, 15, MC_ANIMAL, 0 , 0 , 6, 0x4000, 340 }, + { "Gloom", "Monsters\\Bat\\Bat%c.CL2", "Monsters\\Bat\\Bat%c%i.WAV", "Monsters\\Bat\\grey.trn", 96, 364, false, false, true, { 9, 13, 10, 9, 13, 0 }, { 0, 0, 0, 0, 0, 0 }, 7, 11, 9, 28, 36, AI_BAT, MFLAG_SEARCH , 2, 70, 5, 4, 12, 0, 0, 0, 0, 35, MC_ANIMAL, RESIST_MAGIC , RESIST_MAGIC | IMMUNE_NULL_40 , 6, 0x4000, 509 }, + { "Familiar", "Monsters\\Bat\\Bat%c.CL2", "Monsters\\Bat\\Bat%c%i.WAV", "Monsters\\Bat\\orange.trn", 96, 364, false, false, true, { 9, 13, 10, 9, 13, 0 }, { 0, 0, 0, 0, 0, 0 }, 11, 15, 13, 20, 35, AI_BAT, MFLAG_SEARCH , 3, 50, 5, 4, 16, 0, 0, 0, 0, 35, MC_DEMON, RESIST_MAGIC | IMMUNE_LIGHTNING , RESIST_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 6, 0x4000, 448 }, + { "Flesh Clan", "Monsters\\GoatBow\\GoatB%c.CL2", "Monsters\\GoatBow\\GoatB%c%i.WAV", NULL, 128, 1040, false, false, false, { 12, 8, 16, 6, 20, 0 }, { 3, 0, 0, 0, 0, 0 }, 6, 10, 8, 20, 35, AI_GOATBOW, MFLAG_CAN_OPEN_DOOR, 0, 35, 13, 1, 7, 0, 0, 0, 0, 35, MC_DEMON, 0 , 0 , 3, 0, 448 }, + { "Stone Clan", "Monsters\\GoatBow\\GoatB%c.CL2", "Monsters\\GoatBow\\GoatB%c%i.WAV", "Monsters\\GoatBow\\Beige.TRN", 128, 1040, false, false, true, { 12, 8, 16, 6, 20, 0 }, { 3, 0, 0, 0, 0, 0 }, 8, 12, 10, 30, 40, AI_GOATBOW, MFLAG_CAN_OPEN_DOOR, 1, 40, 13, 2, 9, 0, 0, 0, 0, 35, MC_DEMON, RESIST_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 645 }, + { "Fire Clan", "Monsters\\GoatBow\\GoatB%c.CL2", "Monsters\\GoatBow\\GoatB%c%i.WAV", "Monsters\\GoatBow\\Red.TRN", 128, 1040, false, false, true, { 12, 8, 16, 6, 20, 0 }, { 3, 0, 0, 0, 0, 0 }, 10, 14, 12, 40, 50, AI_GOATBOW, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 45, 13, 3, 11, 0, 0, 0, 0, 35, MC_DEMON, RESIST_FIRE , IMMUNE_FIRE , 3, 0, 822 }, + { "Night Clan", "Monsters\\GoatBow\\GoatB%c.CL2", "Monsters\\GoatBow\\GoatB%c%i.WAV", "Monsters\\GoatBow\\Gray.TRN", 128, 1040, false, false, true, { 12, 8, 16, 6, 20, 0 }, { 3, 0, 0, 0, 0, 0 }, 12, 16, 14, 50, 65, AI_GOATBOW, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 50, 13, 4, 13, 15, 0, 0, 0, 40, MC_DEMON, RESIST_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 3, 0, 1092 }, + { "Acid Beast", "Monsters\\Acid\\Acid%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 128, 716, true, true, false, { 13, 8, 12, 8, 16, 12 }, { 0, 0, 0, 0, 0, 0 }, 10, 14, 11, 40, 66, AI_ACID, 0 , 0, 40, 8, 4, 12, 25, 8, 0, 0, 30, MC_ANIMAL, IMMUNE_ACID , IMMUNE_MAGIC | IMMUNE_ACID , 3, 0, 846 }, + { "Poison Spitter", "Monsters\\Acid\\Acid%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", "Monsters\\Acid\\AcidBlk.TRN", 128, 716, true, true, true, { 13, 8, 12, 8, 16, 12 }, { 0, 0, 0, 0, 0, 0 }, 14, 18, 15, 60, 85, AI_ACID, 0 , 1, 45, 8, 4, 16, 25, 8, 0, 0, 30, MC_ANIMAL, IMMUNE_ACID , IMMUNE_MAGIC | IMMUNE_ACID , 3, 0, 1248 }, + { "Pit Beast", "Monsters\\Acid\\Acid%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", "Monsters\\Acid\\AcidB.TRN", 128, 716, true, true, true, { 13, 8, 12, 8, 16, 12 }, { 0, 0, 0, 0, 0, 0 }, 18, 22, 21, 80, 110, AI_ACID, 0 , 2, 55, 8, 8, 18, 35, 8, 0, 0, 35, MC_ANIMAL, RESIST_MAGIC | IMMUNE_ACID , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_ACID , 3, 0, 2060 }, + { "Lava Maw", "Monsters\\Acid\\Acid%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", "Monsters\\Acid\\AcidR.TRN", 128, 716, true, true, true, { 13, 8, 12, 8, 16, 12 }, { 0, 0, 0, 0, 0, 0 }, 22, 27, 25, 100, 150, AI_ACID, 0 , 3, 65, 8, 10, 20, 40, 8, 0, 0, 35, MC_ANIMAL, RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_ACID , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_ACID , 3, 0, 2940 }, + { "Skeleton King", "Monsters\\SKing\\SKing%c.CL2", "Monsters\\SKing\\SKing%c%i.WAV", "Monsters\\SkelAxe\\White.TRN", 160, 1010, true, true, true, { 8, 6, 16, 6, 16, 6 }, { 2, 0, 0, 0, 0, 2 }, 6, 6, 9, 140, 140, AI_SKELKING, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 60, 8, 6, 16, 0, 0, 0, 0, 70, MC_UNDEAD, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0x8001, 570 }, + { "The Butcher", "Monsters\\FatC\\FatC%c.CL2", "Monsters\\FatC\\FatC%c%i.WAV", NULL, 128, 980, false, false, false, { 10, 8, 12, 6, 16, 0 }, { 1, 0, 0, 0, 0, 0 }, 0, 0, 1, 320, 320, AI_CLEAVER, 0 , 3, 50, 8, 6, 12, 0, 0, 0, 0, 50, MC_DEMON, RESIST_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 3, 0x8000, 710 }, + { "Overlord", "Monsters\\Fat\\Fat%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", NULL, 128, 1130, true, false, false, { 8, 10, 15, 6, 16, 10 }, { 4, 0, 0, 0, 0, 0 }, 8, 12, 10, 60, 80, AI_FAT, 0 , 0, 55, 8, 6, 12, 0, 0, 0, 0, 55, MC_DEMON, 0 , RESIST_FIRE , 3, 0, 635 }, + { "Mud Man", "Monsters\\Fat\\Fat%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", "Monsters\\Fat\\Blue.TRN", 128, 1130, true, false, true, { 8, 10, 15, 6, 16, 10 }, { 4, 0, 0, 0, 0, 0 }, 13, 17, 14, 100, 125, AI_FAT, MFLAG_SEARCH , 1, 60, 8, 8, 16, 0, 0, 0, 0, 60, MC_DEMON, 0 , IMMUNE_LIGHTNING , 3, 0, 1165 }, + { "Toad Demon", "Monsters\\Fat\\Fat%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", "Monsters\\Fat\\FatB.TRN", 128, 1130, true, false, true, { 8, 10, 15, 6, 16, 10 }, { 4, 0, 0, 0, 0, 0 }, 15, 19, 16, 135, 160, AI_FAT, MFLAG_SEARCH , 2, 70, 8, 8, 16, 40, 0, 8, 20, 65, MC_DEMON, IMMUNE_MAGIC , IMMUNE_MAGIC | RESIST_LIGHTNING , 3, 0, 1380 }, + { "Flayed One", "Monsters\\Fat\\Fat%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", "Monsters\\Fat\\FatF.TRN", 128, 1130, true, false, true, { 8, 10, 15, 6, 16, 10 }, { 4, 0, 0, 0, 0, 0 }, 19, 23, 20, 160, 200, AI_FAT, MFLAG_SEARCH , 3, 85, 8, 10, 20, 0, 0, 0, 0, 70, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 3, 0, 2058 }, + { "Wyrm", "Monsters\\Worm\\Worm%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", NULL, 160, 2420, false, false, false, { 13, 13, 13, 11, 19, 0 }, { 0, 0, 0, 0, 0, 0 }, 9, 13, 11, 60, 90, AI_SKELSD, 0 , 0, 40, 8, 4, 10, 0, 0, 0, 0, 25, MC_ANIMAL, RESIST_MAGIC , RESIST_MAGIC , 3, 0, 660 }, + { "Cave Slug", "Monsters\\Worm\\Worm%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", NULL, 160, 2420, false, false, false, { 13, 13, 13, 11, 19, 0 }, { 0, 0, 0, 0, 0, 0 }, 11, 15, 13, 75, 110, AI_SKELSD, 0 , 1, 50, 8, 6, 13, 0, 0, 0, 0, 30, MC_ANIMAL, RESIST_MAGIC , RESIST_MAGIC , 3, 0, 994 }, + { "Devil Wyrm", "Monsters\\Worm\\Worm%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", NULL, 160, 2420, false, false, false, { 13, 13, 13, 11, 19, 0 }, { 0, 0, 0, 0, 0, 0 }, 13, 17, 15, 100, 140, AI_SKELSD, 0 , 2, 55, 8, 8, 16, 0, 0, 0, 0, 30, MC_ANIMAL, RESIST_MAGIC | RESIST_FIRE , RESIST_MAGIC | RESIST_FIRE , 3, 0, 1320 }, + { "Devourer", "Monsters\\Worm\\Worm%c.CL2", "Monsters\\Fat\\Fat%c%i.WAV", NULL, 160, 2420, false, false, false, { 13, 13, 13, 11, 19, 0 }, { 0, 0, 0, 0, 0, 0 }, 15, 19, 17, 125, 200, AI_SKELSD, 0 , 3, 60, 8, 10, 20, 0, 0, 0, 0, 35, MC_ANIMAL, RESIST_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , RESIST_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , 3, 0, 1827 }, + { "Magma Demon", "Monsters\\Magma\\Magma%c.CL2", "Monsters\\Magma\\Magma%c%i.WAV", NULL, 128, 1680, true, true, false, { 8, 10, 14, 7, 18, 18 }, { 2, 0, 0, 0, 1, 0 }, 14, 17, 13, 50, 70, AI_MAGMA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 0, 45, 4, 2, 10, 50, 13, 0, 0, 45, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 1076 }, + { "Blood Stone", "Monsters\\Magma\\Magma%c.CL2", "Monsters\\Magma\\Magma%c%i.WAV", "Monsters\\Magma\\Yellow.TRN", 128, 1680, true, true, true, { 8, 10, 14, 7, 18, 18 }, { 2, 0, 0, 0, 1, 0 }, 15, 19, 14, 55, 75, AI_MAGMA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 1, 50, 4, 2, 12, 50, 14, 0, 0, 45, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 1309 }, + { "Hell Stone", "Monsters\\Magma\\Magma%c.CL2", "Monsters\\Magma\\Magma%c%i.WAV", "Monsters\\Magma\\Blue.TRN", 128, 1680, true, true, true, { 8, 10, 14, 7, 18, 18 }, { 2, 0, 0, 0, 1, 0 }, 16, 20, 16, 60, 80, AI_MAGMA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 60, 4, 2, 20, 60, 14, 0, 0, 50, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 1680 }, + { "Lava Lord", "Monsters\\Magma\\Magma%c.CL2", "Monsters\\Magma\\Magma%c%i.WAV", "Monsters\\Magma\\Wierd.TRN", 128, 1680, true, true, true, { 8, 10, 14, 7, 18, 18 }, { 2, 0, 0, 0, 1, 0 }, 17, 21, 18, 70, 85, AI_MAGMA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 75, 4, 4, 24, 60, 14, 0, 0, 60, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 2124 }, + { "Horned Demon", "Monsters\\Rhino\\Rhino%c.CL2", "Monsters\\Rhino\\Rhino%c%i.WAV", NULL, 160, 1630, true, true, false, { 8, 8, 14, 6, 16, 6 }, { 2, 0, 0, 0, 0, 0 }, 12, 16, 13, 40, 80, AI_RHINO, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 0, 60, 7, 2, 16, 100, 0, 5, 32, 40, MC_ANIMAL, 0 , RESIST_FIRE , 7, 0, 1172 }, + { "Mud Runner", "Monsters\\Rhino\\Rhino%c.CL2", "Monsters\\Rhino\\Rhino%c%i.WAV", "Monsters\\Rhino\\Orange.TRN", 160, 1630, true, true, true, { 8, 8, 14, 6, 16, 6 }, { 2, 0, 0, 0, 0, 0 }, 14, 18, 15, 50, 90, AI_RHINO, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 1, 70, 7, 6, 18, 100, 0, 12, 36, 45, MC_ANIMAL, 0 , RESIST_FIRE , 7, 0, 1404 }, + { "Frost Charger", "Monsters\\Rhino\\Rhino%c.CL2", "Monsters\\Rhino\\Rhino%c%i.WAV", "Monsters\\Rhino\\Blue.TRN", 160, 1630, true, true, true, { 8, 8, 14, 6, 16, 6 }, { 2, 0, 0, 0, 0, 0 }, 16, 20, 17, 60, 100, AI_RHINO, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 80, 7, 8, 20, 100, 0, 20, 40, 50, MC_ANIMAL, IMMUNE_MAGIC | RESIST_LIGHTNING , IMMUNE_MAGIC | RESIST_LIGHTNING , 7, 0, 1720 }, + { "Obsidian Lord", "Monsters\\Rhino\\Rhino%c.CL2", "Monsters\\Rhino\\Rhino%c%i.WAV", "Monsters\\Rhino\\RhinoB.TRN", 160, 1630, true, true, true, { 8, 8, 14, 6, 16, 6 }, { 2, 0, 0, 0, 0, 0 }, 18, 22, 19, 70, 110, AI_RHINO, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 90, 7, 10, 22, 100, 0, 20, 50, 55, MC_ANIMAL, IMMUNE_MAGIC | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 7, 0, 1809 }, + { "oldboned", "Monsters\\Demskel\\Demskl%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 128, 1740, true, true, false, { 10, 8, 20, 6, 24, 16 }, { 3, 0, 0, 0, 0, 0 }, 46, 47, 12, 70, 70, AI_STORM, 0 , 0, 60, 8, 6, 14, 12, 0, 0, 0, 50, MC_DEMON, IMMUNE_MAGIC | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_NULL_40 , 7, 0, 1344 }, + { "Red Death", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 160, 1740, true, true, true, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 14, 18, 16, 96, 96, AI_STORM, 0 , 1, 75, 5, 10, 20, 0, 0, 0, 0, 60, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 2168 }, + { "Litch Demon", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 160, 1740, true, true, true, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 16, 20, 18, 110, 110, AI_STORM, 0 , 2, 80, 5, 10, 24, 0, 0, 0, 0, 45, MC_DEMON, IMMUNE_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 2736 }, + { "Undead Balrog", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 160, 1740, true, true, true, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 20, 24, 22, 130, 130, AI_STORM, 0 , 3, 85, 5, 12, 30, 0, 0, 0, 0, 65, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3575 }, + { "Incinerator", "Monsters\\Fireman\\FireM%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 128, 1460, true, false, false, { 14, 19, 20, 8, 14, 23 }, { 0, 0, 0, 0, 0, 0 }, 40, 43, 16, 30, 45, AI_FIREMAN, 0 , 0, 75, 8, 8, 16, 0, 0, 0, 0, 25, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 3, 0, 1888 }, + { "Flame Lord", "Monsters\\Fireman\\FireM%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 128, 1460, true, false, false, { 14, 19, 20, 8, 14, 23 }, { 0, 0, 0, 0, 0, 0 }, 42, 45, 18, 40, 55, AI_FIREMAN, 0 , 1, 75, 8, 10, 20, 0, 0, 0, 0, 25, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 3, 0, 2250 }, + { "Doom Fire", "Monsters\\Fireman\\FireM%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 128, 1460, true, false, false, { 14, 19, 20, 8, 14, 23 }, { 0, 0, 0, 0, 0, 0 }, 44, 47, 20, 50, 65, AI_FIREMAN, 0 , 2, 80, 8, 12, 24, 0, 0, 0, 0, 30, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 3, 0, 2740 }, + { "Hell Burner", "Monsters\\Fireman\\FireM%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 128, 1460, true, false, false, { 14, 19, 20, 8, 14, 23 }, { 0, 0, 0, 0, 0, 0 }, 46, 47, 22, 60, 80, AI_FIREMAN, 0 , 3, 85, 8, 15, 30, 0, 0, 0, 0, 30, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 3, 0, 3355 }, + { "Red Storm", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 160, 1740, true, true, true, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 17, 21, 18, 55, 110, AI_STORM, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 0, 80, 5, 8, 18, 75, 8, 4, 16, 30, MC_DEMON, IMMUNE_MAGIC | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_LIGHTNING , 7, 0, 2160 }, + { "Storm Rider", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", NULL, 160, 1740, true, true, false, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 19, 23, 20, 60, 120, AI_STORM, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 1, 80, 5, 8, 18, 80, 8, 4, 16, 30, MC_DEMON, RESIST_MAGIC | IMMUNE_LIGHTNING , IMMUNE_MAGIC | IMMUNE_LIGHTNING , 7, 0, 2391 }, + { "Storm Lord", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv2.TRN", 160, 1740, true, true, true, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 21, 25, 22, 75, 135, AI_STORM, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 85, 5, 12, 24, 75, 8, 4, 16, 35, MC_DEMON, RESIST_MAGIC | IMMUNE_LIGHTNING , IMMUNE_MAGIC | IMMUNE_LIGHTNING , 7, 0, 2775 }, + { "Maelstorm", "Monsters\\Thin\\Thin%c.CL2", "Monsters\\Thin\\Thin%c%i.WAV", "Monsters\\Thin\\Thinv1.TRN", 160, 1740, true, true, true, { 8, 8, 18, 4, 17, 14 }, { 3, 0, 0, 0, 0, 0 }, 23, 27, 24, 90, 150, AI_STORM, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 90, 5, 12, 28, 75, 8, 4, 16, 40, MC_DEMON, RESIST_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3177 }, + { "Devil Kin Brute", "Monsters\\BigFall\\Fallg%c.CL2", "Monsters\\newsfx\\KBrute%c%i.WAV", NULL, 128, 800, true, false, false, { 10, 8, 11, 8, 17, 0 }, { 0, 0, 0, 0, 2, 2 }, 40, 43, 27, 120, 160, AI_SKELSD, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 100, 6, 18, 24, 0, 0, 0, 0, 70, MC_ANIMAL, RESIST_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , 3, 0, 2400 }, + { "Winged-Demon", "Monsters\\Gargoyle\\Gargo%c.CL2", "Monsters\\Gargoyle\\Gargo%c%i.WAV", NULL, 160, 1650, true, false, false, { 14, 14, 14, 10, 18, 14 }, { 0, 0, 0, 0, 0, 2 }, 8, 12, 9, 45, 60, AI_GARG, MFLAG_CAN_OPEN_DOOR, 0, 50, 7, 10, 16, 0, 0, 0, 0, 45, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , 6, 0, 662 }, + { "Gargoyle", "Monsters\\Gargoyle\\Gargo%c.CL2", "Monsters\\Gargoyle\\Gargo%c%i.WAV", "Monsters\\Gargoyle\\GarE.TRN", 160, 1650, true, false, true, { 14, 14, 14, 10, 18, 14 }, { 0, 0, 0, 0, 0, 2 }, 12, 16, 13, 60, 90, AI_GARG, MFLAG_CAN_OPEN_DOOR, 1, 65, 7, 10, 16, 0, 0, 0, 0, 45, MC_DEMON, IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 6, 0, 1205 }, + { "Blood Claw", "Monsters\\Gargoyle\\Gargo%c.CL2", "Monsters\\Gargoyle\\Gargo%c%i.WAV", "Monsters\\Gargoyle\\GargBr.TRN", 160, 1650, true, false, true, { 14, 14, 14, 10, 18, 14 }, { 0, 0, 0, 0, 0, 0 }, 16, 20, 19, 75, 125, AI_GARG, MFLAG_CAN_OPEN_DOOR, 2, 80, 7, 14, 22, 0, 0, 0, 0, 50, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 6, 0, 1873 }, + { "Death Wing", "Monsters\\Gargoyle\\Gargo%c.CL2", "Monsters\\Gargoyle\\Gargo%c%i.WAV", "Monsters\\Gargoyle\\GargB.TRN", 160, 1650, true, false, true, { 14, 14, 14, 10, 18, 14 }, { 0, 0, 0, 0, 0, 0 }, 18, 22, 23, 90, 150, AI_GARG, MFLAG_CAN_OPEN_DOOR, 3, 95, 7, 16, 28, 0, 0, 0, 0, 60, MC_DEMON, IMMUNE_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 6, 0, 2278 }, + { "Slayer", "Monsters\\Mega\\Mega%c.CL2", "Monsters\\Mega\\Mega%c%i.WAV", NULL, 160, 2220, true, true, false, { 6, 7, 14, 1, 24, 5 }, { 3, 0, 0, 0, 2, 0 }, 19, 23, 20, 120, 140, AI_MEGA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 0, 100, 8, 12, 20, 0, 3, 0, 0, 60, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE , RESIST_MAGIC | IMMUNE_FIRE , 7, 0, 2300 }, + { "Guardian", "Monsters\\Mega\\Mega%c.CL2", "Monsters\\Mega\\Mega%c%i.WAV", "Monsters\\Mega\\Guard.TRN", 160, 2220, true, true, true, { 6, 7, 14, 1, 24, 5 }, { 3, 0, 0, 0, 2, 0 }, 21, 25, 22, 140, 160, AI_MEGA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 1, 110, 8, 14, 22, 0, 3, 0, 0, 65, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE , RESIST_MAGIC | IMMUNE_FIRE , 7, 0, 2714 }, + { "Vortex Lord", "Monsters\\Mega\\Mega%c.CL2", "Monsters\\Mega\\Mega%c%i.WAV", "Monsters\\Mega\\Vtexl.TRN", 160, 2220, true, true, true, { 6, 7, 14, 1, 24, 5 }, { 3, 0, 0, 0, 2, 0 }, 23, 26, 24, 160, 180, AI_MEGA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 120, 8, 18, 24, 0, 3, 0, 0, 70, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3252 }, + { "Balrog", "Monsters\\Mega\\Mega%c.CL2", "Monsters\\Mega\\Mega%c%i.WAV", "Monsters\\Mega\\Balr.TRN", 160, 2220, true, true, true, { 6, 7, 14, 1, 24, 5 }, { 3, 0, 0, 0, 2, 0 }, 25, 29, 26, 180, 200, AI_MEGA, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 130, 8, 22, 30, 0, 3, 0, 0, 75, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3643 }, + { "Cave Viper", "Monsters\\Snake\\Snake%c.CL2", "Monsters\\Snake\\Snake%c%i.WAV", NULL, 160, 1270, false, false, false, { 12, 11, 13, 5, 18, 0 }, { 2, 0, 0, 0, 1, 0 }, 20, 24, 21, 100, 150, AI_SNAKE, MFLAG_SEARCH , 0, 90, 8, 8, 20, 0, 0, 0, 0, 60, MC_DEMON, IMMUNE_MAGIC , IMMUNE_MAGIC , 7, 0, 2725 }, + { "Fire Drake", "Monsters\\Snake\\Snake%c.CL2", "Monsters\\Snake\\Snake%c%i.WAV", "Monsters\\Snake\\SnakR.TRN", 160, 1270, false, false, true, { 12, 11, 13, 5, 18, 0 }, { 2, 0, 0, 0, 1, 0 }, 22, 26, 23, 120, 170, AI_SNAKE, MFLAG_SEARCH , 1, 105, 8, 12, 24, 0, 0, 0, 0, 65, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE , IMMUNE_MAGIC | IMMUNE_FIRE , 7, 0, 3139 }, + { "Gold Viper", "Monsters\\Snake\\Snake%c.CL2", "Monsters\\Snake\\Snake%c%i.WAV", "Monsters\\Snake\\Snakg.TRN", 160, 1270, false, false, true, { 12, 11, 13, 5, 18, 0 }, { 2, 0, 0, 0, 1, 0 }, 24, 27, 25, 140, 180, AI_SNAKE, MFLAG_SEARCH , 2, 120, 8, 15, 26, 0, 0, 0, 0, 70, MC_DEMON, IMMUNE_MAGIC | RESIST_LIGHTNING , IMMUNE_MAGIC | RESIST_LIGHTNING , 7, 0, 3540 }, + { "Azure Drake", "Monsters\\Snake\\Snake%c.CL2", "Monsters\\Snake\\Snake%c%i.WAV", "Monsters\\Snake\\Snakb.TRN", 160, 1270, false, false, true, { 12, 11, 13, 5, 18, 0 }, { 2, 0, 0, 0, 1, 0 }, 28, 30, 27, 160, 200, AI_SNAKE, MFLAG_SEARCH , 3, 130, 8, 18, 30, 0, 0, 0, 0, 75, MC_DEMON, RESIST_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING , 7, 0, 3791 }, + { "Black Knight", "Monsters\\Black\\Black%c.CL2", "Monsters\\Black\\Black%c%i.WAV", NULL, 160, 2120, false, false, false, { 8, 8, 16, 4, 24, 0 }, { 2, 0, 0, 0, 0, 0 }, 23, 27, 24, 150, 150, AI_SKELSD, MFLAG_SEARCH , 0, 110, 8, 15, 20, 0, 0, 0, 0, 75, MC_DEMON, RESIST_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , RESIST_MAGIC | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3360 }, + { "Doom Guard", "Monsters\\Black\\Black%c.CL2", "Monsters\\Black\\Black%c%i.WAV", "Monsters\\Black\\BlkKntRT.TRN", 160, 2120, false, false, true, { 8, 8, 16, 4, 24, 0 }, { 2, 0, 0, 0, 0, 0 }, 25, 29, 26, 165, 165, AI_SKELSD, MFLAG_SEARCH , 0, 130, 8, 18, 25, 0, 0, 0, 0, 75, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | IMMUNE_NULL_40 , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_NULL_40 , 7, 0, 3650 }, + { "Steel Lord", "Monsters\\Black\\Black%c.CL2", "Monsters\\Black\\Black%c%i.WAV", "Monsters\\Black\\BlkKntBT.TRN", 160, 2120, false, false, true, { 8, 8, 16, 4, 24, 0 }, { 2, 0, 0, 0, 0, 0 }, 27, 30, 28, 180, 180, AI_SKELSD, MFLAG_SEARCH , 1, 120, 8, 20, 30, 0, 0, 0, 0, 80, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 4252 }, + { "Blood Knight", "Monsters\\Black\\Black%c.CL2", "Monsters\\Black\\Black%c%i.WAV", "Monsters\\Black\\BlkKntBe.TRN", 160, 2120, false, false, true, { 8, 8, 16, 4, 24, 0 }, { 2, 0, 0, 0, 0, 0 }, 24, 26, 30, 200, 200, AI_SKELSD, MFLAG_SEARCH , 1, 130, 8, 25, 35, 0, 0, 0, 0, 85, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 5130 }, + { "The Shredded", "Monsters\\Unrav\\Unrav%c.CL2", "Monsters\\newsfx\\Shred%c%i.WAV", NULL, 96, 484, false, false, false, { 10, 10, 12, 5, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 32, 35, 23, 70, 90, AI_SKELSD, 0 , 0, 75, 7, 4, 12, 0, 0, 0, 0, 65, MC_UNDEAD, RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 900 }, + { "Hollow One", "Monsters\\Unrav\\Unrav%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 96, 484, false, false, false, { 10, 10, 12, 5, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 34, 37, 27, 135, 240, AI_SKELSD, 0 , 1, 75, 7, 12, 24, 0, 0, 0, 0, 75, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 4374 }, + { "Pain Master", "Monsters\\Unrav\\Unrav%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 96, 484, false, false, false, { 10, 10, 12, 5, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 36, 39, 29, 110, 200, AI_SKELSD, 0 , 2, 80, 7, 16, 30, 0, 0, 0, 0, 80, MC_UNDEAD, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 5147 }, + { "Reality Weaver", "Monsters\\Unrav\\Unrav%c.CL2", "Monsters\\Acid\\Acid%c%i.WAV", NULL, 96, 484, false, false, false, { 10, 10, 12, 5, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 38, 39, 30, 135, 240, AI_SKELSD, 0 , 3, 85, 7, 20, 35, 0, 0, 0, 0, 85, MC_UNDEAD, RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 5925 }, + { "Succubus", "Monsters\\Succ\\Scbs%c.CL2", "Monsters\\Succ\\Scbs%c%i.WAV", NULL, 128, 980, false, false, false, { 14, 8, 16, 7, 24, 0 }, { 0, 0, 0, 0, 0, 0 }, 22, 26, 24, 120, 150, AI_SUCC, MFLAG_CAN_OPEN_DOOR, 0, 100, 10, 1, 20, 0, 0, 0, 0, 60, MC_DEMON, RESIST_MAGIC , IMMUNE_MAGIC | RESIST_FIRE , 3, 0, 3696 }, + { "Snow Witch", "Monsters\\Succ\\Scbs%c.CL2", "Monsters\\Succ\\Scbs%c%i.WAV", "Monsters\\Succ\\Succb.TRN", 128, 980, false, false, true, { 14, 8, 16, 7, 24, 0 }, { 0, 0, 0, 0, 0, 0 }, 25, 28, 26, 135, 175, AI_SUCC, MFLAG_CAN_OPEN_DOOR, 1, 110, 10, 1, 24, 0, 0, 0, 0, 65, MC_DEMON, RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 4084 }, + { "Hell Spawn", "Monsters\\Succ\\Scbs%c.CL2", "Monsters\\Succ\\Scbs%c%i.WAV", "Monsters\\Succ\\Succrw.TRN", 128, 980, false, false, true, { 14, 8, 16, 7, 24, 0 }, { 0, 0, 0, 0, 0, 0 }, 27, 30, 28, 150, 200, AI_SUCC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 2, 115, 10, 1, 30, 0, 0, 0, 0, 75, MC_DEMON, RESIST_MAGIC | IMMUNE_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 3, 0, 4480 }, + { "Soul Burner", "Monsters\\Succ\\Scbs%c.CL2", "Monsters\\Succ\\Scbs%c%i.WAV", "Monsters\\Succ\\Succbw.TRN", 128, 980, false, false, true, { 14, 8, 16, 7, 24, 0 }, { 0, 0, 0, 0, 0, 0 }, 28, 30, 30, 140, 225, AI_SUCC, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 120, 10, 1, 35, 0, 0, 0, 0, 85, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 3, 0, 4644 }, + { "Counselor", "Monsters\\Mage\\Mage%c.CL2", "Monsters\\Mage\\Mage%c%i.WAV", NULL, 128, 2000, true, false, false, { 12, 1, 20, 8, 28, 20 }, { 0, 0, 0, 0, 0, 0 }, 24, 26, 25, 70, 70, AI_COUNSLR, MFLAG_CAN_OPEN_DOOR, 0, 90, 8, 8, 20, 0, 0, 0, 0, 0, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , 7, 0, 4070 }, + { "Magistrate", "Monsters\\Mage\\Mage%c.CL2", "Monsters\\Mage\\Mage%c%i.WAV", "Monsters\\Mage\\Cnselg.TRN", 128, 2000, true, false, true, { 12, 1, 20, 8, 28, 20 }, { 0, 0, 0, 0, 0, 0 }, 26, 28, 27, 85, 85, AI_COUNSLR, MFLAG_CAN_OPEN_DOOR, 1, 100, 8, 10, 24, 0, 0, 0, 0, 0, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 4478 }, + { "Cabalist", "Monsters\\Mage\\Mage%c.CL2", "Monsters\\Mage\\Mage%c%i.WAV", "Monsters\\Mage\\Cnselgd.TRN", 128, 2000, true, false, true, { 12, 1, 20, 8, 28, 20 }, { 0, 0, 0, 0, 0, 0 }, 28, 30, 29, 120, 120, AI_COUNSLR, MFLAG_CAN_OPEN_DOOR, 2, 110, 8, 14, 30, 0, 0, 0, 0, 0, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 4929 }, + { "Advocate", "Monsters\\Mage\\Mage%c.CL2", "Monsters\\Mage\\Mage%c%i.WAV", "Monsters\\Mage\\Cnselbk.TRN", 128, 2000, true, false, true, { 12, 1, 20, 8, 28, 20 }, { 0, 0, 0, 0, 0, 0 }, 30, 30, 30, 145, 145, AI_COUNSLR, MFLAG_CAN_OPEN_DOOR, 3, 120, 8, 15, 25, 0, 0, 0, 0, 0, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 4968 }, + { "Golem", "Monsters\\Golem\\Golem%c.CL2", "Monsters\\Golem\\Golm%c%i.WAV", NULL, 96, 386, true, false, false, { 0, 16, 12, 0, 12, 20 }, { 0, 0, 0, 0, 0, 0 }, 0, 0, 12, 1, 1, AI_GOLUM, MFLAG_CAN_OPEN_DOOR, 0, 0, 7, 1, 1, 0, 0, 0, 0, 1, MC_DEMON, 0 , 0 , 0, 0, 0 }, + { "The Dark Lord", "Monsters\\Diablo\\Diablo%c.CL2", "Monsters\\Diablo\\Diablo%c%i.WAV", NULL, 160, 2000, true, true, false, { 16, 6, 16, 6, 16, 16 }, { 0, 0, 0, 0, 0, 0 }, 50, 50, 45, 3333, 3333, AI_DIABLO, MFLAG_KNOCKBACK | MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 220, 4, 30, 60, 0, 11, 0, 0, 90, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 31666 }, + { "The Arch-Litch Malignus", "Monsters\\DarkMage\\Dmage%c.CL2", "Monsters\\DarkMage\\Dmag%c%i.WAV", NULL, 128, 1060, true, false, false, { 6, 1, 21, 6, 23, 18 }, { 0, 0, 0, 0, 0, 0 }, 40, 41, 30, 160, 160, AI_COUNSLR, MFLAG_CAN_OPEN_DOOR, 3, 120, 8, 20, 40, 0, 0, 0, 0, 70, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 4968 }, + { "Hellboar", "Monsters\\Fork\\Fork%c.CL2", "Monsters\\newsfx\\HBoar%c%i.WAV", NULL, 188, 800, false, false, false, { 10, 10, 15, 6, 16, 0 }, { 2, 0, 0, 0, 0, 0 }, 32, 35, 23, 80, 100, AI_SKELSD, MFLAG_KNOCKBACK | MFLAG_SEARCH , 2, 70, 7, 16, 24, 0, 0, 0, 0, 60, MC_DEMON, 0 , RESIST_FIRE | RESIST_LIGHTNING , 3, 0, 750 }, + { "Stinger", "Monsters\\Scorp\\Scorp%c.CL2", "Monsters\\newsfx\\Stingr%c%i.WAV", NULL, 64, 305, false, false, false, { 10, 10, 12, 6, 15, 0 }, { 2, 0, 0, 0, 0, 0 }, 32, 35, 22, 30, 40, AI_SKELSD, 0 , 3, 85, 8, 1, 20, 0, 0, 0, 0, 50, MC_ANIMAL, 0 , RESIST_LIGHTNING , 1, 0, 500 }, + { "Psychorb", "Monsters\\Eye\\Eye%c.CL2", "Monsters\\newsfx\\psyco%c%i.WAV", NULL, 156, 800, false, false, false, { 12, 13, 13, 7, 21, 0 }, { 2, 0, 0, 0, 0, 0 }, 32, 35, 22, 20, 30, AI_PSYCHORB, 0 , 3, 80, 8, 10, 10, 0, 0, 0, 0, 40, MC_ANIMAL, 0 , RESIST_FIRE , 6, 0, 450 }, + { "Arachnon", "Monsters\\Spider\\Spider%c.CL2", "Monsters\\newsfx\\SLord%c%i.WAV", NULL, 148, 800, false, false, false, { 12, 10, 15, 6, 20, 0 }, { 2, 0, 0, 0, 0, 0 }, 32, 35, 22, 60, 80, AI_SKELSD, MFLAG_SEARCH , 3, 50, 8, 5, 15, 0, 0, 0, 0, 50, MC_ANIMAL, 0 , RESIST_LIGHTNING , 7, 0, 500 }, + { "Felltwin", "Monsters\\TSneak\\TSneak%c.CL2", "Monsters\\newsfx\\FTwin%c%i.WAV", NULL, 128, 800, false, false, false, { 13, 13, 15, 11, 16, 0 }, { 2, 0, 0, 0, 0, 0 }, 32, 35, 22, 50, 70, AI_SKELSD, MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 70, 8, 10, 18, 0, 0, 0, 0, 50, MC_DEMON, IMMUNE_NULL_40 , RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 600 }, + { "Hork Spawn", "Monsters\\Spawn\\Spawn%c.CL2", "Monsters\\newsfx\\HSpawn%c%i.WAV", NULL, 164, 520, false, true, false, { 15, 12, 14, 11, 14, 0 }, { 0, 0, 0, 0, 0, 0 }, 34, 37, 22, 30, 30, AI_SKELSD, 0 , 3, 60, 8, 10, 25, 0, 0, 0, 0, 25, MC_DEMON, RESIST_MAGIC , RESIST_MAGIC , 3, 0, 250 }, + { "Venomtail", "Monsters\\WScorp\\WScorp%c.CL2", "Monsters\\newsfx\\Stingr%c%i.WAV", NULL, 86, 305, false, false, false, { 10, 10, 12, 6, 15, 0 }, { 2, 0, 0, 0, 0, 0 }, 36, 39, 24, 40, 50, AI_SKELSD, 0 , 3, 85, 8, 1, 30, 0, 0, 0, 0, 60, MC_ANIMAL, RESIST_LIGHTNING , IMMUNE_LIGHTNING , 1, 0, 1000 }, + { "Necromorb", "Monsters\\Eye2\\Eye2%c.CL2", "Monsters\\newsfx\\Psyco%c%i.WAV", NULL, 140, 800, false, false, false, { 12, 13, 13, 7, 21, 0 }, { 2, 0, 0, 0, 0, 0 }, 36, 39, 24, 30, 40, AI_NECROMORB, 0 , 3, 80, 8, 20, 20, 0, 0, 0, 0, 50, MC_ANIMAL, RESIST_FIRE , IMMUNE_FIRE | RESIST_LIGHTNING , 6, 0, 1100 }, + { "Spider Lord", "Monsters\\bSpidr\\bSpidr%c.CL2", "Monsters\\newsfx\\SLord%c%i.WAV", NULL, 148, 800, true, true, false, { 12, 10, 15, 6, 20, 10 }, { 2, 0, 0, 0, 0, 0 }, 36, 39, 24, 80, 100, AI_ACID, MFLAG_SEARCH , 3, 60, 8, 8, 20, 75, 8, 10, 10, 60, MC_ANIMAL, RESIST_LIGHTNING , RESIST_FIRE | IMMUNE_LIGHTNING , 7, 0, 1250 }, + { "Lashworm", "Monsters\\Clasp\\Clasp%c.CL2", "Monsters\\newsfx\\Lworm%c%i.WAV", NULL, 176, 800, false, false, false, { 10, 12, 15, 6, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 36, 39, 20, 30, 30, AI_SKELSD, 0 , 3, 90, 8, 12, 20, 0, 0, 0, 0, 50, MC_ANIMAL, 0 , RESIST_FIRE , 3, 0, 600 }, + { "Torchant", "Monsters\\AntWorm\\Worm%c.CL2", "Monsters\\newsfx\\TchAnt%c%i.WAV", NULL, 192, 800, false, false, false, { 14, 12, 12, 6, 20, 0 }, { 2, 0, 0, 0, 0, 0 }, 36, 39, 22, 60, 80, AI_TORCHANT, 0 , 3, 75, 8, 20, 30, 0, 0, 0, 0, 70, MC_ANIMAL, IMMUNE_FIRE , RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 7, 0, 1250 }, + { "Hork Demon", "Monsters\\HorkD\\HorkD%c.CL2", "Monsters\\newsfx\\HDemon%c%i.WAV", NULL, 138, 800, true, true, false, { 15, 8, 16, 6, 16, 9 }, { 2, 0, 0, 0, 0, 2 }, 36, 37, 27, 120, 160, AI_SKELSD, 0 , 3, 60, 8, 20, 35, 80, 8, 0, 0, 80, MC_DEMON, RESIST_LIGHTNING , RESIST_MAGIC | IMMUNE_LIGHTNING , 7, 0, 2000 }, + { "Hell Bug", "Monsters\\Hellbug\\Hellbg%c.CL2", "Monsters\\newsfx\\Defile%c%i.WAV", NULL, 198, 800, true, true, false, { 8, 8, 14, 6, 14, 12 }, { 0, 0, 0, 0, 0, 0 }, 38, 39, 30, 240, 240, AI_SKELSD, MFLAG_SEARCH , 3, 110, 8, 20, 30, 90, 8, 50, 60, 80, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 7, 0, 5000 }, + { "Gravedigger", "Monsters\\Gravdg\\Gravdg%c.CL2", "Monsters\\newsfx\\GDiggr%c%i.WAV", NULL, 124, 800, true, true, false, { 24, 24, 12, 6, 16, 16 }, { 2, 0, 0, 0, 0, 0 }, 40, 41, 26, 120, 240, AI_SCAV, MFLAG_CAN_OPEN_DOOR, 3, 80, 6, 2, 12, 0, 0, 0, 0, 20, MC_UNDEAD, IMMUNE_LIGHTNING | IMMUNE_NULL_40 , RESIST_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 2000 }, + { "Tomb Rat", "Monsters\\Rat\\Rat%c.CL2", "Monsters\\newsfx\\TmbRat%c%i.WAV", NULL, 104, 550, false, false, false, { 11, 8, 12, 6, 20, 0 }, { 2, 0, 0, 0, 0, 0 }, 40, 43, 24, 80, 120, AI_SKELSD, 0 , 3, 120, 8, 12, 25, 0, 0, 0, 0, 30, MC_ANIMAL, 0 , RESIST_FIRE | RESIST_LIGHTNING , 3, 0, 1800 }, + { "Firebat", "Monsters\\Hellbat\\Helbat%c.CL2", "Monsters\\newsfx\\HelBat%c%i.WAV", NULL, 96, 550, false, false, false, { 18, 16, 14, 6, 18, 11 }, { 2, 0, 0, 0, 0, 0 }, 40, 43, 24, 60, 80, AI_FIREBAT, 0 , 3, 100, 8, 15, 20, 0, 0, 0, 0, 70, MC_ANIMAL, IMMUNE_FIRE , RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 7, 0, 2400 }, + { "Skullwing", "Monsters\\Demskel\\Demskl%c.CL2", "Monsters\\newsfx\\SWing%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 128, 1740, true, false, false, { 10, 8, 20, 6, 24, 16 }, { 3, 0, 0, 0, 0, 0 }, 40, 43, 27, 70, 70, AI_SKELSD, 0 , 0, 75, 7, 15, 20, 75, 9, 15, 20, 80, MC_UNDEAD, RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 3000 }, + { "Lich", "Monsters\\Lich\\Lich%c.CL2", "Monsters\\newsfx\\Lich%c%i.WAV", NULL, 96, 800, false, true, false, { 12, 10, 10, 7, 21, 0 }, { 2, 0, 0, 0, 2, 0 }, 40, 43, 25, 80, 100, AI_LICH, 0 , 3, 100, 8, 15, 20, 0, 0, 0, 0, 60, MC_UNDEAD, RESIST_LIGHTNING | IMMUNE_NULL_40 , RESIST_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 3000 }, + { "Crypt Demon", "Monsters\\Bubba\\Bubba%c.CL2", "Monsters\\newsfx\\Crypt%c%i.WAV", NULL, 154, 800, false, true, false, { 8, 18, 12, 8, 21, 0 }, { 3, 0, 0, 0, 0, 0 }, 42, 45, 28, 200, 240, AI_SKELSD, 0 , 3, 100, 8, 20, 40, 0, 0, 0, 0, 85, MC_DEMON, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , 3, 0, 3200 }, + { "Hellbat", "Monsters\\Hellbat2\\bhelbt%c.CL2", "Monsters\\newsfx\\HelBat%c%i.WAV", NULL, 96, 550, true, false, false, { 18, 16, 14, 6, 18, 11 }, { 2, 0, 0, 0, 0, 0 }, 44, 47, 29, 100, 140, AI_TORCHANT, 0 , 3, 110, 8, 30, 30, 0, 0, 0, 0, 80, MC_DEMON, RESIST_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 7, 0, 3600 }, + { "Bone Demon", "Monsters\\Demskel\\Demskl%c.CL2", "Monsters\\newsfx\\SWing%c%i.WAV", "Monsters\\Thin\\Thinv3.TRN", 128, 1740, true, true, false, { 10, 8, 20, 6, 24, 16 }, { 3, 0, 0, 0, 0, 0 }, 44, 47, 30, 240, 280, AI_BONEDEMON, 0 , 0, 100, 8, 40, 50, 160, 12, 50, 50, 50, MC_UNDEAD, IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 5000 }, + { "Arch Lich", "Monsters\\Lich2\\Lich2%c.CL2", "Monsters\\newsfx\\Lich%c%i.WAV", NULL, 136, 800, false, true, false, { 12, 10, 10, 7, 21, 0 }, { 2, 0, 0, 0, 2, 0 }, 44, 47, 30, 180, 200, AI_ARCHLICH, 0 , 3, 120, 8, 30, 30, 0, 0, 0, 0, 75, MC_UNDEAD, RESIST_MAGIC | RESIST_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 3, 0, 4000 }, + { "Biclops", "Monsters\\Byclps\\Byclps%c.CL2", "Monsters\\newsfx\\Biclop%c%i.WAV", NULL, 180, 800, false, false, false, { 10, 11, 16, 6, 16, 0 }, { 2, 0, 0, 0, 2, 0 }, 44, 47, 30, 200, 240, AI_SKELSD, MFLAG_KNOCKBACK | MFLAG_CAN_OPEN_DOOR, 3, 90, 8, 40, 50, 0, 0, 0, 0, 80, MC_DEMON, RESIST_LIGHTNING , RESIST_FIRE | RESIST_LIGHTNING , 3, 0, 4000 }, + { "Flesh Thing", "Monsters\\Flesh\\Flesh%c.CL2", "Monsters\\newsfx\\FleshT%c%i.WAV", NULL, 164, 800, false, true, false, { 15, 24, 15, 6, 16, 0 }, { 0, 0, 0, 0, 0, 0 }, 44, 47, 28, 300, 400, AI_SKELSD, 0 , 3, 150, 8, 12, 18, 0, 0, 0, 0, 70, MC_DEMON, RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , 3, 0, 4000 }, + { "Reaper", "Monsters\\Reaper\\Reap%c.CL2", "Monsters\\newsfx\\Reaper%c%i.WAV", NULL, 180, 800, false, false, false, { 12, 10, 14, 6, 16, 0 }, { 2, 0, 0, 0, 0, 0 }, 44, 47, 30, 260, 300, AI_SKELSD, 0 , 3, 120, 8, 30, 35, 0, 0, 0, 0, 90, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING , 3, 0, 6000 }, + { "Na-Krul", "Monsters\\Nkr\\Nkr%c.CL2", "Monsters\\newsfx\\Nakrul%c%i.WAV", NULL, 226, 1200, true, true, false, { 2, 6, 16, 3, 16, 16 }, { 0, 0, 0, 0, 0, 0 }, 60, 60, 40, 1332, 1332, AI_SKELSD, MFLAG_KNOCKBACK | MFLAG_SEARCH | MFLAG_CAN_OPEN_DOOR, 3, 150, 7, 40, 50, 150, 10, 40, 50, 125, MC_DEMON, IMMUNE_MAGIC | IMMUNE_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40 , IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING | IMMUNE_NULL_40 , 7, 0, 13333 }, // clang-format on }; diff --git a/Source/monster.cpp b/Source/monster.cpp index ae9f2799..f52a0ac3 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -167,7 +167,7 @@ void InitLevelMonsters() int AddMonsterType(_monster_id type, int placeflag) { - bool done = FALSE; + bool done = false; int i; for (i = 0; i < nummtypes && !done; i++) { @@ -494,7 +494,7 @@ void InitMonster(int i, int rd, int mtype, int x, int y) monster[i]._mgoalvar2 = 0; monster[i]._mgoalvar3 = 0; monster[i]._pathcount = 0; - monster[i]._mDelFlag = FALSE; + monster[i]._mDelFlag = false; monster[i]._uniqtype = 0; monster[i]._msquelch = 0; monster[i].mlid = NO_LIGHT; // BUGFIX monsters initial light id should be -1 (fixed) @@ -586,7 +586,7 @@ void ClrAllMonsters() Monst->_mAnimLen = 0; Monst->_mAnimFrame = 0; Monst->_mFlags = 0; - Monst->_mDelFlag = FALSE; + Monst->_mDelFlag = false; Monst->_menemy = random_(89, gbActivePlayers); Monst->_menemyx = plr[Monst->_menemy]._pfutx; Monst->_menemyy = plr[Monst->_menemy]._pfuty; @@ -601,17 +601,17 @@ bool MonstPlace(int xp, int yp) || yp < 0 || yp >= MAXDUNY || dMonster[xp][yp] != 0 || dPlayer[xp][yp] != 0) { - return FALSE; + return false; } f = dFlags[xp][yp]; if (f & BFLAG_VISIBLE) { - return FALSE; + return false; } if (f & BFLAG_POPULATED) { - return FALSE; + return false; } return !SolidLoc(xp, yp); @@ -712,10 +712,10 @@ void PlaceUniqueMonst(int uniqindex, int miniontype, int bosspacksize) yp = 2 * setpc_y + 23; } if (uniqindex == UMT_ZHAR) { - zharflag = TRUE; + zharflag = true; for (i = 0; i < themeCount; i++) { - if (i == zharlib && zharflag == TRUE) { - zharflag = FALSE; + if (i == zharlib && zharflag == true) { + zharflag = false; xp = 2 * themeLoc[i].x + 20; yp = 2 * themeLoc[i].y + 20; } @@ -753,7 +753,7 @@ void PlaceUniqueMonst(int uniqindex, int miniontype, int bosspacksize) } } if (uniqindex == UMT_BUTCHER) { - done = FALSE; + done = false; for (yp = 0; yp < MAXDUNY && !done; yp++) { for (xp = 0; xp < MAXDUNX && !done; xp++) { done = dPiece[xp][yp] == 367; @@ -893,7 +893,7 @@ static void PlaceUniques() for (u = 0; UniqMonst[u].mtype != -1; u++) { if (UniqMonst[u].mlevel != currlevel) continue; - done = FALSE; + done = false; for (mt = 0; mt < nummtypes; mt++) { if (done) break; @@ -901,15 +901,15 @@ static void PlaceUniques() } mt--; if (u == UMT_GARBUD && quests[Q_GARBUD]._qactive == QUEST_NOTAVAIL) - done = FALSE; + done = false; if (u == UMT_ZHAR && quests[Q_ZHAR]._qactive == QUEST_NOTAVAIL) - done = FALSE; + done = false; if (u == UMT_SNOTSPIL && quests[Q_LTBANNER]._qactive == QUEST_NOTAVAIL) - done = FALSE; + done = false; if (u == UMT_LACHDAN && quests[Q_VEIL]._qactive == QUEST_NOTAVAIL) - done = FALSE; + done = false; if (u == UMT_WARLORD && quests[Q_WARLORD]._qactive == QUEST_NOTAVAIL) - done = FALSE; + done = false; if (done) PlaceUniqueMonst(u, mt, 8); } @@ -1110,10 +1110,10 @@ void InitMonsters() CheckDungeonClear(); #endif if (!setlevel) { - AddMonster(1, 0, 0, 0, FALSE); - AddMonster(1, 0, 0, 0, FALSE); - AddMonster(1, 0, 0, 0, FALSE); - AddMonster(1, 0, 0, 0, FALSE); + AddMonster(1, 0, 0, 0, false); + AddMonster(1, 0, 0, 0, false); + AddMonster(1, 0, 0, 0, false); + AddMonster(1, 0, 0, 0, false); } if (!gbIsSpawn && !setlevel && currlevel == 16) @@ -1125,7 +1125,7 @@ void InitMonsters() for (i = 0; i < nt; i++) { for (s = -2; s < 2; s++) { for (t = -2; t < 2; t++) - DoVision(s + trigs[i]._tx, t + trigs[i]._ty, 15, FALSE, FALSE); + DoVision(s + trigs[i]._tx, t + trigs[i]._ty, 15, false, false); } } if (!gbIsSpawn) @@ -1177,10 +1177,10 @@ void SetMapMonsters(BYTE *pMap, int startx, int starty) int mtype; AddMonsterType(MT_GOLEM, PLACE_SPECIAL); - AddMonster(1, 0, 0, 0, FALSE); - AddMonster(1, 0, 0, 0, FALSE); - AddMonster(1, 0, 0, 0, FALSE); - AddMonster(1, 0, 0, 0, FALSE); + AddMonster(1, 0, 0, 0, false); + AddMonster(1, 0, 0, 0, false); + AddMonster(1, 0, 0, 0, false); + AddMonster(1, 0, 0, 0, false); if (setlevel && setlvlnum == SL_VILEBETRAYER) { AddMonsterType(UniqMonst[UMT_LAZURUS].mtype, PLACE_UNIQUE); AddMonsterType(UniqMonst[UMT_RED_VEX].mtype, PLACE_UNIQUE); @@ -1258,7 +1258,7 @@ void monster_43C785(int i) break; } if (j < MAX_LVLMTYPES) - AddMonster(x, y, dir, j, TRUE); + AddMonster(x, y, dir, j, true); } } } @@ -1630,7 +1630,7 @@ void M_StartHit(int i, int pnum, int dam) monster[i].mWhoHit |= 1 << pnum; if (pnum == myplr) { delta_monster_hp(i, monster[i]._mhitpoints, currlevel); - NetSendCmdMonDmg(FALSE, i, dam); + NetSendCmdMonDmg(false, i, dam); } PlayEffect(i, 1); if ((monster[i].MType->mtype >= MT_SNEAK && monster[i].MType->mtype <= MT_ILLWEAV) || dam >> 6 >= monster[i].mLevel + 3) { @@ -1674,9 +1674,9 @@ void M_DiabloDeath(int i, bool sendmsg) PlaySFX(USFX_DIABLOD); quests[Q_DIABLO]._qactive = QUEST_DONE; if (sendmsg) - NetSendCmdQuest(TRUE, Q_DIABLO); + NetSendCmdQuest(true, Q_DIABLO); sgbSaveSoundOn = gbSoundOn; - gbProcessPlayers = FALSE; + gbProcessPlayers = false; for (j = 0; j < nummonsters; j++) { k = monstactive[j]; if (k == i || Monst->_msquelch == 0) @@ -1695,7 +1695,7 @@ void M_DiabloDeath(int i, bool sendmsg) dMonster[monster[k]._mx][monster[k]._my] = k + 1; } AddLight(Monst->_mx, Monst->_my, 8); - DoVision(Monst->_mx, Monst->_my, 8, FALSE, TRUE); + DoVision(Monst->_mx, Monst->_my, 8, false, true); dist = std::max(abs(ViewX - Monst->_mx), abs(ViewY - Monst->_my)); if (dist > 20) dist = 20; @@ -1712,7 +1712,7 @@ void SpawnLoot(int i, bool sendmsg) Monst = &monster[i]; if (QuestStatus(Q_GARBUD) && Monst->_uniqtype - 1 == UMT_GARBUD) { - CreateTypeItem(Monst->_mx + 1, Monst->_my + 1, TRUE, ITYPE_MACE, IMISC_NONE, TRUE, FALSE); + CreateTypeItem(Monst->_mx + 1, Monst->_my + 1, true, ITYPE_MACE, IMISC_NONE, true, false); } else if (Monst->_uniqtype - 1 == UMT_DEFILER) { if (effect_is_playing(USFX_DEFILER8)) stream_stop(); @@ -1722,7 +1722,7 @@ void SpawnLoot(int i, bool sendmsg) if (gbTheoQuest) { SpawnTheodore(Monst->_mx, Monst->_my); } else { - CreateAmulet(Monst->_mx, Monst->_my, 13, FALSE, TRUE); + CreateAmulet(Monst->_mx, Monst->_my, 13, false, true); } } else if (Monst->MType->mtype == MT_HORKSPWN) { } else if (Monst->MType->mtype == MT_NAKRUL) { @@ -1733,10 +1733,10 @@ void SpawnLoot(int i, bool sendmsg) stream_stop(); quests[Q_NAKRUL]._qlog = 0; UberDiabloMonsterIndex = -2; - CreateMagicWeapon(Monst->_mx, Monst->_my, ITYPE_SWORD, ICURS_GREAT_SWORD, FALSE, TRUE); - CreateMagicWeapon(Monst->_mx, Monst->_my, ITYPE_STAFF, ICURS_WAR_STAFF, FALSE, TRUE); - CreateMagicWeapon(Monst->_mx, Monst->_my, ITYPE_BOW, ICURS_LONG_WAR_BOW, FALSE, TRUE); - CreateSpellBook(Monst->_mx, Monst->_my, SPL_APOCA, FALSE, TRUE); + CreateMagicWeapon(Monst->_mx, Monst->_my, ITYPE_SWORD, ICURS_GREAT_SWORD, false, true); + CreateMagicWeapon(Monst->_mx, Monst->_my, ITYPE_STAFF, ICURS_WAR_STAFF, false, true); + CreateMagicWeapon(Monst->_mx, Monst->_my, ITYPE_BOW, ICURS_LONG_WAR_BOW, false, true); + CreateSpellBook(Monst->_mx, Monst->_my, SPL_APOCA, false, true); } else if (i > MAX_PLRS - 1) { // Golems should not spawn loot SpawnItem(i, Monst->_mx, Monst->_my, sendmsg); } @@ -1751,7 +1751,7 @@ void M2MStartHit(int mid, int i, int dam) monster[mid].mWhoHit |= 1 << i; delta_monster_hp(mid, monster[mid]._mhitpoints, currlevel); - NetSendCmdMonDmg(FALSE, mid, dam); + NetSendCmdMonDmg(false, mid, dam); PlayEffect(mid, 1); if ((monster[mid].MType->mtype >= MT_SNEAK && monster[mid].MType->mtype <= MT_ILLWEAV) || dam >> 6 >= monster[mid].mLevel + 3) { @@ -1804,7 +1804,7 @@ void MonstStartKill(int i, int pnum, bool sendmsg) SetRndSeed(Monst->_mRndSeed); SpawnLoot(i, sendmsg); if (Monst->MType->mtype == MT_DIABLO) - M_DiabloDeath(i, TRUE); + M_DiabloDeath(i, true); else PlayEffect(i, 2); @@ -1840,7 +1840,7 @@ void M2MStartKill(int i, int mid) assurance(monster[mid].MType != NULL, mid); /// BUGFIX: should check `mid` (fixed) delta_kill_monster(mid, monster[mid]._mx, monster[mid]._my, currlevel); - NetSendCmdLocParam1(FALSE, CMD_MONSTDEATH, monster[mid]._mx, monster[mid]._my, mid); + NetSendCmdLocParam1(false, CMD_MONSTDEATH, monster[mid]._mx, monster[mid]._my, mid); if (i < MAX_PLRS) { monster[mid].mWhoHit |= 1 << i; @@ -1852,10 +1852,10 @@ void M2MStartKill(int i, int mid) monster[mid]._mhitpoints = 0; SetRndSeed(monster[mid]._mRndSeed); - SpawnLoot(mid, TRUE); + SpawnLoot(mid, true); if (monster[mid].MType->mtype == MT_DIABLO) - M_DiabloDeath(mid, TRUE); + M_DiabloDeath(mid, true); else PlayEffect(mid, 2); @@ -1874,7 +1874,7 @@ void M2MStartKill(int i, int mid) monster[mid]._mfuty = monster[mid]._moldy; M_ClearSquares(mid); dMonster[monster[mid]._mx][monster[mid]._my] = mid + 1; - CheckQuestKill(mid, TRUE); + CheckQuestKill(mid, true); M_FallenFear(monster[mid]._mx, monster[mid]._my); if (monster[mid].MType->mtype >= MT_NACID && monster[mid].MType->mtype <= MT_XACID) AddMissile(monster[mid]._mx, monster[mid]._my, 0, 0, 0, MIS_ACIDPUD, TARGET_PLAYERS, mid, monster[mid]._mint + 1, 0); @@ -1890,13 +1890,13 @@ void M_StartKill(int i, int pnum) if (myplr == pnum) { delta_kill_monster(i, monster[i]._mx, monster[i]._my, currlevel); if (i != pnum) { - NetSendCmdLocParam1(FALSE, CMD_MONSTDEATH, monster[i]._mx, monster[i]._my, i); + NetSendCmdLocParam1(false, CMD_MONSTDEATH, monster[i]._mx, monster[i]._my, i); } else { - NetSendCmdLocParam1(FALSE, CMD_KILLGOLEM, monster[i]._mx, monster[i]._my, currlevel); + NetSendCmdLocParam1(false, CMD_KILLGOLEM, monster[i]._mx, monster[i]._my, currlevel); } } - MonstStartKill(i, pnum, TRUE); + MonstStartKill(i, pnum, true); } void M_SyncStartKill(int i, int x, int y, int pnum) @@ -1916,10 +1916,10 @@ void M_SyncStartKill(int i, int x, int y, int pnum) } if (monster[i]._mmode == MM_STONE) { - MonstStartKill(i, pnum, FALSE); + MonstStartKill(i, pnum, false); monster[i]._mmode = MM_STONE; } else { - MonstStartKill(i, pnum, FALSE); + MonstStartKill(i, pnum, false); } } @@ -2027,7 +2027,7 @@ bool M_DoStand(int i) Monst->_mVar2++; - return FALSE; + return false; } /** @@ -2063,7 +2063,7 @@ bool M_DoWalk(int i, int variant) if (monster[i].mlid != NO_LIGHT) ChangeLightXY(monster[i].mlid, monster[i]._mx, monster[i]._my); M_StartStand(i, monster[i]._mdir); - returnValue = TRUE; + returnValue = true; } else { //We didn't reach new tile so update monster's "sub-tile" position if (monster[i]._mAnimCnt == 0) { if (monster[i]._mVar8 == 0 && monster[i].MType->mtype == MT_FLESTHNG) @@ -2074,7 +2074,7 @@ bool M_DoWalk(int i, int variant) monster[i]._mxoff = monster[i]._mVar6 >> 4; monster[i]._myoff = monster[i]._mVar7 >> 4; } - returnValue = FALSE; + returnValue = false; } if (monster[i].mlid != NO_LIGHT) // BUGFIX: change uniqtype check to mlid check like it is in all other places (fixed) @@ -2265,10 +2265,10 @@ void M_TryH2HHit(int i, int pnum, int Hit, int MinDam, int MaxDam) M_StartStand(i, monster[i]._mdir); return; } - StartPlrHit(pnum, dam, FALSE); + StartPlrHit(pnum, dam, false); if (monster[i]._mFlags & MFLAG_KNOCKBACK) { if (plr[pnum]._pmode != PM_GOTHIT) - StartPlrHit(pnum, 0, TRUE); + StartPlrHit(pnum, 0, true); newx = plr[pnum]._px + offset_x[monster[i]._mdir]; newy = plr[pnum]._py + offset_y[monster[i]._mdir]; if (PosOkPlayer(pnum, newx, newy)) { @@ -2308,10 +2308,10 @@ bool M_DoAttack(int i) PlayEffect(i, 0); if (monster[i]._mAnimFrame == monster[i]._mAnimLen) { M_StartStand(i, monster[i]._mdir); - return TRUE; + return true; } - return FALSE; + return false; } bool M_DoRAttack(int i) @@ -2347,10 +2347,10 @@ bool M_DoRAttack(int i) if (monster[i]._mAnimFrame == monster[i]._mAnimLen) { M_StartStand(i, monster[i]._mdir); - return TRUE; + return true; } - return FALSE; + return false; } bool M_DoRSpAttack(int i) @@ -2384,10 +2384,10 @@ bool M_DoRSpAttack(int i) if (monster[i]._mAnimFrame == monster[i]._mAnimLen) { M_StartStand(i, monster[i]._mdir); - return TRUE; + return true; } - return FALSE; + return false; } bool M_DoSAttack(int i) @@ -2401,10 +2401,10 @@ bool M_DoSAttack(int i) if (monster[i]._mAnimFrame == monster[i]._mAnimLen) { M_StartStand(i, monster[i]._mdir); - return TRUE; + return true; } - return FALSE; + return false; } bool M_DoFadein(int i) @@ -2413,13 +2413,13 @@ bool M_DoFadein(int i) if ((!(monster[i]._mFlags & MFLAG_LOCK_ANIMATION) || monster[i]._mAnimFrame != 1) && (monster[i]._mFlags & MFLAG_LOCK_ANIMATION || monster[i]._mAnimFrame != monster[i]._mAnimLen)) { - return FALSE; + return false; } M_StartStand(i, monster[i]._mdir); monster[i]._mFlags &= ~MFLAG_LOCK_ANIMATION; - return TRUE; + return true; } bool M_DoFadeout(int i) @@ -2430,7 +2430,7 @@ bool M_DoFadeout(int i) if ((!(monster[i]._mFlags & MFLAG_LOCK_ANIMATION) || monster[i]._mAnimFrame != 1) && (monster[i]._mFlags & MFLAG_LOCK_ANIMATION || monster[i]._mAnimFrame != monster[i]._mAnimLen)) { - return FALSE; + return false; } mt = monster[i].MType->mtype; @@ -2443,7 +2443,7 @@ bool M_DoFadeout(int i) M_StartStand(i, monster[i]._mdir); - return TRUE; + return true; } bool M_DoHeal(int i) @@ -2455,7 +2455,7 @@ bool M_DoHeal(int i) if (monster[i]._mFlags & MFLAG_NOHEAL) { Monst->_mFlags &= ~MFLAG_ALLOW_SPECIAL; Monst->_mmode = MM_SATTACK; - return FALSE; + return false; } if (Monst->_mAnimFrame == 1) { @@ -2469,7 +2469,7 @@ bool M_DoHeal(int i) Monst->_mmode = MM_SATTACK; } } - return FALSE; + return false; } bool M_DoTalk(int i) @@ -2483,15 +2483,15 @@ bool M_DoTalk(int i) M_StartStand(i, monster[i]._mdir); Monst->_mgoal = MGOAL_TALKING; // CODEFIX: apply Monst instead of monster[i] in the rest of the function if (effect_is_playing(alltext[monster[i].mtalkmsg].sfxnr)) - return FALSE; + return false; InitQTextMsg(monster[i].mtalkmsg); if (monster[i]._uniqtype - 1 == UMT_GARBUD) { if (monster[i].mtalkmsg == TEXT_GARBUD1) { quests[Q_GARBUD]._qactive = QUEST_ACTIVE; - quests[Q_GARBUD]._qlog = TRUE; // BUGFIX: (?) for other quests qactive and qlog go together, maybe this should actually go into the if above (fixed) + quests[Q_GARBUD]._qlog = true; // BUGFIX: (?) for other quests qactive and qlog go together, maybe this should actually go into the if above (fixed) } if (monster[i].mtalkmsg == TEXT_GARBUD2 && !(monster[i]._mFlags & MFLAG_QUEST_COMPLETE)) { - SpawnItem(i, monster[i]._mx + 1, monster[i]._my + 1, TRUE); + SpawnItem(i, monster[i]._mx + 1, monster[i]._my + 1, true); monster[i]._mFlags |= MFLAG_QUEST_COMPLETE; } } @@ -2499,8 +2499,8 @@ bool M_DoTalk(int i) && monster[i].mtalkmsg == TEXT_ZHAR1 && !(monster[i]._mFlags & MFLAG_QUEST_COMPLETE)) { quests[Q_ZHAR]._qactive = QUEST_ACTIVE; - quests[Q_ZHAR]._qlog = TRUE; - CreateTypeItem(monster[i]._mx + 1, monster[i]._my + 1, FALSE, ITYPE_MISC, IMISC_BOOK, TRUE, FALSE); + quests[Q_ZHAR]._qlog = true; + CreateTypeItem(monster[i]._mx + 1, monster[i]._my + 1, false, ITYPE_MISC, IMISC_BOOK, true, false); monster[i]._mFlags |= MFLAG_QUEST_COMPLETE; } if (monster[i]._uniqtype - 1 == UMT_SNOTSPIL) { @@ -2522,7 +2522,7 @@ bool M_DoTalk(int i) if (monster[i]._uniqtype - 1 == UMT_LACHDAN) { if (monster[i].mtalkmsg == TEXT_VEIL9) { quests[Q_VEIL]._qactive = QUEST_ACTIVE; - quests[Q_VEIL]._qlog = TRUE; + quests[Q_VEIL]._qlog = true; } if (monster[i].mtalkmsg == TEXT_VEIL11 && !(monster[i]._mFlags & MFLAG_QUEST_COMPLETE)) { SpawnUnique(UITEM_STEELVEIL, monster[i]._mx + 1, monster[i]._my + 1); @@ -2537,7 +2537,7 @@ bool M_DoTalk(int i) monster[i]._msquelch = UCHAR_MAX; monster[i].mtalkmsg = 0; } - return FALSE; + return false; } void M_Teleport(int i) @@ -2548,7 +2548,7 @@ void M_Teleport(int i) assurance((DWORD)i < MAXMONSTERS, i); - done = FALSE; + done = false; Monst = &monster[i]; if (Monst->_mmode == MM_STONE) @@ -2566,7 +2566,7 @@ void M_Teleport(int i) y = _my + ry * k; if (y >= 0 && y < MAXDUNY && x >= 0 && x < MAXDUNX && x != Monst->_mx && y != Monst->_my) { if (PosOkMonst(i, x, y)) - done = TRUE; + done = true; } } } @@ -2590,10 +2590,10 @@ bool M_DoGotHit(int i) if (monster[i]._mAnimFrame == monster[i]._mAnimLen) { M_StartStand(i, monster[i]._mdir); - return TRUE; + return true; } - return FALSE; + return false; } void M_UpdateLeader(int i) @@ -2632,26 +2632,26 @@ void DoEnding() return; if (plr[myplr]._pClass == PC_WARRIOR || plr[myplr]._pClass == PC_BARBARIAN) { - play_movie("gendata\\DiabVic2.smk", FALSE); + play_movie("gendata\\DiabVic2.smk", false); } else if (plr[myplr]._pClass == PC_SORCERER) { - play_movie("gendata\\DiabVic1.smk", FALSE); + play_movie("gendata\\DiabVic1.smk", false); } else if (plr[myplr]._pClass == PC_MONK) { - play_movie("gendata\\DiabVic1.smk", FALSE); + play_movie("gendata\\DiabVic1.smk", false); } else { - play_movie("gendata\\DiabVic3.smk", FALSE); + play_movie("gendata\\DiabVic3.smk", false); } - play_movie("gendata\\Diabend.smk", FALSE); + play_movie("gendata\\Diabend.smk", false); bMusicOn = gbMusicOn; - gbMusicOn = TRUE; + gbMusicOn = true; musicVolume = sound_get_or_set_music_volume(1); sound_get_or_set_music_volume(0); music_start(TMUSIC_L2); - loop_movie = TRUE; - play_movie("gendata\\loopdend.smk", TRUE); - loop_movie = FALSE; + loop_movie = true; + play_movie("gendata\\loopdend.smk", true); + loop_movie = false; music_stop(); sound_get_or_set_music_volume(musicVolume); @@ -2664,9 +2664,9 @@ void PrepDoEnding() DWORD *killLevel; gbSoundOn = sgbSaveSoundOn; - gbRunGame = FALSE; - deathflag = FALSE; - cineflag = TRUE; + gbRunGame = false; + deathflag = false; + cineflag = true; killLevel = &plr[myplr].pDiabloKillLevel; newKillLevel = gnDifficulty + 1; @@ -2676,7 +2676,7 @@ void PrepDoEnding() for (i = 0; i < MAX_PLRS; i++) { plr[i]._pmode = PM_QUIT; - plr[i]._pInvincible = TRUE; + plr[i]._pInvincible = true; if (gbIsMultiplayer) { if (plr[i]._pHitPoints >> 6 == 0) plr[i]._pHitPoints = 64; @@ -2719,11 +2719,11 @@ bool M_DoDeath(int i) AddDead(monster[i]._mx, monster[i]._my, monster[i]._udeadval, (direction)monster[i]._mdir); dMonster[monster[i]._mx][monster[i]._my] = 0; - monster[i]._mDelFlag = TRUE; + monster[i]._mDelFlag = true; M_UpdateLeader(i); } - return FALSE; + return false; } bool M_DoSpStand(int i) @@ -2736,10 +2736,10 @@ bool M_DoSpStand(int i) if (monster[i]._mAnimFrame == monster[i]._mAnimLen) { M_StartStand(i, monster[i]._mdir); - return TRUE; + return true; } - return FALSE; + return false; } bool M_DoDelay(int i) @@ -2759,10 +2759,10 @@ bool M_DoDelay(int i) oFrame = monster[i]._mAnimFrame; M_StartStand(i, monster[i]._mdir); monster[i]._mAnimFrame = oFrame; - return TRUE; + return true; } - return FALSE; + return false; } bool M_DoStone(int i) @@ -2771,10 +2771,10 @@ bool M_DoStone(int i) if (!monster[i]._mhitpoints) { dMonster[monster[i]._mx][monster[i]._my] = 0; - monster[i]._mDelFlag = TRUE; + monster[i]._mDelFlag = true; } - return FALSE; + return false; } void M_WalkDir(int i, int md) @@ -2911,10 +2911,10 @@ bool M_PathWalk(int i) if (FindPath(Check, i, monster[i]._mx, monster[i]._my, monster[i]._menemyx, monster[i]._menemyy, path)) { M_CallWalk(i, plr2monst[path[0]]); - return TRUE; + return true; } - return FALSE; + return false; } bool M_CallWalk2(int i, int md) @@ -3061,13 +3061,13 @@ bool MAI_Path(int i) Monst = &monster[i]; if (Monst->MType->mtype != MT_GOLEM) { if (Monst->_msquelch == 0) - return FALSE; + return false; if (Monst->_mmode != MM_STAND) - return FALSE; + return false; if (Monst->_mgoal != MGOAL_NORMAL && Monst->_mgoal != MGOAL_MOVE && Monst->_mgoal != MGOAL_ATTACK2) - return FALSE; + return false; if (Monst->_mx == 1 && Monst->_my == 0) - return FALSE; + return false; } clear = LineClearF1( @@ -3082,15 +3082,15 @@ bool MAI_Path(int i) MonstCheckDoors(i); Monst->_pathcount++; if (Monst->_pathcount < 5) - return FALSE; + return false; if (M_PathWalk(i)) - return TRUE; + return true; } if (Monst->MType->mtype != MT_GOLEM) Monst->_pathcount = 0; - return FALSE; + return false; } void MAI_Snake(int i) @@ -3243,7 +3243,7 @@ void MAI_SkelBow(int i) int mx, my, md, v; bool walking; - walking = FALSE; + walking = false; assurance((DWORD)i < MAXMONSTERS, i); Monst = &monster[i]; @@ -3357,10 +3357,10 @@ void MAI_Sneak(int i) Monst->_mdir = md; v = random_(112, 100); if (abs(mx) < dist && abs(my) < dist && Monst->_mFlags & MFLAG_HIDDEN) { - M_StartFadein(i, md, FALSE); + M_StartFadein(i, md, false); } else { if ((abs(mx) >= dist + 1 || abs(my) >= dist + 1) && !(Monst->_mFlags & MFLAG_HIDDEN)) { - M_StartFadeout(i, md, TRUE); + M_StartFadeout(i, md, true); } else { if (Monst->_mgoal == MGOAL_RETREAT || ((abs(mx) >= 2 || abs(my) >= 2) && ((Monst->_mVar2 > 20 && v < 4 * Monst->_mint + 14) || ((Monst->_mVar1 == MM_WALK || Monst->_mVar1 == MM_WALK2 || Monst->_mVar1 == MM_WALK3) && Monst->_mVar2 == 0 && v < 4 * Monst->_mint + 64)))) { @@ -3409,7 +3409,7 @@ void MAI_Fireman(int i) } else if (Monst->_mgoal == MGOAL_ATTACK2) { if (Monst->_mgoalvar1 == 3) { Monst->_mgoal = MGOAL_NORMAL; - M_StartFadeout(i, md, TRUE); + M_StartFadeout(i, md, true); } else if (LineClear(Monst->_mx, Monst->_my, fx, fy)) { M_StartRAttack(i, MIS_KRULL, 4); Monst->_mgoalvar1++; @@ -3418,7 +3418,7 @@ void MAI_Fireman(int i) Monst->_mgoalvar1++; } } else if (Monst->_mgoal == MGOAL_RETREAT) { - M_StartFadein(i, md, FALSE); + M_StartFadein(i, md, false); Monst->_mgoal = MGOAL_ATTACK2; } Monst->_mdir = md; @@ -3430,11 +3430,11 @@ void MAI_Fireman(int i) M_TryH2HHit(i, monster[i]._menemy, monster[i].mHit, monster[i].mMinDamage, monster[i].mMaxDamage); Monst->_mgoal = MGOAL_RETREAT; if (!M_CallWalk(i, opposite[md])) { - M_StartFadein(i, md, FALSE); + M_StartFadein(i, md, false); Monst->_mgoal = MGOAL_ATTACK2; } } else if (!M_CallWalk(i, md) && (Monst->_mgoal == MGOAL_NORMAL || Monst->_mgoal == MGOAL_RETREAT)) { - M_StartFadein(i, md, FALSE); + M_StartFadein(i, md, false); Monst->_mgoal = MGOAL_ATTACK2; } } @@ -3595,7 +3595,7 @@ void MAI_Round(int i, bool special) void MAI_GoatMc(int i) { - MAI_Round(i, TRUE); + MAI_Round(i, true); } void MAI_Ranged(int i, int missile_type, bool special) @@ -3646,47 +3646,47 @@ void MAI_Ranged(int i, int missile_type, bool special) void MAI_GoatBow(int i) { - MAI_Ranged(i, MIS_ARROW, FALSE); + MAI_Ranged(i, MIS_ARROW, false); } void MAI_Succ(int i) { - MAI_Ranged(i, MIS_FLARE, FALSE); + MAI_Ranged(i, MIS_FLARE, false); } void MAI_Lich(int i) { - MAI_Ranged(i, MIS_LICH, FALSE); + MAI_Ranged(i, MIS_LICH, false); } void MAI_ArchLich(int i) { - MAI_Ranged(i, MIS_ARCHLICH, FALSE); + MAI_Ranged(i, MIS_ARCHLICH, false); } void MAI_Psychorb(int i) { - MAI_Ranged(i, MIS_PSYCHORB, FALSE); + MAI_Ranged(i, MIS_PSYCHORB, false); } void MAI_Necromorb(int i) { - MAI_Ranged(i, MIS_NECROMORB, FALSE); + MAI_Ranged(i, MIS_NECROMORB, false); } void MAI_AcidUniq(int i) { - MAI_Ranged(i, MIS_ACID, TRUE); + MAI_Ranged(i, MIS_ACID, true); } void MAI_Firebat(int i) { - MAI_Ranged(i, MIS_FIREBOLT, FALSE); + MAI_Ranged(i, MIS_FIREBOLT, false); } void MAI_Torchant(int i) { - MAI_Ranged(i, MIS_FIREBALL, FALSE); + MAI_Ranged(i, MIS_FIREBALL, false); } void MAI_Scav(int i) @@ -3697,7 +3697,7 @@ void MAI_Scav(int i) assurance((DWORD)i < MAXMONSTERS, i); Monst = &monster[i]; - done = FALSE; + done = false; if (monster[i]._mmode != MM_STAND) return; if (Monst->_mhitpoints < (Monst->_mmaxhp >> 1) && Monst->_mgoal != MGOAL_HEALING) { @@ -3823,7 +3823,7 @@ void MAI_Garg(int i) Monst->_mgoal = MGOAL_NORMAL; } } - MAI_Round(i, FALSE); + MAI_Round(i, false); } void MAI_RoundRanged(int i, int missile_type, bool checkdoors, int dam, int lessmissiles) @@ -3888,27 +3888,27 @@ void MAI_RoundRanged(int i, int missile_type, bool checkdoors, int dam, int less void MAI_Magma(int i) { - MAI_RoundRanged(i, MIS_MAGMABALL, TRUE, 4, 0); + MAI_RoundRanged(i, MIS_MAGMABALL, true, 4, 0); } void MAI_Storm(int i) { - MAI_RoundRanged(i, MIS_LIGHTCTRL2, TRUE, 4, 0); + MAI_RoundRanged(i, MIS_LIGHTCTRL2, true, 4, 0); } void MAI_BoneDemon(int i) { - MAI_RoundRanged(i, MIS_BONEDEMON, TRUE, 4, 0); + MAI_RoundRanged(i, MIS_BONEDEMON, true, 4, 0); } void MAI_Acid(int i) { - MAI_RoundRanged(i, MIS_ACID, FALSE, 4, 1); + MAI_RoundRanged(i, MIS_ACID, false, 4, 1); } void MAI_Diablo(int i) { - MAI_RoundRanged(i, MIS_DIABAPOCA, FALSE, 40, 0); + MAI_RoundRanged(i, MIS_DIABAPOCA, false, 40, 0); } void MAI_RR2(int i, int mistype, int dam) @@ -4285,7 +4285,7 @@ void MAI_Counselor(int i) M_CallWalk(i, opposite[md]); else { Monst->_mgoal = MGOAL_NORMAL; - M_StartFadein(i, md, TRUE); + M_StartFadein(i, md, true); } } else if (Monst->_mgoal == MGOAL_MOVE) { dist = std::max(abs(mx), abs(my)); @@ -4294,11 +4294,11 @@ void MAI_Counselor(int i) M_RoundWalk(i, md, &Monst->_mgoalvar2); } else { Monst->_mgoal = MGOAL_NORMAL; - M_StartFadein(i, md, TRUE); + M_StartFadein(i, md, true); } } else { Monst->_mgoal = MGOAL_NORMAL; - M_StartFadein(i, md, TRUE); + M_StartFadein(i, md, true); } } else if (Monst->_mgoal == MGOAL_NORMAL) { if (abs(mx) >= 2 || abs(my) >= 2) { @@ -4307,7 +4307,7 @@ void MAI_Counselor(int i) } else if (random_(124, 100) < 30) { Monst->_mgoal = MGOAL_MOVE; Monst->_mgoalvar1 = 0; - M_StartFadeout(i, md, FALSE); + M_StartFadeout(i, md, false); } else M_StartDelay(i, random_(105, 10) + 2 * (5 - Monst->_mint)); } else { @@ -4315,7 +4315,7 @@ void MAI_Counselor(int i) if (Monst->_mhitpoints < (Monst->_mmaxhp >> 1)) { Monst->_mgoal = MGOAL_RETREAT; Monst->_mgoalvar1 = 0; - M_StartFadeout(i, md, FALSE); + M_StartFadeout(i, md, false); } else if (Monst->_mVar1 == MM_DELAY || random_(105, 100) < 2 * Monst->_mint + 20) { M_StartRAttack(i, -1, 0); @@ -4376,7 +4376,7 @@ void MAI_Garbud(int i) } if (Monst->_mgoal == MGOAL_NORMAL || Monst->_mgoal == MGOAL_MOVE) - MAI_Round(i, TRUE); + MAI_Round(i, true); monster[i]._mdir = md; @@ -4641,7 +4641,7 @@ void DeleteMonsterList() monster[i]._mfuty = 0; monster[i]._moldx = 0; monster[i]._moldy = 0; - monster[i]._mDelFlag = FALSE; + monster[i]._mDelFlag = false; } } @@ -4668,7 +4668,7 @@ void ProcessMonsters() for (i = 0; i < nummonsters; i++) { mi = monstactive[i]; Monst = &monster[mi]; - raflag = FALSE; + raflag = false; if (gbIsMultiplayer) { SetRndSeed(Monst->_mAISeed); Monst->_mAISeed = AdvanceRndSeed(); @@ -4768,7 +4768,7 @@ void ProcessMonsters() raflag = M_DoDelay(mi); break; case MM_CHARGE: - raflag = FALSE; + raflag = false; break; case MM_STONE: raflag = M_DoStone(mi); @@ -4833,28 +4833,28 @@ bool DirOK(int i, int mdir) fx = monster[i]._mx + offset_x[mdir]; fy = monster[i]._my + offset_y[mdir]; if (fy < 0 || fy >= MAXDUNY || fx < 0 || fx >= MAXDUNX || !PosOkMonst(i, fx, fy)) - return FALSE; + return false; if (mdir == DIR_E) { if (SolidLoc(fx, fy + 1) || dFlags[fx][fy + 1] & BFLAG_MONSTLR) - return FALSE; + return false; } else if (mdir == DIR_W) { if (SolidLoc(fx + 1, fy) || dFlags[fx + 1][fy] & BFLAG_MONSTLR) - return FALSE; + return false; } else if (mdir == DIR_N) { if (SolidLoc(fx + 1, fy) || SolidLoc(fx, fy + 1)) - return FALSE; + return false; } else if (mdir == DIR_S) if (SolidLoc(fx - 1, fy) || SolidLoc(fx, fy - 1)) - return FALSE; + return false; if (monster[i].leaderflag == 1) { if (abs(fx - monster[monster[i].leader]._mfutx) >= 4 || abs(fy - monster[monster[i].leader]._mfuty) >= 4) { - return FALSE; + return false; } - return TRUE; + return true; } if (monster[i]._uniqtype == 0 || !(UniqMonst[monster[i]._uniqtype - 1].mUnqAttr & 2)) - return TRUE; + return true; mcount = 0; for (x = fx - 3; x <= fx + 3; x++) { for (y = fy - 3; y <= fy + 3; y++) { @@ -4884,7 +4884,7 @@ bool PosOkMissile(int x, int y) bool CheckNoSolid(int x, int y) { - return nSolidTable[dPiece[x][y]] == FALSE; + return nSolidTable[dPiece[x][y]] == false; } bool LineClearF(bool (*Clear)(int, int), int x1, int y1, int x2, int y2) @@ -4894,7 +4894,7 @@ bool LineClearF(bool (*Clear)(int, int), int x1, int y1, int x2, int y2) int d; int xincD, yincD, dincD, dincH; int tmp; - bool done = FALSE; + bool done = false; xorg = x1; yorg = y1; @@ -4980,7 +4980,7 @@ bool LineClearF1(bool (*Clear)(int, int, int), int monst, int x1, int y1, int x2 int xorg, yorg; int xincD, yincD, dincD, dincH; int tmp; - bool done = FALSE; + bool done = false; xorg = x1; yorg = y1; @@ -5180,7 +5180,7 @@ void PrintMonstHistory(int mt) sprintf(tempstr, "Total kills: %i", monstkills[mt]); } - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); if (monstkills[mt] >= 30) { minHP = monsterdata[mt].mMinHP; maxHP = monsterdata[mt].mMaxHP; @@ -5211,7 +5211,7 @@ void PrintMonstHistory(int mt) maxHP = 4 * maxHP + hpBonusHell; } sprintf(tempstr, "Hit Points: %i-%i", minHP, maxHP); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (monstkills[mt] >= 15) { if (gnDifficulty != DIFF_HELL) @@ -5221,7 +5221,7 @@ void PrintMonstHistory(int mt) res = res & (RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING); if (!res) { strcpy(tempstr, "No magic resistance"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } else { if (res & (RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING)) { strcpy(tempstr, "Resists: "); @@ -5232,7 +5232,7 @@ void PrintMonstHistory(int mt) if (res & RESIST_LIGHTNING) strcat(tempstr, "Lightning "); tempstr[strlen(tempstr) - 1] = '\0'; - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } if (res & (IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING)) { strcpy(tempstr, "Immune: "); @@ -5243,11 +5243,11 @@ void PrintMonstHistory(int mt) if (res & IMMUNE_LIGHTNING) strcat(tempstr, "Lightning "); tempstr[strlen(tempstr) - 1] = '\0'; - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } } } - pinfoflag = TRUE; + pinfoflag = true; } void PrintUniqueHistory() @@ -5256,28 +5256,28 @@ void PrintUniqueHistory() if (sgOptions.Gameplay.bShowMonsterType) { sprintf(tempstr, "Type: %s", GetMonsterTypeText(*monster[pcursmonst].MData)); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); } res = monster[pcursmonst].mMagicRes & (RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING); if (!res) { strcpy(tempstr, "No resistances"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); strcpy(tempstr, "No Immunities"); } else { if (res & (RESIST_MAGIC | RESIST_FIRE | RESIST_LIGHTNING)) strcpy(tempstr, "Some Magic Resistances"); else strcpy(tempstr, "No resistances"); - AddPanelString(tempstr, TRUE); + AddPanelString(tempstr, true); if (res & (IMMUNE_MAGIC | IMMUNE_FIRE | IMMUNE_LIGHTNING)) { strcpy(tempstr, "Some Magic Immunities"); } else { strcpy(tempstr, "No Immunities"); } } - AddPanelString(tempstr, TRUE); - pinfoflag = TRUE; + AddPanelString(tempstr, true); + pinfoflag = true; } void MissToMonst(int i, int x, int y) @@ -5309,7 +5309,7 @@ void MissToMonst(int i, int x, int y) else M2MStartHit(m, -1, 0); } else { - M_StartFadein(m, Monst->_mdir, FALSE); + M_StartFadein(m, Monst->_mdir, false); } if (!(Monst->_mFlags & MFLAG_TARGETS_MONSTER)) { @@ -5319,7 +5319,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 != PM_GOTHIT && plr[pnum]._pmode != PM_DEATH) - StartPlrHit(pnum, 0, TRUE); + StartPlrHit(pnum, 0, true); newx = oldx + offset_x[Monst->_mdir]; newy = oldy + offset_y[Monst->_mdir]; if (PosOkPlayer(pnum, newx, newy)) { @@ -5365,7 +5365,7 @@ bool PosOkMonst(int i, int x, int y) if (ret && dObject[x][y] != 0) { oi = dObject[x][y] > 0 ? dObject[x][y] - 1 : -(dObject[x][y] + 1); if (object[oi]._oSolidFlag) - ret = FALSE; + ret = false; } if (ret) ret = monster_posok(i, x, y); @@ -5378,36 +5378,36 @@ bool monster_posok(int i, int x, int y) int mi, j; bool ret, fire, lightning; - ret = TRUE; + ret = true; mi = dMissile[x][y]; if (mi != 0 && i >= 0) { - fire = FALSE; - lightning = FALSE; + fire = false; + lightning = false; if (mi > 0) { if (missile[mi - 1]._mitype == MIS_FIREWALL) { // BUGFIX: Change 'mi' to 'mi - 1' (fixed) - fire = TRUE; + fire = true; } else if (missile[mi - 1]._mitype == MIS_LIGHTWALL) { // BUGFIX: Change 'mi' to 'mi - 1' (fixed) - lightning = TRUE; + lightning = true; } } else { for (j = 0; j < nummissiles; j++) { mi = missileactive[j]; if (missile[mi]._mix == x && missile[mi]._miy == y) { if (missile[mi]._mitype == MIS_FIREWALL) { - fire = TRUE; + fire = true; break; } if (missile[mi]._mitype == MIS_LIGHTWALL) { - lightning = TRUE; + lightning = true; break; } } } } if (fire && (!(monster[i].mMagicRes & IMMUNE_FIRE) || monster[i].MType->mtype == MT_DIABLO)) - ret = FALSE; + ret = false; if (lightning && (!(monster[i].mMagicRes & IMMUNE_LIGHTNING) || monster[i].MType->mtype == MT_DIABLO)) - ret = FALSE; + ret = false; } return ret; @@ -5422,7 +5422,7 @@ bool PosOkMonst2(int i, int x, int y) if (ret && dObject[x][y] != 0) { oi = dObject[x][y] > 0 ? dObject[x][y] - 1 : -(dObject[x][y] + 1); if (object[oi]._oSolidFlag) - ret = FALSE; + ret = false; } if (ret) ret = monster_posok(i, x, y); @@ -5435,8 +5435,8 @@ bool PosOkMonst3(int i, int x, int y) int j, oi, objtype, mi; bool ret, fire, isdoor; - ret = TRUE; - isdoor = FALSE; + ret = true; + isdoor = false; if (ret && dObject[x][y] != 0) { oi = dObject[x][y] > 0 ? dObject[x][y] - 1 : -(dObject[x][y] + 1); @@ -5445,7 +5445,7 @@ bool PosOkMonst3(int i, int x, int y) || objtype == OBJ_L2LDOOR || objtype == OBJ_L2RDOOR || objtype == OBJ_L3LDOOR || objtype == OBJ_L3RDOOR; if (object[oi]._oSolidFlag && !isdoor) { - ret = FALSE; + ret = false; } } if (ret) { @@ -5487,7 +5487,7 @@ int M_SpawnSkel(int x, int y, int dir) if (IsSkel(Monsters[i].mtype)) j++; } - skel = AddMonster(x, y, dir, i - 1, TRUE); + skel = AddMonster(x, y, dir, i - 1, true); if (skel != -1) M_StartSpStand(skel, dir); @@ -5516,15 +5516,15 @@ bool SpawnSkeleton(int ii, int x, int y) int monstok[3][3]; if (ii == -1) - return FALSE; + return false; if (PosOkMonst(-1, x, y)) { dir = GetDirection(x, y, x, y); ActivateSpawn(ii, x, y, dir); - return TRUE; + return true; } - savail = FALSE; + savail = false; yy = 0; for (j = y - 1; j <= y + 1; j++) { xx = 0; @@ -5536,7 +5536,7 @@ bool SpawnSkeleton(int ii, int x, int y) yy++; } if (!savail) { - return FALSE; + return false; } rs = random_(137, 15) + 1; @@ -5561,7 +5561,7 @@ bool SpawnSkeleton(int ii, int x, int y) dir = GetDirection(dx, dy, x, y); ActivateSpawn(ii, dx, dy, dir); - return TRUE; + return true; } int PreSpawnSkeleton() @@ -5582,7 +5582,7 @@ int PreSpawnSkeleton() if (IsSkel(Monsters[i].mtype)) j++; } - skel = AddMonster(0, 0, 0, i - 1, FALSE); + skel = AddMonster(0, 0, 0, i - 1, false); if (skel != -1) M_StartStand(skel, 0); @@ -5656,7 +5656,7 @@ bool CanTalkToMonst(int m) commitment((DWORD)m < MAXMONSTERS, m); if (monster[m]._mgoal == MGOAL_INQUIRING) { - return TRUE; + return true; } return monster[m]._mgoal == MGOAL_TALKING; @@ -5669,18 +5669,18 @@ bool CheckMonsterHit(int m, bool *ret) if (monster[m]._mAi == AI_GARG && monster[m]._mFlags & MFLAG_ALLOW_SPECIAL) { monster[m]._mFlags &= ~MFLAG_ALLOW_SPECIAL; monster[m]._mmode = MM_SATTACK; - *ret = TRUE; - return TRUE; + *ret = true; + return true; } if (monster[m].MType->mtype >= MT_COUNSLR && monster[m].MType->mtype <= MT_ADVOCATE) { if (monster[m]._mgoal != MGOAL_NORMAL) { - *ret = FALSE; - return TRUE; + *ret = false; + return true; } } - return FALSE; + return false; } int encode_enemy(int m) diff --git a/Source/movie.cpp b/Source/movie.cpp index 6adffeb0..80086a66 100644 --- a/Source/movie.cpp +++ b/Source/movie.cpp @@ -23,8 +23,8 @@ void play_movie(const char *pszMovie, bool user_can_close) { HANDLE video_stream; - movie_playing = TRUE; - sound_disable_music(TRUE); + movie_playing = true; + sound_disable_music(true); stream_stop(); effects_play_sound("Sfx\\Misc\\blank.wav"); @@ -37,7 +37,7 @@ void play_movie(const char *pszMovie, bool user_can_close) case DVL_WM_LBUTTONDOWN: case DVL_WM_RBUTTONDOWN: if (user_can_close || (Msg.message == DVL_WM_KEYDOWN && Msg.wParam == DVL_VK_ESCAPE)) - movie_playing = FALSE; + movie_playing = false; break; case DVL_WM_QUIT: SVidPlayEnd(video_stream); @@ -50,8 +50,8 @@ void play_movie(const char *pszMovie, bool user_can_close) } if (video_stream) SVidPlayEnd(video_stream); - sound_disable_music(FALSE); - movie_playing = FALSE; + sound_disable_music(false); + movie_playing = false; SDL_GetMouseState(&MouseX, &MouseY); OutputToLogical(&MouseX, &MouseY); } diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp index 47cc6b3d..b1cddf10 100644 --- a/Source/mpqapi.cpp +++ b/Source/mpqapi.cpp @@ -553,24 +553,24 @@ static bool mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, #ifdef CAN_SEEKP_BEYOND_EOF if (!cur_archive.stream.seekp(pBlk->offset + offset_table_bytesize, std::ios::beg)) - return FALSE; + return false; #else // Ensure we do not seekp beyond EOF by filling the missing space. std::streampos stream_end; if (!cur_archive.stream.seekp(0, std::ios::end) || !cur_archive.stream.tellp(&stream_end)) - return FALSE; + return false; const std::uintmax_t cur_size = stream_end - cur_archive.stream_begin; if (cur_size < pBlk->offset + offset_table_bytesize) { if (cur_size < pBlk->offset) { std::unique_ptr filler(new char[pBlk->offset - cur_size]); if (!cur_archive.stream.write(filler.get(), pBlk->offset - cur_size)) - return FALSE; + return false; } if (!cur_archive.stream.write(reinterpret_cast(sectoroffsettable.get()), offset_table_bytesize)) - return FALSE; + return false; } else { if (!cur_archive.stream.seekp(pBlk->offset + offset_table_bytesize, std::ios::beg)) - return FALSE; + return false; } #endif @@ -583,7 +583,7 @@ static bool mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, pbData += len; len = PkwareCompress(mpq_buf, len); if (!cur_archive.stream.write((char *)mpq_buf, len)) - return FALSE; + return false; sectoroffsettable[cur_sector++] = SwapLE32(destsize); destsize += len; // compressed length if (dwLen > kSectorSize) @@ -594,11 +594,11 @@ static bool mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, sectoroffsettable[num_sectors] = SwapLE32(destsize); if (!cur_archive.stream.seekp(pBlk->offset, std::ios::beg)) - return FALSE; + return false; if (!cur_archive.stream.write(reinterpret_cast(sectoroffsettable.get()), offset_table_bytesize)) - return FALSE; + return false; if (!cur_archive.stream.seekp(destsize - offset_table_bytesize, std::ios::cur)) - return FALSE; + return false; if (destsize < pBlk->sizealloc) { const uint32_t block_size = pBlk->sizealloc - destsize; @@ -607,7 +607,7 @@ static bool mpqapi_write_file_contents(const char *pszName, const BYTE *pbData, mpqapi_alloc_block(pBlk->sizealloc + pBlk->offset, block_size); } } - return TRUE; + return true; } bool mpqapi_write_file(const char *pszName, const BYTE *pbData, DWORD dwLen) @@ -619,9 +619,9 @@ bool mpqapi_write_file(const char *pszName, const BYTE *pbData, DWORD dwLen) blockEntry = mpqapi_add_file(pszName, 0, 0); if (!mpqapi_write_file_contents(pszName, pbData, dwLen, blockEntry)) { mpqapi_remove_hash_entry(pszName); - return FALSE; + return false; } - return TRUE; + return true; } void mpqapi_rename(char *pszOld, char *pszNew) @@ -654,7 +654,7 @@ bool OpenMPQ(const char *pszArchive, DWORD dwChar) InitHash(); if (!cur_archive.Open(pszArchive)) { - return FALSE; + return false; } if (cur_archive.sgpBlockTbl == NULL || cur_archive.sgpHashTbl == NULL) { if (!cur_archive.exists) { @@ -693,10 +693,10 @@ bool OpenMPQ(const char *pszArchive, DWORD dwChar) cur_archive.WriteHeaderAndTables(); #endif } - return TRUE; + return true; on_error: cur_archive.Close(/*clear_tables=*/true); - return FALSE; + return false; } bool mpqapi_flush_and_close(const char *pszArchive, bool bFree, DWORD dwChar) diff --git a/Source/msg.cpp b/Source/msg.cpp index 204c9c7d..68e3efb0 100644 --- a/Source/msg.cpp +++ b/Source/msg.cpp @@ -153,22 +153,22 @@ bool msg_wait_resync() gbBufferMsgs = 0; if (!success) { msg_free_packets(); - return FALSE; + return false; } if (gbGameDestroyed) { DrawDlg("The game ended"); msg_free_packets(); - return FALSE; + return false; } if (sgbDeltaChunks != MAX_CHUNKS) { DrawDlg("Unable to get level data"); msg_free_packets(); - return FALSE; + return false; } - return TRUE; + return true; } void run_delta_info() @@ -287,13 +287,13 @@ static void DeltaImportJunk(BYTE *src) if (*src == 0xFF) { memset(&sgJunk.portal[i], 0xFF, sizeof(DPortal)); src++; - SetPortalStats(i, FALSE, 0, 0, 0, DTYPE_TOWN); + SetPortalStats(i, false, 0, 0, 0, DTYPE_TOWN); } else { memcpy(&sgJunk.portal[i], src, sizeof(DPortal)); src += sizeof(DPortal); SetPortalStats( i, - TRUE, + true, sgJunk.portal[i].x, sgJunk.portal[i].y, sgJunk.portal[i].level, @@ -364,7 +364,7 @@ static void DeltaImportData(BYTE cmd, DWORD recv_offset) } sgbDeltaChunks++; - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; } static DWORD On_DLEVEL(int pnum, TCmd *pCmd) @@ -412,11 +412,11 @@ static DWORD On_DLEVEL(int pnum, TCmd *pCmd) void delta_init() { - sgbDeltaChanged = FALSE; + sgbDeltaChanged = false; memset(&sgJunk, 0xFF, sizeof(sgJunk)); memset(sgLevels, 0xFF, sizeof(sgLevels)); memset(sgLocals, 0, sizeof(sgLocals)); - deltaload = FALSE; + deltaload = false; } void delta_kill_monster(int mi, BYTE x, BYTE y, BYTE bLevel) @@ -424,7 +424,7 @@ void delta_kill_monster(int mi, BYTE x, BYTE y, BYTE bLevel) if (!gbIsMultiplayer) return; - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; DMonsterStr *pD = &sgLevels[bLevel].monster[mi]; pD->_mx = x; pD->_my = y; @@ -437,7 +437,7 @@ void delta_monster_hp(int mi, int hp, BYTE bLevel) if (!gbIsMultiplayer) return; - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; DMonsterStr *pD = &sgLevels[bLevel].monster[mi]; if (pD->_mhitpoints > hp) pD->_mhitpoints = hp; @@ -450,7 +450,7 @@ void delta_sync_monster(const TSyncMonster *pSync, BYTE bLevel) /// ASSERT: assert(pSync != NULL); /// ASSERT: assert(bLevel < NUMLEVELS); - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; DMonsterStr *pD = &sgLevels[bLevel].monster[pSync->_mndx]; if (pD->_mhitpoints == 0) @@ -467,7 +467,7 @@ void delta_sync_golem(TCmdGolem *pG, int pnum, BYTE bLevel) if (!gbIsMultiplayer) return; - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; DMonsterStr *pD = &sgLevels[bLevel].monster[pnum]; pD->_mx = pG->_mx; pD->_my = pG->_my; @@ -490,7 +490,7 @@ void delta_leave_sync(BYTE bLevel) int ma = monstactive[i]; if (monster[ma]._mhitpoints == 0) continue; - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; DMonsterStr *pD = &sgLevels[bLevel].monster[ma]; pD->_mx = monster[ma]._mx; pD->_my = monster[ma]._my; @@ -507,7 +507,7 @@ static void delta_sync_object(int oi, _cmd_id bCmd, BYTE bLevel) if (!gbIsMultiplayer) return; - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; sgLevels[bLevel].object[oi].bCmd = bCmd; } @@ -516,7 +516,7 @@ static bool delta_get_item(TCmdGItem *pI, BYTE bLevel) int i; if (!gbIsMultiplayer) - return TRUE; + return true; TCmdPItem *pD = sgLevels[bLevel].item; for (i = 0; i < MAXITEMS; i++, pD++) { @@ -524,29 +524,29 @@ static bool delta_get_item(TCmdGItem *pI, BYTE bLevel) continue; if (pD->bCmd == CMD_WALKXY) { - return TRUE; + return true; } if (pD->bCmd == CMD_STAND) { - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; pD->bCmd = CMD_WALKXY; - return TRUE; + return true; } if (pD->bCmd == CMD_ACK_PLRINFO) { - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; pD->bCmd = CMD_INVALID; - return TRUE; + return true; } app_fatal("delta:1"); } if ((pI->wCI & CF_PREGEN) == 0) - return FALSE; + return false; pD = sgLevels[bLevel].item; for (i = 0; i < MAXITEMS; i++, pD++) { if (pD->bCmd == CMD_INVALID) { - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; pD->bCmd = CMD_WALKXY; pD->x = pI->x; pD->y = pI->y; @@ -569,7 +569,7 @@ static bool delta_get_item(TCmdGItem *pI, BYTE bLevel) break; } } - return TRUE; + return true; } static void delta_put_item(TCmdPItem *pI, int x, int y, BYTE bLevel) @@ -595,7 +595,7 @@ static void delta_put_item(TCmdPItem *pI, int x, int y, BYTE bLevel) pD = sgLevels[bLevel].item; for (i = 0; i < MAXITEMS; i++, pD++) { if (pD->bCmd == 0xFF) { - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; memcpy(pD, pI, sizeof(TCmdPItem)); pD->bCmd = CMD_ACK_PLRINFO; pD->x = x; @@ -636,7 +636,7 @@ void DeltaAddItem(int ii) pD = sgLevels[currlevel].item; for (i = 0; i < MAXITEMS; i++, pD++) { if (pD->bCmd == 0xFF) { - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; pD->bCmd = CMD_STAND; pD->x = items[ii]._ix; pD->y = items[ii]._iy; @@ -670,7 +670,7 @@ void DeltaSaveLevel() if (i != myplr) plr[i]._pGFXLoad = 0; } - plr[myplr]._pLvlVisited[currlevel] = TRUE; + plr[myplr]._pLvlVisited[currlevel] = true; delta_leave_sync(currlevel); } @@ -684,7 +684,7 @@ void DeltaLoadLevel() if (!gbIsMultiplayer) return; - deltaload = TRUE; + deltaload = true; if (currlevel != 0) { for (i = 0; i < nummonsters; i++) { if (sgLevels[currlevel].monster[i]._mx != 0xFF) { @@ -710,7 +710,7 @@ void DeltaLoadLevel() else AddDead(monster[i]._mx, monster[i]._my, monster[i]._udeadval, (direction)monster[i]._mdir); } - monster[i]._mDelFlag = TRUE; + monster[i]._mDelFlag = true; M_UpdateLeader(i); } else { decode_enemy(i, sgLevels[currlevel].monster[i]._menemy); @@ -766,7 +766,7 @@ void DeltaLoadLevel() sgLevels[currlevel].item[i].wValue, (sgLevels[currlevel].item[i].dwBuff & CF_HELLFIRE) != 0); if (sgLevels[currlevel].item[i].bId) - items[ii]._iIdentified = TRUE; + items[ii]._iIdentified = true; items[ii]._iDurability = sgLevels[currlevel].item[i].bDur; items[ii]._iMaxDur = sgLevels[currlevel].item[i].bMDur; items[ii]._iCharges = sgLevels[currlevel].item[i].bCh; @@ -782,14 +782,14 @@ void DeltaLoadLevel() x = sgLevels[currlevel].item[i].x; y = sgLevels[currlevel].item[i].y; if (!CanPut(x, y)) { - done = FALSE; + done = false; for (k = 1; k < 50 && !done; k++) { for (j = -k; j <= k && !done; j++) { yy = y + j; for (l = -k; l <= k && !done; l++) { xx = x + l; if (CanPut(xx, yy)) { - done = TRUE; + done = true; x = xx; y = yy; } @@ -800,7 +800,7 @@ void DeltaLoadLevel() items[ii]._ix = x; items[ii]._iy = y; dItem[items[ii]._ix][items[ii]._iy] = ii + 1; - RespawnItem(&items[ii], FALSE); + RespawnItem(&items[ii], false); } } } @@ -826,7 +826,7 @@ void DeltaLoadLevel() Obj_Trap(objectactive[i]); } } - deltaload = FALSE; + deltaload = false; } void NetSendCmd(bool bHiPri, _cmd_id bCmd) @@ -1052,11 +1052,11 @@ bool NetSendCmdReq2(_cmd_id bCmd, BYTE mast, BYTE pnum, TCmdGItem *p) if (cmd.dwTime == 0) cmd.dwTime = ticks; else if (ticks - cmd.dwTime > 5000) - return FALSE; + return false; multi_msg_add((BYTE *)&cmd.bCmd, sizeof(cmd)); - return TRUE; + return true; } void NetSendCmdExtra(TCmdGItem *p) @@ -1253,7 +1253,7 @@ static DWORD On_STRING2(int pnum, TCmd *pCmd) static void delta_open_portal(int pnum, BYTE x, BYTE y, BYTE bLevel, dungeon_type bLType, BYTE bSetLvl) { - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; sgJunk.portal[pnum].x = x; sgJunk.portal[pnum].y = y; sgJunk.portal[pnum].level = bLevel; @@ -1264,7 +1264,7 @@ static void delta_open_portal(int pnum, BYTE x, BYTE y, BYTE bLevel, dungeon_typ void delta_close_portal(int pnum) { memset(&sgJunk.portal[pnum], 0xFF, sizeof(sgJunk.portal[pnum])); - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; } static void check_update_plr(int pnum) @@ -1301,7 +1301,7 @@ static DWORD On_WALKXY(TCmd *pCmd, int pnum) if (gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel) { ClrPlrPath(pnum); - MakePlrPath(pnum, p->x, p->y, TRUE); + MakePlrPath(pnum, p->x, p->y, true); plr[pnum].destAction = ACTION_NONE; } @@ -1379,7 +1379,7 @@ static DWORD On_GOTOGETITEM(TCmd *pCmd, int pnum) TCmdLocParam1 *p = (TCmdLocParam1 *)pCmd; if (gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel) { - MakePlrPath(pnum, p->x, p->y, FALSE); + MakePlrPath(pnum, p->x, p->y, false); plr[pnum].destAction = ACTION_PICKUPITEM; plr[pnum].destParam1 = p->wParam1; } @@ -1395,7 +1395,7 @@ static DWORD On_REQUESTGITEM(TCmd *pCmd, int pnum) if (GetItemRecord(p->dwSeed, p->wCI, p->wIndx)) { int ii = FindGetItem(p->wIndx, p->wCI, p->dwSeed); if (ii != -1) { - NetSendCmdGItem2(FALSE, CMD_GETITEM, myplr, p->bPnum, p); + NetSendCmdGItem2(false, CMD_GETITEM, myplr, p->bPnum, p); if (p->bPnum != myplr) SyncGetItem(p->x, p->y, p->wIndx, p->wCI, p->dwSeed); else @@ -1430,7 +1430,7 @@ static DWORD On_GETITEM(TCmd *pCmd, int pnum) SyncGetItem(p->x, p->y, p->wIndx, p->wCI, p->dwSeed); } } else - NetSendCmdGItem2(TRUE, CMD_GETITEM, p->bMaster, p->bPnum, p); + NetSendCmdGItem2(true, CMD_GETITEM, p->bMaster, p->bPnum, p); } return sizeof(*p); @@ -1441,7 +1441,7 @@ static DWORD On_GOTOAGETITEM(TCmd *pCmd, int pnum) TCmdLocParam1 *p = (TCmdLocParam1 *)pCmd; if (gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel) { - MakePlrPath(pnum, p->x, p->y, FALSE); + MakePlrPath(pnum, p->x, p->y, false); plr[pnum].destAction = ACTION_PICKUPAITEM; plr[pnum].destParam1 = p->wParam1; } @@ -1457,7 +1457,7 @@ static DWORD On_REQUESTAGITEM(TCmd *pCmd, int pnum) if (GetItemRecord(p->dwSeed, p->wCI, p->wIndx)) { int ii = FindGetItem(p->wIndx, p->wCI, p->dwSeed); if (ii != -1) { - NetSendCmdGItem2(FALSE, CMD_AGETITEM, myplr, p->bPnum, p); + NetSendCmdGItem2(false, CMD_AGETITEM, myplr, p->bPnum, p); if (p->bPnum != myplr) SyncGetItem(p->x, p->y, p->wIndx, p->wCI, p->dwSeed); else @@ -1492,7 +1492,7 @@ static DWORD On_AGETITEM(TCmd *pCmd, int pnum) SyncGetItem(p->x, p->y, p->wIndx, p->wCI, p->dwSeed); } } else - NetSendCmdGItem2(TRUE, CMD_AGETITEM, p->bMaster, p->bPnum, p); + NetSendCmdGItem2(true, CMD_AGETITEM, p->bMaster, p->bPnum, p); } return sizeof(*p); @@ -1585,7 +1585,7 @@ static DWORD On_ATTACKXY(TCmd *pCmd, int pnum) TCmdLoc *p = (TCmdLoc *)pCmd; if (gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel) { - MakePlrPath(pnum, p->x, p->y, FALSE); + MakePlrPath(pnum, p->x, p->y, false); plr[pnum].destAction = ACTION_ATTACK; plr[pnum].destParam1 = p->x; plr[pnum].destParam2 = p->y; @@ -1695,9 +1695,9 @@ static DWORD On_OPOBJXY(TCmd *pCmd, int pnum) if (gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel) { if (object[p->wParam1]._oSolidFlag || object[p->wParam1]._oDoorFlag) - MakePlrPath(pnum, p->x, p->y, FALSE); + MakePlrPath(pnum, p->x, p->y, false); else - MakePlrPath(pnum, p->x, p->y, TRUE); + MakePlrPath(pnum, p->x, p->y, true); plr[pnum].destAction = ACTION_OPERATE; plr[pnum].destParam1 = p->wParam1; } @@ -1711,9 +1711,9 @@ static DWORD On_DISARMXY(TCmd *pCmd, int pnum) if (gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel) { if (object[p->wParam1]._oSolidFlag || object[p->wParam1]._oDoorFlag) - MakePlrPath(pnum, p->x, p->y, FALSE); + MakePlrPath(pnum, p->x, p->y, false); else - MakePlrPath(pnum, p->x, p->y, TRUE); + MakePlrPath(pnum, p->x, p->y, true); plr[pnum].destAction = ACTION_DISARM; plr[pnum].destParam1 = p->wParam1; } @@ -1741,7 +1741,7 @@ static DWORD On_ATTACKID(TCmd *pCmd, int pnum) int distx = abs(plr[pnum]._px - monster[p->wParam1]._mfutx); int disty = abs(plr[pnum]._py - monster[p->wParam1]._mfuty); if (distx > 1 || disty > 1) - MakePlrPath(pnum, monster[p->wParam1]._mfutx, monster[p->wParam1]._mfuty, FALSE); + MakePlrPath(pnum, monster[p->wParam1]._mfutx, monster[p->wParam1]._mfuty, false); plr[pnum].destAction = ACTION_ATTACKMON; plr[pnum].destParam1 = p->wParam1; } @@ -1754,7 +1754,7 @@ static DWORD On_ATTACKPID(TCmd *pCmd, int pnum) TCmdParam1 *p = (TCmdParam1 *)pCmd; if (gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel) { - MakePlrPath(pnum, plr[p->wParam1]._pfutx, plr[p->wParam1]._pfuty, FALSE); + MakePlrPath(pnum, plr[p->wParam1]._pfutx, plr[p->wParam1]._pfuty, false); plr[pnum].destAction = ACTION_ATTACKPLR; plr[pnum].destParam1 = p->wParam1; } @@ -1913,7 +1913,7 @@ static DWORD On_TALKXY(TCmd *pCmd, int pnum) TCmdLocParam1 *p = (TCmdLocParam1 *)pCmd; if (gbBufferMsgs != 1 && currlevel == plr[pnum].plrlevel) { - MakePlrPath(pnum, p->x, p->y, FALSE); + MakePlrPath(pnum, p->x, p->y, false); plr[pnum].destAction = ACTION_TALK; plr[pnum].destParam1 = p->wParam1; } @@ -1987,11 +1987,11 @@ static DWORD On_AWAKEGOLEM(TCmd *pCmd, int pnum) else if (pnum != myplr) { int i; // check if this player already has an active golem - bool addGolem = TRUE; + bool addGolem = true; for (i = 0; i < nummissiles; i++) { int mi = missileactive[i]; if (missile[mi]._mitype == MIS_GOLEM && missile[mi]._misource == pnum) { - addGolem = FALSE; + addGolem = false; // BUGFIX: break, don't need to check the rest } } @@ -2043,7 +2043,7 @@ static DWORD On_PLRDAMAGE(TCmd *pCmd, int pnum) if (p->bPlr == myplr && currlevel != 0 && gbBufferMsgs != 1) { if (currlevel == plr[pnum].plrlevel && p->dwDam <= 192000 && plr[myplr]._pHitPoints >> 6 > 0) { - drawhpflag = TRUE; + drawhpflag = true; plr[myplr]._pHitPoints -= p->dwDam; plr[myplr]._pHPBase -= p->dwDam; if (plr[myplr]._pHitPoints > plr[myplr]._pMaxHP) { @@ -2206,10 +2206,10 @@ static DWORD On_PLAYER_JOINLEVEL(TCmd *pCmd, int pnum) if (gbBufferMsgs == 1) msg_send_packet(pnum, p, sizeof(*p)); else { - plr[pnum]._pLvlChanging = FALSE; + plr[pnum]._pLvlChanging = false; if (plr[pnum]._pName[0] != 0 && !plr[pnum].plractive) { InitPlrGFXMem(pnum); - plr[pnum].plractive = TRUE; + plr[pnum].plractive = true; gbActivePlayers++; EventPlrMsg("Player '%s' (level %d) just joined the game", plr[pnum]._pName, plr[pnum]._pLevel); } @@ -2255,11 +2255,11 @@ static DWORD On_ACTIVATEPORTAL(TCmd *pCmd, int pnum) if (currlevel == 0) AddInTownPortal(pnum); else if (currlevel == plr[pnum].plrlevel) { - bool addPortal = TRUE; + bool addPortal = true; for (int i = 0; i < nummissiles; i++) { int mi = missileactive[i]; if (missile[mi]._mitype == MIS_TOWN && missile[mi]._misource == pnum) { - addPortal = FALSE; + addPortal = false; // CODEFIX: break } } @@ -2294,7 +2294,7 @@ static DWORD On_RETOWN(TCmd *pCmd, int pnum) msg_send_packet(pnum, pCmd, sizeof(*pCmd)); else { if (pnum == myplr) { - deathflag = FALSE; + deathflag = false; gamemenu_off(); } RestartTownLvl(pnum); @@ -2365,7 +2365,7 @@ static DWORD On_SYNCQUEST(TCmd *pCmd, int pnum) else { if (pnum != myplr) SetMultiQuest(p->q, p->qstate, p->qlog, p->qvar1); - sgbDeltaChanged = TRUE; + sgbDeltaChanged = true; } return sizeof(*p); @@ -2453,7 +2453,7 @@ static DWORD On_NOVA(TCmd *pCmd, int pnum) static DWORD On_SETSHIELD(TCmd *pCmd, int pnum) { if (gbBufferMsgs != 1) - plr[pnum].pManaShield = TRUE; + plr[pnum].pManaShield = true; return sizeof(*pCmd); } @@ -2461,7 +2461,7 @@ static DWORD On_SETSHIELD(TCmd *pCmd, int pnum) static DWORD On_REMSHIELD(TCmd *pCmd, int pnum) { if (gbBufferMsgs != 1) - plr[pnum].pManaShield = FALSE; + plr[pnum].pManaShield = false; return sizeof(*pCmd); } diff --git a/Source/multi.cpp b/Source/multi.cpp index 93a385f2..bde4b77e 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -85,7 +85,7 @@ static BYTE *multi_recv_packet(TBuffer *pBuf, BYTE *body, DWORD *size) if (pBuf->dwNextWriteOffset != 0) { src_ptr = pBuf->bData; - while (TRUE) { + while (true) { if (*src_ptr == 0) break; chunk_size = *src_ptr; @@ -156,7 +156,7 @@ void NetSendHiPri(BYTE *pbMsg, BYTE bLen) multi_send_packet(pbMsg, bLen); } if (!gbShouldValidatePackage) { - gbShouldValidatePackage = TRUE; + gbShouldValidatePackage = true; NetRecvPlrData(&pkt); size = gdwNormalMsgSize - sizeof(TPktHdr); hipri_body = multi_recv_packet(&sgHiPriBuf, pkt.body, &size); @@ -209,7 +209,7 @@ static void multi_handle_turn_upper_bit(int pnum) } if (myplr == i) { - sgbSendDeltaTbl[pnum] = TRUE; + sgbSendDeltaTbl[pnum] = true; } else if (myplr == pnum) { gbDeltaSender = i; } @@ -257,7 +257,7 @@ static void multi_player_left_msg(int pnum, int left) switch (sgdwPlayerLeftReasonTbl[pnum]) { case LEAVE_ENDING: pszFmt = "Player '%s' killed Diablo and left the game!"; - gbSomebodyWonGameKludge = TRUE; + gbSomebodyWonGameKludge = true; break; case LEAVE_DROP: pszFmt = "Player '%s' dropped due to timeout"; @@ -265,7 +265,7 @@ static void multi_player_left_msg(int pnum, int left) } EventPlrMsg(pszFmt, plr[pnum]._pName); } - plr[pnum].plractive = FALSE; + plr[pnum].plractive = false; plr[pnum]._pName[0] = '\0'; FreePlayerGFX(pnum); gbActivePlayers--; @@ -283,7 +283,7 @@ static void multi_clear_left_tbl() else multi_player_left_msg(i, 1); - sgbPlayerLeftGameTbl[i] = FALSE; + sgbPlayerLeftGameTbl[i] = false; sgdwPlayerLeftReasonTbl[i] = 0; } } @@ -291,14 +291,14 @@ static void multi_clear_left_tbl() void multi_player_left(int pnum, int reason) { - sgbPlayerLeftGameTbl[pnum] = TRUE; + sgbPlayerLeftGameTbl[pnum] = true; sgdwPlayerLeftReasonTbl[pnum] = reason; multi_clear_left_tbl(); } void multi_net_ping() { - sgbTimeout = TRUE; + sgbTimeout = true; sglTimeoutStart = SDL_GetTicks(); } @@ -329,7 +329,7 @@ static void multi_begin_timeout() nTicks = SDL_GetTicks() - sglTimeoutStart; if (nTicks > 20000) { - gbRunGame = FALSE; + gbRunGame = false; return; } if (nTicks < 10000) { @@ -362,10 +362,10 @@ static void multi_begin_timeout() /// ASSERT: assert(nLowestPlayer != -1); if (bGroupPlayers < bGroupCount) { - gbGameDestroyed = TRUE; + gbGameDestroyed = true; } else if (bGroupPlayers == bGroupCount) { if (nLowestPlayer != nLowestActive) { - gbGameDestroyed = TRUE; + gbGameDestroyed = true; } else if (nLowestActive == myplr) { multi_check_drop_player(); } @@ -383,13 +383,13 @@ int multi_handle_delta() bool received; if (gbGameDestroyed) { - gbRunGame = FALSE; - return FALSE; + gbRunGame = false; + return false; } for (i = 0; i < MAX_PLRS; i++) { if (sgbSendDeltaTbl[i]) { - sgbSendDeltaTbl[i] = FALSE; + sgbSendDeltaTbl[i] = false; DeltaExportData(i); } } @@ -397,23 +397,23 @@ int multi_handle_delta() sgbSentThisCycle = nthread_send_and_recv_turn(sgbSentThisCycle, 1); if (!nthread_recv_turns(&received)) { multi_begin_timeout(); - return FALSE; + return false; } - sgbTimeout = FALSE; + sgbTimeout = false; if (received) { if (!gbShouldValidatePackage) { NetSendHiPri(0, 0); - gbShouldValidatePackage = FALSE; + gbShouldValidatePackage = false; } else { - gbShouldValidatePackage = FALSE; + gbShouldValidatePackage = false; if (!multi_check_pkt_valid(&sgHiPriBuf)) NetSendHiPri(0, 0); } } multi_mon_seeds(); - return TRUE; + return true; } static void multi_handle_all_packets(int pnum, BYTE *pData, int nSize) @@ -494,7 +494,7 @@ void multi_process_network_packets() plr[dwID]._pfutx = plr[dwID]._px; plr[dwID]._pfuty = plr[dwID]._py; } - MakePlrPath(dwID, pkt->targx, pkt->targy, TRUE); + MakePlrPath(dwID, pkt->targx, pkt->targy, true); } else { plr[dwID]._px = pkt->px; plr[dwID]._py = pkt->py; @@ -580,7 +580,7 @@ static void multi_send_pinfo(int pnum, char cmd) { PkPlayerStruct pkplr; - PackPlayer(&pkplr, myplr, TRUE); + PackPlayer(&pkplr, myplr, true); dthread_send_delta(pnum, cmd, &pkplr, sizeof(pkplr)); } @@ -611,7 +611,7 @@ static void SetupLocalCoords() if (!leveldebug || gbIsMultiplayer) { currlevel = 0; leveltype = DTYPE_TOWN; - setlevel = FALSE; + setlevel = false; } x = 75; y = 68; @@ -630,7 +630,7 @@ static void SetupLocalCoords() plr[myplr]._ptargx = x; plr[myplr]._ptargy = y; plr[myplr].plrlevel = currlevel; - plr[myplr]._pLvlChanging = TRUE; + plr[myplr]._pLvlChanging = true; plr[myplr].pLvlLoad = 0; plr[myplr]._pmode = PM_NEWLVL; plr[myplr].destAction = ACTION_NONE; @@ -642,7 +642,7 @@ static bool multi_upgrade(bool *pfExitProgram) int status; SNetPerformUpgrade((LPDWORD)&status); - result = TRUE; + result = true; if (status && status != 1) { if (status != 2) { if (status == -1) { @@ -652,7 +652,7 @@ static bool multi_upgrade(bool *pfExitProgram) *pfExitProgram = 1; } - result = FALSE; + result = false; } return result; @@ -669,21 +669,21 @@ static void multi_handle_events(_SNETEVENT *pEvt) if (gameData->size != sizeof(GameData)) app_fatal("Invalid size of game data: %d", gameData->size); sgGameInitInfo = *gameData; - sgbPlayerTurnBitTbl[pEvt->playerid] = TRUE; + sgbPlayerTurnBitTbl[pEvt->playerid] = true; break; } case EVENT_TYPE_PLAYER_LEAVE_GAME: - sgbPlayerLeftGameTbl[pEvt->playerid] = TRUE; - sgbPlayerTurnBitTbl[pEvt->playerid] = FALSE; + sgbPlayerLeftGameTbl[pEvt->playerid] = true; + sgbPlayerTurnBitTbl[pEvt->playerid] = false; LeftReason = 0; if (pEvt->data && pEvt->databytes >= sizeof(DWORD)) LeftReason = *(DWORD *)pEvt->data; sgdwPlayerLeftReasonTbl[pEvt->playerid] = LeftReason; if (LeftReason == LEAVE_ENDING) - gbSomebodyWonGameKludge = TRUE; + gbSomebodyWonGameKludge = true; - sgbSendDeltaTbl[pEvt->playerid] = FALSE; + sgbSendDeltaTbl[pEvt->playerid] = false; dthread_remove_player(pEvt->playerid); if (gbDeltaSender == pEvt->playerid) @@ -718,11 +718,11 @@ void NetClose() return; } - sgbNetInited = FALSE; + sgbNetInited = false; nthread_cleanup(); dthread_cleanup(); tmsg_cleanup(); - multi_event_handler(FALSE); + multi_event_handler(false); SNetLeaveGame(3); if (gbIsMultiplayer) SDL_Delay(2000); @@ -731,7 +731,7 @@ void NetClose() bool NetInit(bool bSinglePlayer, bool *pfExitProgram) { while (1) { - *pfExitProgram = FALSE; + *pfExitProgram = false; SetRndSeed(0); sgGameInitInfo.size = sizeof(sgGameInitInfo); sgGameInitInfo.dwSeed = time(NULL); @@ -746,7 +746,7 @@ bool NetInit(bool bSinglePlayer, bool *pfExitProgram) sgGameInitInfo.bCowQuest = sgOptions.Gameplay.bCowQuest; sgGameInitInfo.bFriendlyFire = sgOptions.Gameplay.bFriendlyFire; memset(sgbPlayerTurnBitTbl, 0, sizeof(sgbPlayerTurnBitTbl)); - gbGameDestroyed = FALSE; + gbGameDestroyed = false; memset(sgbPlayerLeftGameTbl, 0, sizeof(sgbPlayerLeftGameTbl)); memset(sgdwPlayerLeftReasonTbl, 0, sizeof(sgdwPlayerLeftReasonTbl)); memset(sgbSendDeltaTbl, 0, sizeof(sgbSendDeltaTbl)); @@ -755,18 +755,18 @@ bool NetInit(bool bSinglePlayer, bool *pfExitProgram) SNetSetBasePlayer(0); if (bSinglePlayer) { if (!multi_init_single(&sgGameInitInfo)) - return FALSE; + return false; } else { if (!multi_init_multi(&sgGameInitInfo, pfExitProgram)) - return FALSE; + return false; } - sgbNetInited = TRUE; - sgbTimeout = FALSE; + sgbNetInited = true; + sgbTimeout = false; delta_init(); InitPlrMsg(); buffer_init(&sgHiPriBuf); buffer_init(&sgLoPriBuf); - gbShouldValidatePackage = FALSE; + gbShouldValidatePackage = false; sync_init(); nthread_start(sgbPlayerTurnBitTbl[myplr]); dthread_start(); @@ -774,19 +774,19 @@ bool NetInit(bool bSinglePlayer, bool *pfExitProgram) sgdwGameLoops = 0; sgbSentThisCycle = 0; gbDeltaSender = myplr; - gbSomebodyWonGameKludge = FALSE; + gbSomebodyWonGameKludge = false; nthread_send_and_recv_turn(0, 0); SetupLocalCoords(); multi_send_pinfo(-2, CMD_SEND_PLRINFO); InitPlrGFXMem(myplr); - plr[myplr].plractive = TRUE; + plr[myplr].plractive = true; gbActivePlayers = 1; - if (sgbPlayerTurnBitTbl[myplr] == FALSE || msg_wait_resync()) + if (sgbPlayerTurnBitTbl[myplr] == false || msg_wait_resync()) break; NetClose(); - gbSelectProvider = FALSE; + gbSelectProvider = false; } SetRndSeed(sgGameInitInfo.dwSeed); gnDifficulty = sgGameInitInfo.nDifficulty; @@ -806,7 +806,7 @@ bool NetInit(bool bSinglePlayer, bool *pfExitProgram) if (!SNetGetGameInfo(GAMEINFO_PASSWORD, szPlayerDescript, 128)) nthread_terminate_game("SNetGetGameInfo2"); - return TRUE; + return true; } bool multi_init_single(GameData *gameData) @@ -815,7 +815,7 @@ bool multi_init_single(GameData *gameData) if (!SNetInitializeProvider(SELCONN_LOOPBACK, gameData)) { SErrGetLastError(); - return FALSE; + return false; } unused = 0; @@ -826,7 +826,7 @@ bool multi_init_single(GameData *gameData) myplr = 0; gbIsMultiplayer = false; - return TRUE; + return true; } bool multi_init_multi(GameData *gameData, bool *pfExitProgram) @@ -834,30 +834,30 @@ bool multi_init_multi(GameData *gameData, bool *pfExitProgram) bool first; int playerId; - for (first = TRUE;; first = FALSE) { + for (first = true;; first = false) { if (gbSelectProvider) { if (!UiSelectProvider(gameData) && (!first || SErrGetLastError() != STORM_ERROR_REQUIRES_UPGRADE || !multi_upgrade(pfExitProgram))) { - return FALSE; + return false; } } - multi_event_handler(TRUE); + multi_event_handler(true); if (UiSelectGame(gameData, &playerId)) break; - gbSelectProvider = TRUE; + gbSelectProvider = true; } if ((DWORD)playerId >= MAX_PLRS) { - return FALSE; + return false; } else { myplr = playerId; gbIsMultiplayer = true; pfile_read_player_from_save(); - return TRUE; + return true; } } @@ -888,17 +888,17 @@ void recv_plrinfo(int pnum, TCmdPlrInfoHdr *p, bool recv) sgwPackPlrOffsetTbl[pnum] = 0; multi_player_left_msg(pnum, 0); - UnPackPlayer(&netplr[pnum], pnum, TRUE); + UnPackPlayer(&netplr[pnum], pnum, true); if (!recv) { return; } InitPlrGFXMem(pnum); - plr[pnum].plractive = TRUE; + plr[pnum].plractive = true; gbActivePlayers++; - if (sgbPlayerTurnBitTbl[pnum] != FALSE) { + if (sgbPlayerTurnBitTbl[pnum] != false) { szEvent = "Player '%s' (level %d) just joined the game"; } else { szEvent = "Player '%s' (level %d) is already in the game"; diff --git a/Source/nthread.cpp b/Source/nthread.cpp index 0d4e3619..3fa8bf9b 100644 --- a/Source/nthread.cpp +++ b/Source/nthread.cpp @@ -36,9 +36,9 @@ void nthread_terminate_game(const char *pszFcn) if (sErr == STORM_ERROR_INVALID_PLAYER) { return; } else if (sErr == STORM_ERROR_GAME_TERMINATED) { - gbGameDestroyed = TRUE; + gbGameDestroyed = true; } else if (sErr == STORM_ERROR_NOT_IN_GAME) { - gbGameDestroyed = TRUE; + gbGameDestroyed = true; } else { app_fatal("%s:\n%s", pszFcn, SDL_GetError()); } @@ -75,40 +75,40 @@ DWORD nthread_send_and_recv_turn(DWORD cur_turn, int turn_delta) bool nthread_recv_turns(bool *pfSendAsync) { - *pfSendAsync = FALSE; + *pfSendAsync = false; sgbPacketCountdown--; if (sgbPacketCountdown) { last_tick += gnTickDelay; - return TRUE; + return true; } sgbSyncCountdown--; sgbPacketCountdown = sgbNetUpdateRate; if (sgbSyncCountdown != 0) { - *pfSendAsync = TRUE; + *pfSendAsync = true; last_tick += gnTickDelay; - return TRUE; + return true; } #ifdef __3DS__ - return FALSE; + return false; #else if (!SNetReceiveTurns(0, MAX_PLRS, (char **)glpMsgTbl, gdwMsgLenTbl, (LPDWORD)player_state)) { if (SErrGetLastError() != STORM_ERROR_NO_MESSAGES_WAITING) nthread_terminate_game("SNetReceiveTurns"); - sgbTicsOutOfSync = FALSE; + sgbTicsOutOfSync = false; sgbSyncCountdown = 1; sgbPacketCountdown = 1; - return FALSE; + return false; } else { if (!sgbTicsOutOfSync) { - sgbTicsOutOfSync = TRUE; + sgbTicsOutOfSync = true; last_tick = SDL_GetTicks(); } sgbSyncCountdown = 4; multi_msg_countdown(); - *pfSendAsync = TRUE; + *pfSendAsync = true; last_tick += gnTickDelay; - return TRUE; + return true; } #endif } @@ -153,7 +153,7 @@ void nthread_start(bool set_turn_upper_bit) last_tick = SDL_GetTicks(); sgbPacketCountdown = 1; sgbSyncCountdown = 1; - sgbTicsOutOfSync = TRUE; + sgbTicsOutOfSync = true; if (set_turn_upper_bit) nthread_set_turn_upper_bit(); else @@ -188,9 +188,9 @@ void nthread_start(bool set_turn_upper_bit) if (gdwNormalMsgSize > largestMsgSize) gdwNormalMsgSize = largestMsgSize; if (gbIsMultiplayer) { - sgbThreadIsRunning = FALSE; + sgbThreadIsRunning = false; sgMemCrit.Enter(); - nthread_should_run = TRUE; + nthread_should_run = true; sghThread = CreateThread(nthread_handler, &glpNThreadId); if (sghThread == NULL) { err2 = SDL_GetError(); @@ -201,7 +201,7 @@ void nthread_start(bool set_turn_upper_bit) void nthread_cleanup() { - nthread_should_run = FALSE; + nthread_should_run = false; gdwTurnsInTransit = 0; gdwNormalMsgSize = 0; gdwLargestMsgSize = 0; diff --git a/Source/objdat.cpp b/Source/objdat.cpp index 97620ca9..cf5921b8 100644 --- a/Source/objdat.cpp +++ b/Source/objdat.cpp @@ -154,106 +154,106 @@ const _object_id ObjTypeConv[] = { const ObjDataStruct AllObjects[] = { // clang-format off // oload, ofindex, ominlvl, omaxlvl, olvltype, otheme, oquest, oAnimFlag, oAnimDelay, oAnimLen, oAnimWidth, oSolidFlag, oMissFlag, oLightFlag, oBreak, oSelFlag, oTrapFlag - { 1, OFILE_L1BRAZ, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 1, 1, 26, 64, TRUE, TRUE, FALSE, 0, 0, FALSE }, - { 1, OFILE_L1DOORS, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 0, 64, FALSE, FALSE, TRUE, 0, 3, TRUE }, - { 1, OFILE_L1DOORS, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 2, 0, 64, FALSE, FALSE, TRUE, 0, 3, TRUE }, - { 3, OFILE_SKULFIRE, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, 1, 2, 11, 96, TRUE, TRUE, FALSE, 0, 0, FALSE }, - { 1, OFILE_LEVER, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 1, 96, TRUE, TRUE, TRUE, 0, 1, TRUE }, - { 1, OFILE_CHEST1, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 1, TRUE }, - { 1, OFILE_CHEST2, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 1, TRUE }, - { 1, OFILE_CHEST3, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 1, TRUE }, - { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, FALSE, FALSE, FALSE, 0, 0, FALSE }, - { 3, OFILE_CANDLE2, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_INVALID, 1, 2, 4, 96, TRUE, TRUE, TRUE, 0, 0, FALSE }, - { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, FALSE, FALSE, FALSE, 0, 0, FALSE }, - { 3, OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, 0, 2, 0, 96, TRUE, TRUE, TRUE, 0, 0, FALSE }, - { 3, OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 0, FALSE }, - { 3, OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, 0, 3, 0, 96, TRUE, TRUE, TRUE, 0, 0, FALSE }, - { 2, OFILE_SKULPILE, 1, 4, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 1, 96, TRUE, TRUE, TRUE, 0, 0, FALSE }, - { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, FALSE, FALSE, FALSE, 0, 0, FALSE }, - { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, FALSE, FALSE, FALSE, 0, 0, FALSE }, - { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, FALSE, FALSE, FALSE, 0, 0, FALSE }, - { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, FALSE, FALSE, FALSE, 0, 0, FALSE }, - { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, FALSE, FALSE, FALSE, 0, 0, FALSE }, - { 2, OFILE_CRUXSK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 15, 96, TRUE, FALSE, TRUE, 1, 3, FALSE }, - { 2, OFILE_CRUXSK2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 15, 96, TRUE, FALSE, TRUE, 1, 3, FALSE }, - { 2, OFILE_CRUXSK3, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 15, 96, TRUE, FALSE, TRUE, 1, 3, FALSE }, - { 1, OFILE_ROCKSTAN, 5, 5, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 0, FALSE }, - { 2, OFILE_ANGEL, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 2, OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 2, OFILE_BURNCROS, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 1, 0, 10, 160, TRUE, FALSE, FALSE, 0, 0, FALSE }, - { 2, OFILE_NUDE2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 1, 3, 6, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_SWITCH4, 16, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 1, TRUE }, - { 1, OFILE_TNUDEM, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 1, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TNUDEM, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 2, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TNUDEM, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 3, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TNUDEM, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 4, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TNUDEW, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 1, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TNUDEW, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 2, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TNUDEW, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 3, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TSOUL, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 1, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TSOUL, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 2, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TSOUL, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 3, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TSOUL, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 4, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TSOUL, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 5, 0, 128, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_BOOK2, 6, 6, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 4, 0, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 1, OFILE_L2DOORS, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 0, 1, 0, 64, FALSE, FALSE, TRUE, 0, 3, TRUE }, - { 1, OFILE_L2DOORS, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 0, 2, 0, 64, FALSE, FALSE, TRUE, 0, 3, TRUE }, - { 1, OFILE_WTORCH4, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 1, 1, 9, 96, FALSE, TRUE, FALSE, 0, 0, FALSE }, - { 1, OFILE_WTORCH3, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 1, 1, 9, 96, FALSE, TRUE, FALSE, 0, 0, FALSE }, - { 1, OFILE_WTORCH1, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 1, 1, 9, 96, FALSE, TRUE, FALSE, 0, 0, FALSE }, - { 1, OFILE_WTORCH2, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 1, 1, 9, 96, FALSE, TRUE, FALSE, 0, 0, FALSE }, - { 1, OFILE_SARC, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 5, 128, TRUE, TRUE, TRUE, 0, 3, TRUE }, - { 2, OFILE_FLAME1, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 20, 96, FALSE, TRUE, TRUE, 0, 0, FALSE }, - { 2, OFILE_LEVER, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 2, 96, TRUE, TRUE, TRUE, 0, 1, TRUE }, - { 2, OFILE_MINIWATR, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 1, 1, 10, 64, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_BOOK1, 3, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 1, OFILE_TRAPHOLE, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 64, FALSE, TRUE, TRUE, 0, 0, FALSE }, - { 1, OFILE_TRAPHOLE, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 2, 0, 64, FALSE, TRUE, TRUE, 0, 0, FALSE }, - { 2, OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 2, OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 1, OFILE_BARREL, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 9, 96, TRUE, TRUE, TRUE, 1, 3, FALSE }, - { 1, OFILE_BARRELEX, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 10, 96, TRUE, TRUE, TRUE, 1, 3, FALSE }, - { 3, OFILE_LSHRINEG, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_INVALID, 0, 1, 11, 128, FALSE, FALSE, TRUE, 0, 3, FALSE }, - { 3, OFILE_RSHRINEG, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_INVALID, 0, 1, 11, 128, FALSE, FALSE, TRUE, 0, 3, FALSE }, - { 3, OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, 0, 4, 0, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 3, OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, 0, 3, 0, 96, FALSE, FALSE, TRUE, 0, 3, FALSE }, - { 3, OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, 0, 4, 0, 96, FALSE, FALSE, TRUE, 0, 3, FALSE }, - { 3, OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 3, OFILE_CANDLE2, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, 1, 2, 4, 96, TRUE, TRUE, TRUE, 0, 0, FALSE }, - { 3, OFILE_BLOODFNT, 0, 0, DTYPE_NONE, THEME_BLOODFOUNTAIN, Q_INVALID, 1, 2, 10, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 1, OFILE_DECAP, 13, 16, DTYPE_NONE, THEME_DECAPITATED, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 1, FALSE }, - { 1, OFILE_CHEST1, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 1, TRUE }, - { 1, OFILE_CHEST2, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 1, TRUE }, - { 1, OFILE_CHEST3, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 1, TRUE }, - { 1, OFILE_BOOK1, 7, 7, DTYPE_CATACOMBS, THEME_NONE, Q_BLIND, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 1, OFILE_BOOK1, 5, 5, DTYPE_CATACOMBS, THEME_NONE, Q_BLOOD, 0, 4, 0, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 1, OFILE_PEDISTL, 5, 5, DTYPE_CATACOMBS, THEME_NONE, Q_BLOOD, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 1, OFILE_L3DOORS, 9, 12, DTYPE_CAVES, THEME_NONE, Q_INVALID, 0, 1, 0, 64, FALSE, FALSE, TRUE, 0, 3, TRUE }, - { 1, OFILE_L3DOORS, 9, 12, DTYPE_CAVES, THEME_NONE, Q_INVALID, 0, 2, 0, 64, FALSE, FALSE, TRUE, 0, 3, TRUE }, - { 3, OFILE_PFOUNTN, 0, 0, DTYPE_NONE, THEME_PURIFYINGFOUNTAIN, Q_INVALID, 1, 2, 10, 128, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 3, OFILE_ARMSTAND, 0, 0, DTYPE_NONE, THEME_ARMORSTAND, Q_INVALID, 0, 1, 0, 96, TRUE, FALSE, TRUE, 0, 3, FALSE }, - { 3, OFILE_ARMSTAND, 0, 0, DTYPE_NONE, THEME_ARMORSTAND, Q_INVALID, 0, 2, 0, 96, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 3, OFILE_GOATSHRN, 0, 0, DTYPE_NONE, THEME_GOATSHRINE, Q_INVALID, 1, 2, 10, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 1, OFILE_CAULDREN, 13, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, FALSE, TRUE, 0, 3, FALSE }, - { 3, OFILE_MFOUNTN, 0, 0, DTYPE_NONE, THEME_MURKYFOUNTAIN, Q_INVALID, 1, 2, 10, 128, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 3, OFILE_TFOUNTN, 0, 0, DTYPE_NONE, THEME_TEARFOUNTAIN, Q_INVALID, 1, 2, 4, 128, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 1, OFILE_ALTBOY, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_BETRAYER, 0, 1, 0, 128, TRUE, TRUE, TRUE, 0, 0, FALSE }, - { 1, OFILE_MCIRL, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_BETRAYER, 0, 1, 0, 96, FALSE, TRUE, TRUE, 0, 0, FALSE }, - { 1, OFILE_MCIRL, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_BETRAYER, 0, 1, 0, 96, FALSE, TRUE, TRUE, 0, 0, FALSE }, - { 1, OFILE_BKSLBRNT, 1, 12, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, // BUGFIX should only be loaded on level 1-12 (crypt masks as 1-4) (fixed) - { 1, OFILE_CANDLE2, 2, 12, DTYPE_NONE, THEME_NONE, Q_BETRAYER, 1, 2, 4, 96, TRUE, TRUE, TRUE, 0, 0, FALSE }, - { 1, OFILE_BOOK1, 13, 13, DTYPE_HELL, THEME_NONE, Q_WARLORD, 0, 4, 0, 96, TRUE, TRUE, TRUE, 0, 3, FALSE }, - { 1, OFILE_ARMSTAND, 13, 13, DTYPE_NONE, THEME_NONE, Q_WARLORD, 0, 1, 0, 96, TRUE, FALSE, TRUE, 0, 3, FALSE }, - { 2, OFILE_WEAPSTND, 13, 13, DTYPE_NONE, THEME_NONE, Q_WARLORD, 0, 1, 0, 96, TRUE, FALSE, TRUE, 0, 3, FALSE }, - { 2, OFILE_BURNCROS, 0, 0, DTYPE_NONE, THEME_BRNCROSS, Q_INVALID, 1, 0, 10, 160, TRUE, FALSE, FALSE, 0, 0, FALSE }, - { 2, OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_WEAPONRACK, Q_INVALID, 0, 1, 0, 96, TRUE, FALSE, TRUE, 0, 3, FALSE }, - { 2, OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_WEAPONRACK, Q_INVALID, 0, 2, 0, 96, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { 2, OFILE_MUSHPTCH, 0, 0, DTYPE_NONE, THEME_NONE, Q_MUSHROOM, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 3, TRUE }, - { 2, OFILE_LZSTAND, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, 0, 1, 0, 128, TRUE, FALSE, TRUE, 0, 3, FALSE }, - { 1, OFILE_DECAP, 9, 9, DTYPE_CAVES, THEME_NONE, Q_INVALID, 0, 2, 0, 96, TRUE, TRUE, TRUE, 0, 1, FALSE }, - { 2, OFILE_CHEST3, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 1, TRUE }, - { 2, OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 2, 0, 96, TRUE, FALSE, TRUE, 0, 0, FALSE }, - { -1, OFILE_NULL, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, FALSE, FALSE, FALSE, 0, 0, FALSE }, + { 1, OFILE_L1BRAZ, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 1, 1, 26, 64, true, true, false, 0, 0, false }, + { 1, OFILE_L1DOORS, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 0, 64, false, false, true, 0, 3, true }, + { 1, OFILE_L1DOORS, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 2, 0, 64, false, false, true, 0, 3, true }, + { 3, OFILE_SKULFIRE, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, 1, 2, 11, 96, true, true, false, 0, 0, false }, + { 1, OFILE_LEVER, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 1, 96, true, true, true, 0, 1, true }, + { 1, OFILE_CHEST1, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 1, true }, + { 1, OFILE_CHEST2, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 1, true }, + { 1, OFILE_CHEST3, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 1, true }, + { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, false, false, false, 0, 0, false }, + { 3, OFILE_CANDLE2, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_INVALID, 1, 2, 4, 96, true, true, true, 0, 0, false }, + { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, false, false, false, 0, 0, false }, + { 3, OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, 0, 2, 0, 96, true, true, true, 0, 0, false }, + { 3, OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 0, false }, + { 3, OFILE_BANNER, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, 0, 3, 0, 96, true, true, true, 0, 0, false }, + { 2, OFILE_SKULPILE, 1, 4, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 1, 96, true, true, true, 0, 0, false }, + { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, false, false, false, 0, 0, false }, + { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, false, false, false, 0, 0, false }, + { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, false, false, false, 0, 0, false }, + { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, false, false, false, 0, 0, false }, + { 2, OFILE_L1BRAZ, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, false, false, false, 0, 0, false }, + { 2, OFILE_CRUXSK1, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 15, 96, true, false, true, 1, 3, false }, + { 2, OFILE_CRUXSK2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 15, 96, true, false, true, 1, 3, false }, + { 2, OFILE_CRUXSK3, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 15, 96, true, false, true, 1, 3, false }, + { 1, OFILE_ROCKSTAN, 5, 5, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 0, false }, + { 2, OFILE_ANGEL, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, false, true, 0, 0, false }, + { 2, OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 3, false }, + { 2, OFILE_BURNCROS, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 1, 0, 10, 160, true, false, false, 0, 0, false }, + { 2, OFILE_NUDE2, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 1, 3, 6, 128, true, false, true, 0, 0, false }, + { 1, OFILE_SWITCH4, 16, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 1, true }, + { 1, OFILE_TNUDEM, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 1, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_TNUDEM, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 2, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_TNUDEM, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 3, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_TNUDEM, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 4, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_TNUDEW, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 1, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_TNUDEW, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 2, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_TNUDEW, 13, 16, DTYPE_NONE, THEME_TORTURE, Q_BUTCHER, 0, 3, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_TSOUL, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 1, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_TSOUL, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 2, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_TSOUL, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 3, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_TSOUL, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 4, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_TSOUL, 13, 16, DTYPE_NONE, THEME_NONE, Q_BUTCHER, 0, 5, 0, 128, true, false, true, 0, 0, false }, + { 1, OFILE_BOOK2, 6, 6, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 4, 0, 96, true, true, true, 0, 3, false }, + { 1, OFILE_L2DOORS, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 0, 1, 0, 64, false, false, true, 0, 3, true }, + { 1, OFILE_L2DOORS, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 0, 2, 0, 64, false, false, true, 0, 3, true }, + { 1, OFILE_WTORCH4, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 1, 1, 9, 96, false, true, false, 0, 0, false }, + { 1, OFILE_WTORCH3, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 1, 1, 9, 96, false, true, false, 0, 0, false }, + { 1, OFILE_WTORCH1, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 1, 1, 9, 96, false, true, false, 0, 0, false }, + { 1, OFILE_WTORCH2, 5, 8, DTYPE_CATACOMBS, THEME_NONE, Q_INVALID, 1, 1, 9, 96, false, true, false, 0, 0, false }, + { 1, OFILE_SARC, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 5, 128, true, true, true, 0, 3, true }, + { 2, OFILE_FLAME1, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 20, 96, false, true, true, 0, 0, false }, + { 2, OFILE_LEVER, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 2, 96, true, true, true, 0, 1, true }, + { 2, OFILE_MINIWATR, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 1, 1, 10, 64, true, false, true, 0, 0, false }, + { 1, OFILE_BOOK1, 3, 4, DTYPE_CATHEDRAL, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 3, false }, + { 1, OFILE_TRAPHOLE, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 64, false, true, true, 0, 0, false }, + { 1, OFILE_TRAPHOLE, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 2, 0, 64, false, true, true, 0, 0, false }, + { 2, OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, false, true, 0, 0, false }, + { 2, OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, false, true, 0, 0, false }, + { 1, OFILE_BARREL, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 9, 96, true, true, true, 1, 3, false }, + { 1, OFILE_BARRELEX, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 10, 96, true, true, true, 1, 3, false }, + { 3, OFILE_LSHRINEG, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_INVALID, 0, 1, 11, 128, false, false, true, 0, 3, false }, + { 3, OFILE_RSHRINEG, 0, 0, DTYPE_NONE, THEME_SHRINE, Q_INVALID, 0, 1, 11, 128, false, false, true, 0, 3, false }, + { 3, OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_SKELROOM, Q_INVALID, 0, 4, 0, 96, true, true, true, 0, 3, false }, + { 3, OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, 0, 3, 0, 96, false, false, true, 0, 3, false }, + { 3, OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, 0, 4, 0, 96, false, false, true, 0, 3, false }, + { 3, OFILE_BOOK2, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 3, false }, + { 3, OFILE_CANDLE2, 0, 0, DTYPE_NONE, THEME_LIBRARY, Q_INVALID, 1, 2, 4, 96, true, true, true, 0, 0, false }, + { 3, OFILE_BLOODFNT, 0, 0, DTYPE_NONE, THEME_BLOODFOUNTAIN, Q_INVALID, 1, 2, 10, 96, true, true, true, 0, 3, false }, + { 1, OFILE_DECAP, 13, 16, DTYPE_NONE, THEME_DECAPITATED, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 1, false }, + { 1, OFILE_CHEST1, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 1, true }, + { 1, OFILE_CHEST2, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 1, true }, + { 1, OFILE_CHEST3, 1, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 1, true }, + { 1, OFILE_BOOK1, 7, 7, DTYPE_CATACOMBS, THEME_NONE, Q_BLIND, 0, 1, 0, 96, true, true, true, 0, 3, false }, + { 1, OFILE_BOOK1, 5, 5, DTYPE_CATACOMBS, THEME_NONE, Q_BLOOD, 0, 4, 0, 96, true, true, true, 0, 3, false }, + { 1, OFILE_PEDISTL, 5, 5, DTYPE_CATACOMBS, THEME_NONE, Q_BLOOD, 0, 1, 0, 96, true, true, true, 0, 3, false }, + { 1, OFILE_L3DOORS, 9, 12, DTYPE_CAVES, THEME_NONE, Q_INVALID, 0, 1, 0, 64, false, false, true, 0, 3, true }, + { 1, OFILE_L3DOORS, 9, 12, DTYPE_CAVES, THEME_NONE, Q_INVALID, 0, 2, 0, 64, false, false, true, 0, 3, true }, + { 3, OFILE_PFOUNTN, 0, 0, DTYPE_NONE, THEME_PURIFYINGFOUNTAIN, Q_INVALID, 1, 2, 10, 128, true, true, true, 0, 3, false }, + { 3, OFILE_ARMSTAND, 0, 0, DTYPE_NONE, THEME_ARMORSTAND, Q_INVALID, 0, 1, 0, 96, true, false, true, 0, 3, false }, + { 3, OFILE_ARMSTAND, 0, 0, DTYPE_NONE, THEME_ARMORSTAND, Q_INVALID, 0, 2, 0, 96, true, false, true, 0, 0, false }, + { 3, OFILE_GOATSHRN, 0, 0, DTYPE_NONE, THEME_GOATSHRINE, Q_INVALID, 1, 2, 10, 96, true, true, true, 0, 3, false }, + { 1, OFILE_CAULDREN, 13, 16, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, false, true, 0, 3, false }, + { 3, OFILE_MFOUNTN, 0, 0, DTYPE_NONE, THEME_MURKYFOUNTAIN, Q_INVALID, 1, 2, 10, 128, true, true, true, 0, 3, false }, + { 3, OFILE_TFOUNTN, 0, 0, DTYPE_NONE, THEME_TEARFOUNTAIN, Q_INVALID, 1, 2, 4, 128, true, true, true, 0, 3, false }, + { 1, OFILE_ALTBOY, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_BETRAYER, 0, 1, 0, 128, true, true, true, 0, 0, false }, + { 1, OFILE_MCIRL, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_BETRAYER, 0, 1, 0, 96, false, true, true, 0, 0, false }, + { 1, OFILE_MCIRL, 0, 0, DTYPE_CATHEDRAL, THEME_NONE, Q_BETRAYER, 0, 1, 0, 96, false, true, true, 0, 0, false }, + { 1, OFILE_BKSLBRNT, 1, 12, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 3, false }, // BUGFIX should only be loaded on level 1-12 (crypt masks as 1-4) (fixed) + { 1, OFILE_CANDLE2, 2, 12, DTYPE_NONE, THEME_NONE, Q_BETRAYER, 1, 2, 4, 96, true, true, true, 0, 0, false }, + { 1, OFILE_BOOK1, 13, 13, DTYPE_HELL, THEME_NONE, Q_WARLORD, 0, 4, 0, 96, true, true, true, 0, 3, false }, + { 1, OFILE_ARMSTAND, 13, 13, DTYPE_NONE, THEME_NONE, Q_WARLORD, 0, 1, 0, 96, true, false, true, 0, 3, false }, + { 2, OFILE_WEAPSTND, 13, 13, DTYPE_NONE, THEME_NONE, Q_WARLORD, 0, 1, 0, 96, true, false, true, 0, 3, false }, + { 2, OFILE_BURNCROS, 0, 0, DTYPE_NONE, THEME_BRNCROSS, Q_INVALID, 1, 0, 10, 160, true, false, false, 0, 0, false }, + { 2, OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_WEAPONRACK, Q_INVALID, 0, 1, 0, 96, true, false, true, 0, 3, false }, + { 2, OFILE_WEAPSTND, 0, 0, DTYPE_NONE, THEME_WEAPONRACK, Q_INVALID, 0, 2, 0, 96, true, false, true, 0, 0, false }, + { 2, OFILE_MUSHPTCH, 0, 0, DTYPE_NONE, THEME_NONE, Q_MUSHROOM, 0, 1, 0, 96, true, true, true, 0, 3, true }, + { 2, OFILE_LZSTAND, 0, 0, DTYPE_NONE, THEME_NONE, Q_BETRAYER, 0, 1, 0, 128, true, false, true, 0, 3, false }, + { 1, OFILE_DECAP, 9, 9, DTYPE_CAVES, THEME_NONE, Q_INVALID, 0, 2, 0, 96, true, true, true, 0, 1, false }, + { 2, OFILE_CHEST3, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 1, 0, 96, true, true, true, 0, 1, true }, + { 2, OFILE_BCASE, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 2, 0, 96, true, false, true, 0, 0, false }, + { -1, OFILE_NULL, 0, 0, DTYPE_NONE, THEME_NONE, Q_INVALID, 0, 0, 0, 0, false, false, false, 0, 0, false }, // clang-format on }; diff --git a/Source/objects.cpp b/Source/objects.cpp index 6d5c82ff..005c049f 100644 --- a/Source/objects.cpp +++ b/Source/objects.cpp @@ -259,7 +259,7 @@ void InitObjectGFX() char filestr[32]; int i, j; - memset(fileload, FALSE, sizeof(fileload)); + memset(fileload, false, sizeof(fileload)); int lvl = currlevel; if (currlevel >= 21 && currlevel <= 24) @@ -270,18 +270,18 @@ void InitObjectGFX() if (AllObjects[i].oload == 1 && (int)lvl >= AllObjects[i].ominlvl && (int)lvl <= AllObjects[i].omaxlvl) { - fileload[AllObjects[i].ofindex] = TRUE; + fileload[AllObjects[i].ofindex] = true; } if (AllObjects[i].otheme != THEME_NONE) { for (j = 0; j < numthemes; j++) { if (themes[j].ttype == AllObjects[i].otheme) - fileload[AllObjects[i].ofindex] = TRUE; + fileload[AllObjects[i].ofindex] = true; } } if (AllObjects[i].oquest != -1) { if (QuestStatus(AllObjects[i].oquest)) - fileload[AllObjects[i].ofindex] = TRUE; + fileload[AllObjects[i].ofindex] = true; } } @@ -312,29 +312,29 @@ void FreeObjectGFX() bool RndLocOk(int xp, int yp) { if (dMonster[xp][yp] != 0) - return FALSE; + return false; if (dPlayer[xp][yp] != 0) - return FALSE; + return false; if (dObject[xp][yp] != 0) - return FALSE; + return false; if (dFlags[xp][yp] & BFLAG_POPULATED) - return FALSE; + return false; if (nSolidTable[dPiece[xp][yp]]) - return FALSE; + return false; if (leveltype != DTYPE_CATHEDRAL || dPiece[xp][yp] <= 126 || dPiece[xp][yp] >= 144) - return TRUE; - return FALSE; + return true; + return false; } static bool WallTrapLocOkK(int xp, int yp) { if (dFlags[xp][yp] & BFLAG_POPULATED) - return FALSE; + return false; - if (nTrapTable[dPiece[xp][yp]] != FALSE) - return TRUE; + if (nTrapTable[dPiece[xp][yp]] != false) + return true; else - return FALSE; + return false; } void InitRndLocObj(int min, int max, _object_id objtype) @@ -399,15 +399,15 @@ void InitRndLocObj5x5(int min, int max, _object_id objtype) numobjs = min + random_(139, max - min); for (i = 0; i < numobjs; i++) { cnt = 0; - exit = FALSE; + exit = false; while (!exit) { - exit = TRUE; + exit = true; xp = random_(139, 80) + 16; yp = random_(139, 80) + 16; for (n = -2; n <= 2; n++) { for (m = -2; m <= 2; m++) { if (!RndLocOk(xp + m, yp + n)) - exit = FALSE; + exit = false; } } if (!exit) { @@ -476,15 +476,15 @@ void AddBookLever(int lx1, int ly1, int lx2, int ly2, int x1, int y1, int x2, in int xp, yp, ob, cnt, m, n; cnt = 0; - exit = FALSE; + exit = false; while (!exit) { - exit = TRUE; + exit = true; xp = random_(139, 80) + 16; yp = random_(139, 80) + 16; for (n = -2; n <= 2; n++) { for (m = -2; m <= 2; m++) { if (!RndLocOk(xp + m, yp + n)) - exit = FALSE; + exit = false; } } if (!exit) { @@ -530,13 +530,13 @@ void InitRndBarrels() } while (!RndLocOk(xp, yp)); o = (random_(143, 4) != 0) ? OBJ_BARREL : OBJ_BARRELEX; AddObject(o, xp, yp); - found = TRUE; + found = true; p = 0; c = 1; while (random_(143, p) == 0 && found) { t = 0; - found = FALSE; - while (TRUE) { + found = false; + while (true) { if (t >= 3) break; dir = random_(143, 8); @@ -622,8 +622,8 @@ void AddL3Objs(int x1, int y1, int x2, int y2) bool TorchLocOK(int xp, int yp) { if (dFlags[xp][yp] & BFLAG_POPULATED) - return FALSE; - return TRUE; + return false; + return true; } void AddL2Torches() @@ -687,7 +687,7 @@ void AddObjTraps() oi_trap = dObject[xp][j] - 1; object[oi_trap]._oVar1 = i; object[oi_trap]._oVar2 = j; - object[oi]._oTrapFlag = TRUE; + object[oi]._oTrapFlag = true; } else { yp = j - 1; while (!nSolidTable[dPiece[i][yp]]) @@ -700,7 +700,7 @@ void AddObjTraps() oi_trap = dObject[i][yp] - 1; object[oi_trap]._oVar1 = i; object[oi_trap]._oVar2 = j; - object[oi]._oTrapFlag = TRUE; + object[oi]._oTrapFlag = true; } } } @@ -727,7 +727,7 @@ void AddChestTraps() object[oi]._otype = OBJ_TCHEST3; break; } - object[oi]._oTrapFlag = TRUE; + object[oi]._oTrapFlag = true; if (leveltype == DTYPE_CATACOMBS) { object[oi]._oVar4 = random_(0, 2); } else { @@ -745,8 +745,8 @@ void LoadMapObjects(BYTE *pMap, int startx, int starty, int x1, int y1, int w, i BYTE *lm; long mapoff; - LoadMapObjsFlag = TRUE; - InitObjFlag = TRUE; + LoadMapObjsFlag = true; + InitObjFlag = true; lm = pMap; rw = *lm; @@ -769,8 +769,8 @@ void LoadMapObjects(BYTE *pMap, int startx, int starty, int x1, int y1, int w, i lm += 2; } } - InitObjFlag = FALSE; - LoadMapObjsFlag = FALSE; + InitObjFlag = false; + LoadMapObjsFlag = false; } void LoadMapObjs(BYTE *pMap, int startx, int starty) @@ -780,8 +780,8 @@ void LoadMapObjs(BYTE *pMap, int startx, int starty) BYTE *lm; long mapoff; - LoadMapObjsFlag = TRUE; - InitObjFlag = TRUE; + LoadMapObjsFlag = true; + InitObjFlag = true; lm = pMap; rw = *lm; lm += 2; @@ -800,8 +800,8 @@ void LoadMapObjs(BYTE *pMap, int startx, int starty) lm += 2; } } - InitObjFlag = FALSE; - LoadMapObjsFlag = FALSE; + InitObjFlag = false; + LoadMapObjsFlag = false; } void AddDiabObjs() @@ -825,15 +825,15 @@ void objects_add_lv22(int s) int xp, yp, cnt, m, n; cnt = 0; - exit = FALSE; + exit = false; while (!exit) { - exit = TRUE; + exit = true; xp = random_(139, 80) + 16; yp = random_(139, 80) + 16; for (n = -2; n <= 2; n++) { for (m = -3; m <= 3; m++) { if (!RndLocOk(xp + m, yp + n)) - exit = FALSE; + exit = false; } } if (!exit) { @@ -900,15 +900,15 @@ void AddStoryBooks() bool done; cnt = 0; - done = FALSE; + done = false; while (!done) { - done = TRUE; + done = true; xp = random_(139, 80) + 16; yp = random_(139, 80) + 16; for (yy = -2; yy <= 2; yy++) { for (xx = -3; xx <= 3; xx++) { if (!RndLocOk(xx + xp, yy + yp)) - done = FALSE; + done = false; } } if (!done) { @@ -989,15 +989,15 @@ void AddLazStand() bool found; cnt = 0; - found = FALSE; + found = false; while (!found) { - found = TRUE; + found = true; xp = random_(139, 80) + 16; yp = random_(139, 80) + 16; for (yy = -3; yy <= 3; yy++) { for (xx = -2; xx <= 3; xx++) { if (!RndLocOk(xp + xx, yp + yy)) - found = FALSE; + found = false; } } if (!found) { @@ -1030,7 +1030,7 @@ void InitObjects() if (currlevel == 16) { AddDiabObjs(); } else { - InitObjFlag = TRUE; + InitObjFlag = true; AdvanceRndSeed(); if (currlevel == 9 && !gbIsMultiplayer) AddSlainHero(); @@ -1149,7 +1149,7 @@ void InitObjects() AddObjTraps(); if (leveltype > DTYPE_CATHEDRAL) AddChestTraps(); - InitObjFlag = FALSE; + InitObjFlag = false; } } @@ -1164,12 +1164,12 @@ void SetMapObjects(BYTE *pMap, int startx, int starty) ClrAllObjects(); for (i = 0; i < 56; i++) - fileload[i] = FALSE; - InitObjFlag = TRUE; + fileload[i] = false; + InitObjFlag = true; for (i = 0; AllObjects[i].oload != -1; i++) { if (AllObjects[i].oload == 1 && leveltype == AllObjects[i].olvltype) - fileload[AllObjects[i].ofindex] = TRUE; + fileload[AllObjects[i].ofindex] = true; } lm = pMap; @@ -1186,7 +1186,7 @@ void SetMapObjects(BYTE *pMap, int startx, int starty) for (j = 0; j < rh; j++) { for (i = 0; i < rw; i++) { if (*lm) { - fileload[AllObjects[ObjTypeConv[*lm]].ofindex] = TRUE; + fileload[AllObjects[ObjTypeConv[*lm]].ofindex] = true; } lm += 2; } @@ -1210,7 +1210,7 @@ void SetMapObjects(BYTE *pMap, int startx, int starty) lm += 2; } } - InitObjFlag = FALSE; + InitObjFlag = false; } void DeleteObject_(int oi, int i) @@ -1253,12 +1253,12 @@ void SetupObject(int i, int x, int y, _object_id ot) object[i]._oSolidFlag = AllObjects[ot].oSolidFlag; object[i]._oMissFlag = AllObjects[ot].oMissFlag; object[i]._oLight = AllObjects[ot].oLightFlag; - object[i]._oDelFlag = FALSE; + object[i]._oDelFlag = false; object[i]._oBreak = AllObjects[ot].oBreak; object[i]._oSelFlag = AllObjects[ot].oSelFlag; - object[i]._oPreFlag = FALSE; - object[i]._oTrapFlag = FALSE; - object[i]._oDoorFlag = FALSE; + object[i]._oPreFlag = false; + object[i]._oTrapFlag = false; + object[i]._oDoorFlag = false; } void SetObjMapRange(int i, int x1, int y1, int x2, int y2, int v) @@ -1277,7 +1277,7 @@ void SetBookMsg(int i, _speech_id msg) void AddL1Door(int i, int x, int y, int ot) { - object[i]._oDoorFlag = TRUE; + object[i]._oDoorFlag = true; if (ot == 1) { object[i]._oVar1 = dPiece[x][y]; object[i]._oVar2 = dPiece[x][y - 1]; @@ -1333,7 +1333,7 @@ void AddChest(int i, int t) void AddL2Door(int i, int x, int y, int ot) { - object[i]._oDoorFlag = TRUE; + object[i]._oDoorFlag = true; if (ot == OBJ_L2LDOOR) ObjSetMicro(x, y, 538); else @@ -1344,7 +1344,7 @@ void AddL2Door(int i, int x, int y, int ot) void AddL3Door(int i, int x, int y, int ot) { - object[i]._oDoorFlag = TRUE; + object[i]._oDoorFlag = true; if (ot == OBJ_L3LDOOR) ObjSetMicro(x, y, 531); else @@ -1422,7 +1422,7 @@ void AddShrine(int i) int val; bool slist[NUM_SHRINETYPE]; int j; - object[i]._oPreFlag = TRUE; + object[i]._oPreFlag = true; int shrines = gbIsHellfire ? NUM_SHRINETYPE : 26; @@ -1448,7 +1448,7 @@ void AddShrine(int i) void AddBookcase(int i) { object[i]._oRndSeed = AdvanceRndSeed(); - object[i]._oPreFlag = TRUE; + object[i]._oPreFlag = true; } void AddBookstand(int i) @@ -1514,7 +1514,7 @@ void AddDecap(int i) { object[i]._oRndSeed = AdvanceRndSeed(); object[i]._oAnimFrame = random_(151, 8) + 1; - object[i]._oPreFlag = TRUE; + object[i]._oPreFlag = true; } void AddVilebook(int i) @@ -1527,7 +1527,7 @@ void AddVilebook(int i) void AddMagicCircle(int i) { object[i]._oRndSeed = AdvanceRndSeed(); - object[i]._oPreFlag = TRUE; + object[i]._oPreFlag = true; object[i]._oVar6 = 0; object[i]._oVar5 = 1; } @@ -1575,7 +1575,7 @@ void AddTorturedBody(int i) { object[i]._oRndSeed = AdvanceRndSeed(); object[i]._oAnimFrame = random_(0, 4) + 1; - object[i]._oPreFlag = TRUE; + object[i]._oPreFlag = true; } void GetRndObjLoc(int randarea, int *xx, int *yy) @@ -1593,7 +1593,7 @@ void GetRndObjLoc(int randarea, int *xx, int *yy) randarea--; *xx = random_(0, MAXDUNX); *yy = random_(0, MAXDUNY); - failed = FALSE; + failed = false; for (i = 0; i < randarea && !failed; i++) { for (j = 0; j < randarea && !failed; j++) { failed = !RndLocOk(i + *xx, j + *yy); @@ -1768,7 +1768,7 @@ void AddObject(_object_id ot, int ox, int oy) case OBJ_TCHEST2: case OBJ_TCHEST3: AddChest(oi, ot); - object[oi]._oTrapFlag = TRUE; + object[oi]._oTrapFlag = true; if (leveltype == DTYPE_CATACOMBS) { object[oi]._oVar4 = random_(0, 2); } else { @@ -1867,7 +1867,7 @@ void Obj_Light(int i, int lr) int ox, oy, dx, dy, p, tr; bool turnon; - turnon = FALSE; + turnon = false; if (object[i]._oVar1 != -1) { ox = object[i]._ox; oy = object[i]._oy; @@ -1879,7 +1879,7 @@ void Obj_Light(int i, int lr) dx = abs(plr[p]._px - ox); dy = abs(plr[p]._py - oy); if (dx < tr && dy < tr) - turnon = TRUE; + turnon = true; } } } @@ -1922,7 +1922,7 @@ void Obj_Circle(int i) if (quests[Q_BETRAYER]._qactive == QUEST_ACTIVE && quests[Q_BETRAYER]._qvar1 <= 4) // BUGFIX stepping on the circle again will break the quest state (fixed) quests[Q_BETRAYER]._qvar1 = 4; AddMissile(plr[myplr]._px, plr[myplr]._py, 35, 46, plr[myplr]._pdir, MIS_RNDTELEPORT, TARGET_MONSTERS, myplr, 0, 0); - track_repeat_walk(FALSE); + track_repeat_walk(false); sgbMouseDown = CLICK_NONE; ClrPlrPath(myplr); StartStand(myplr, DIR_S); @@ -1951,7 +1951,7 @@ void Obj_Door(int i) if (object[i]._oVar4 == 0) { object[i]._oSelFlag = 3; - object[i]._oMissFlag = FALSE; + object[i]._oMissFlag = false; } else { dx = object[i]._ox; dy = object[i]._oy; @@ -1961,7 +1961,7 @@ void Obj_Door(int i) dok = dok && dPlayer[dx][dy] == 0; object[i]._oSelFlag = 2; object[i]._oVar4 = dok ? 1 : 2; - object[i]._oMissFlag = TRUE; + object[i]._oMissFlag = true; } } @@ -2030,10 +2030,10 @@ void Obj_FlameTrap(int i) x = object[i]._ox; y = object[i]._oy; if (dMonster[x][y] > 0) - MonsterTrapHit(dMonster[x][y] - 1, mindam / 2, maxdam / 2, 0, MIS_FIREWALLC, FALSE); + MonsterTrapHit(dMonster[x][y] - 1, mindam / 2, maxdam / 2, 0, MIS_FIREWALLC, false); if (dPlayer[x][y] > 0) { bool unused; - PlayerMHit(dPlayer[x][y] - 1, -1, 0, mindam, maxdam, MIS_FIREWALLC, FALSE, 0, &unused); + PlayerMHit(dPlayer[x][y] - 1, -1, 0, mindam, maxdam, MIS_FIREWALLC, false, 0, &unused); } if (object[i]._oAnimFrame == object[i]._oAnimLen) @@ -2049,7 +2049,7 @@ void Obj_Trap(int i) bool otrig; int sx, sy, dx, dy, x, y; - otrig = FALSE; + otrig = false; if (object[i]._oVar4 == 0) { oti = dObject[object[i]._oVar1][object[i]._oVar2] - 1; switch (object[oti]._otype) { @@ -2060,7 +2060,7 @@ void Obj_Trap(int i) case OBJ_L3LDOOR: case OBJ_L3RDOOR: if (object[oti]._oVar4 != 0) - otrig = TRUE; + otrig = true; break; case OBJ_LEVER: case OBJ_CHEST1: @@ -2069,7 +2069,7 @@ void Obj_Trap(int i) case OBJ_SWITCHSKL: case OBJ_SARC: if (object[oti]._oSelFlag == 0) - otrig = TRUE; + otrig = true; break; } if (otrig) { @@ -2091,7 +2091,7 @@ void Obj_Trap(int i) AddMissile(sx, sy, dx, dy, dir, object[i]._oVar3, TARGET_PLAYERS, -1, 0, 0); PlaySfxLoc(IS_TRAP, object[oti]._ox, object[oti]._oy); } - object[oti]._oTrapFlag = FALSE; + object[oti]._oTrapFlag = false; } } } @@ -2130,7 +2130,7 @@ void Obj_BCrossDamage(int i) PlaySfxLoc(PS_WARR68, plr[myplr]._px, plr[myplr]._py); } } - drawhpflag = TRUE; + drawhpflag = true; } void ProcessObjects() @@ -2450,7 +2450,7 @@ void OperateL1RDoor(int pnum, int oi, bool sendflag) yp = object[oi]._oy; if (object[oi]._oVar4 == 0) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_OPENDOOR, oi); + NetSendCmdParam1(true, CMD_OPENDOOR, oi); if (currlevel < 21) { if (!deltaload) PlaySfxLoc(IS_DOOROPEN, object[oi]._ox, object[oi]._oy); @@ -2467,7 +2467,7 @@ void OperateL1RDoor(int pnum, int oi, bool sendflag) } objects_set_door_piece(xp, yp - 1); object[oi]._oAnimFrame += 2; - object[oi]._oPreFlag = TRUE; + object[oi]._oPreFlag = true; DoorSet(oi, xp - 1, yp); object[oi]._oVar4 = 1; object[oi]._oSelFlag = 2; @@ -2484,7 +2484,7 @@ void OperateL1RDoor(int pnum, int oi, bool sendflag) } if (!deltaload && dDead[xp][yp] == 0 && dMonster[xp][yp] == 0 && dItem[xp][yp] == 0) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_CLOSEDOOR, oi); + NetSendCmdParam1(true, CMD_CLOSEDOOR, oi); object[oi]._oVar4 = 0; object[oi]._oSelFlag = 3; ObjSetMicro(xp, yp, object[oi]._oVar1); @@ -2509,7 +2509,7 @@ void OperateL1RDoor(int pnum, int oi, bool sendflag) } dSpecial[xp][yp] = 0; object[oi]._oAnimFrame -= 2; - object[oi]._oPreFlag = FALSE; + object[oi]._oPreFlag = false; RedoPlayerVision(); } else { object[oi]._oVar4 = 2; @@ -2530,7 +2530,7 @@ void OperateL1LDoor(int pnum, int oi, bool sendflag) yp = object[oi]._oy; if (object[oi]._oVar4 == 0) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_OPENDOOR, oi); + NetSendCmdParam1(true, CMD_OPENDOOR, oi); if (currlevel < 21) { if (!deltaload) PlaySfxLoc(IS_DOOROPEN, object[oi]._ox, object[oi]._oy); @@ -2550,7 +2550,7 @@ void OperateL1LDoor(int pnum, int oi, bool sendflag) } objects_set_door_piece(xp - 1, yp); object[oi]._oAnimFrame += 2; - object[oi]._oPreFlag = TRUE; + object[oi]._oPreFlag = true; DoorSet(oi, xp, yp - 1); object[oi]._oVar4 = 1; object[oi]._oSelFlag = 2; @@ -2567,7 +2567,7 @@ void OperateL1LDoor(int pnum, int oi, bool sendflag) } if (dDead[xp][yp] == 0 && dMonster[xp][yp] == 0 && dItem[xp][yp] == 0) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_CLOSEDOOR, oi); + NetSendCmdParam1(true, CMD_CLOSEDOOR, oi); object[oi]._oVar4 = 0; object[oi]._oSelFlag = 3; ObjSetMicro(xp, yp, object[oi]._oVar1); @@ -2592,7 +2592,7 @@ void OperateL1LDoor(int pnum, int oi, bool sendflag) } dSpecial[xp][yp] = 0; object[oi]._oAnimFrame -= 2; - object[oi]._oPreFlag = FALSE; + object[oi]._oPreFlag = false; RedoPlayerVision(); } else { object[oi]._oVar4 = 2; @@ -2613,13 +2613,13 @@ void OperateL2RDoor(int pnum, int oi, bool sendflag) yp = object[oi]._oy; if (object[oi]._oVar4 == 0) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_OPENDOOR, oi); + NetSendCmdParam1(true, CMD_OPENDOOR, oi); if (!deltaload) PlaySfxLoc(IS_DOOROPEN, object[oi]._ox, object[oi]._oy); ObjSetMicro(xp, yp, 17); dSpecial[xp][yp] = 6; object[oi]._oAnimFrame += 2; - object[oi]._oPreFlag = TRUE; + object[oi]._oPreFlag = true; object[oi]._oVar4 = 1; object[oi]._oSelFlag = 2; RedoPlayerVision(); @@ -2633,13 +2633,13 @@ void OperateL2RDoor(int pnum, int oi, bool sendflag) dok = dok && dDead[xp][yp] == 0; if (dok) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_CLOSEDOOR, oi); + NetSendCmdParam1(true, CMD_CLOSEDOOR, oi); object[oi]._oVar4 = 0; object[oi]._oSelFlag = 3; ObjSetMicro(xp, yp, 540); dSpecial[xp][yp] = 0; object[oi]._oAnimFrame -= 2; - object[oi]._oPreFlag = FALSE; + object[oi]._oPreFlag = false; RedoPlayerVision(); } else { object[oi]._oVar4 = 2; @@ -2660,13 +2660,13 @@ void OperateL2LDoor(int pnum, int oi, bool sendflag) yp = object[oi]._oy; if (object[oi]._oVar4 == 0) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_OPENDOOR, oi); + NetSendCmdParam1(true, CMD_OPENDOOR, oi); if (!deltaload) PlaySfxLoc(IS_DOOROPEN, object[oi]._ox, object[oi]._oy); ObjSetMicro(xp, yp, 13); dSpecial[xp][yp] = 5; object[oi]._oAnimFrame += 2; - object[oi]._oPreFlag = TRUE; + object[oi]._oPreFlag = true; object[oi]._oVar4 = 1; object[oi]._oSelFlag = 2; RedoPlayerVision(); @@ -2680,13 +2680,13 @@ void OperateL2LDoor(int pnum, int oi, bool sendflag) dok = dok && dDead[xp][yp] == 0; if (dok) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_CLOSEDOOR, oi); + NetSendCmdParam1(true, CMD_CLOSEDOOR, oi); object[oi]._oVar4 = 0; object[oi]._oSelFlag = 3; ObjSetMicro(xp, yp, 538); dSpecial[xp][yp] = 0; object[oi]._oAnimFrame -= 2; - object[oi]._oPreFlag = FALSE; + object[oi]._oPreFlag = false; RedoPlayerVision(); } else { object[oi]._oVar4 = 2; @@ -2708,12 +2708,12 @@ void OperateL3RDoor(int pnum, int oi, bool sendflag) yp = object[oi]._oy; if (object[oi]._oVar4 == 0) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_OPENDOOR, oi); + NetSendCmdParam1(true, CMD_OPENDOOR, oi); if (!deltaload) PlaySfxLoc(IS_DOOROPEN, object[oi]._ox, object[oi]._oy); ObjSetMicro(xp, yp, 541); object[oi]._oAnimFrame += 2; - object[oi]._oPreFlag = TRUE; + object[oi]._oPreFlag = true; object[oi]._oVar4 = 1; object[oi]._oSelFlag = 2; RedoPlayerVision(); @@ -2727,12 +2727,12 @@ void OperateL3RDoor(int pnum, int oi, bool sendflag) dok = dok && dDead[xp][yp] == 0; if (dok) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_CLOSEDOOR, oi); + NetSendCmdParam1(true, CMD_CLOSEDOOR, oi); object[oi]._oVar4 = 0; object[oi]._oSelFlag = 3; ObjSetMicro(xp, yp, 534); object[oi]._oAnimFrame -= 2; - object[oi]._oPreFlag = FALSE; + object[oi]._oPreFlag = false; RedoPlayerVision(); } else { object[oi]._oVar4 = 2; @@ -2754,12 +2754,12 @@ void OperateL3LDoor(int pnum, int oi, bool sendflag) yp = object[oi]._oy; if (object[oi]._oVar4 == 0) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_OPENDOOR, oi); + NetSendCmdParam1(true, CMD_OPENDOOR, oi); if (!deltaload) PlaySfxLoc(IS_DOOROPEN, object[oi]._ox, object[oi]._oy); ObjSetMicro(xp, yp, 538); object[oi]._oAnimFrame += 2; - object[oi]._oPreFlag = TRUE; + object[oi]._oPreFlag = true; object[oi]._oVar4 = 1; object[oi]._oSelFlag = 2; RedoPlayerVision(); @@ -2773,12 +2773,12 @@ void OperateL3LDoor(int pnum, int oi, bool sendflag) dok = dok && dDead[xp][yp] == 0; if (dok) { if (pnum == myplr && sendflag) - NetSendCmdParam1(TRUE, CMD_CLOSEDOOR, oi); + NetSendCmdParam1(true, CMD_CLOSEDOOR, oi); object[oi]._oVar4 = 0; object[oi]._oSelFlag = 3; ObjSetMicro(xp, yp, 531); object[oi]._oAnimFrame -= 2; - object[oi]._oPreFlag = FALSE; + object[oi]._oPreFlag = false; RedoPlayerVision(); } else { object[oi]._oVar4 = 2; @@ -2806,25 +2806,25 @@ void MonstCheckDoors(int m) dpx = abs(object[oi]._ox - mx); dpy = abs(object[oi]._oy - my); if (dpx == 1 && dpy <= 1 && object[oi]._otype == OBJ_L1LDOOR) - OperateL1LDoor(myplr, oi, TRUE); + OperateL1LDoor(myplr, oi, true); if (dpx <= 1 && dpy == 1 && object[oi]._otype == OBJ_L1RDOOR) - OperateL1RDoor(myplr, oi, TRUE); + OperateL1RDoor(myplr, oi, true); } if ((object[oi]._otype == OBJ_L2LDOOR || object[oi]._otype == OBJ_L2RDOOR) && object[oi]._oVar4 == 0) { dpx = abs(object[oi]._ox - mx); dpy = abs(object[oi]._oy - my); if (dpx == 1 && dpy <= 1 && object[oi]._otype == OBJ_L2LDOOR) - OperateL2LDoor(myplr, oi, TRUE); + OperateL2LDoor(myplr, oi, true); if (dpx <= 1 && dpy == 1 && object[oi]._otype == OBJ_L2RDOOR) - OperateL2RDoor(myplr, oi, TRUE); + OperateL2RDoor(myplr, oi, true); } if ((object[oi]._otype == OBJ_L3LDOOR || object[oi]._otype == OBJ_L3RDOOR) && object[oi]._oVar4 == 0) { dpx = abs(object[oi]._ox - mx); dpy = abs(object[oi]._oy - my); if (dpx == 1 && dpy <= 1 && object[oi]._otype == OBJ_L3RDOOR) - OperateL3RDoor(myplr, oi, TRUE); + OperateL3RDoor(myplr, oi, true); if (dpx <= 1 && dpy == 1 && object[oi]._otype == OBJ_L3LDOOR) - OperateL3LDoor(myplr, oi, TRUE); + OperateL3LDoor(myplr, oi, true); } } } @@ -2890,27 +2890,27 @@ void OperateLever(int pnum, int i) PlaySfxLoc(IS_LEVER, object[i]._ox, object[i]._oy); object[i]._oSelFlag = 0; object[i]._oAnimFrame++; - mapflag = TRUE; + mapflag = true; if (currlevel == 16) { for (j = 0; j < nobjects; j++) { oi = objectactive[j]; if (object[oi]._otype == OBJ_SWITCHSKL && object[i]._oVar8 == object[oi]._oVar8 && object[oi]._oSelFlag != 0) { - mapflag = FALSE; + mapflag = false; } } } if (currlevel == 24) { operate_lv24_lever(); IsUberLeverActivated = 1; - mapflag = FALSE; + mapflag = false; quests[Q_NAKRUL]._qactive = 3; } if (mapflag) ObjChangeMap(object[i]._oVar1, object[i]._oVar2, object[i]._oVar3, object[i]._oVar4); if (pnum == myplr) - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); } } @@ -2924,8 +2924,8 @@ void OperateBook(int pnum, int i) if (object[i]._oSelFlag == 0) return; if (setlevel && setlvlnum == SL_VILEBETRAYER) { - do_add_missile = FALSE; - missile_added = FALSE; + do_add_missile = false; + missile_added = false; for (j = 0; j < nobjects; j++) { oi = objectactive[j]; otype = object[oi]._otype; @@ -2933,19 +2933,19 @@ void OperateBook(int pnum, int i) dx = 27; dy = 29; object[oi]._oVar6 = 4; - do_add_missile = TRUE; + do_add_missile = true; } if (otype == OBJ_MCIRCLE2 && object[oi]._oVar6 == 2) { dx = 43; dy = 29; object[oi]._oVar6 = 4; - do_add_missile = TRUE; + do_add_missile = true; } if (do_add_missile) { object[dObject[35][36] - 1]._oVar5++; AddMissile(plr[pnum]._px, plr[pnum]._py, dx, dy, plr[pnum]._pdir, MIS_RNDTELEPORT, TARGET_MONSTERS, pnum, 0, 0); - missile_added = TRUE; - do_add_missile = FALSE; + missile_added = true; + do_add_missile = false; } } if (!missile_added) @@ -2999,19 +2999,19 @@ void OperateBookLever(int pnum, int i) if (object[i]._oSelFlag != 0 && !qtextflag) { if (object[i]._otype == OBJ_BLINDBOOK && quests[Q_BLIND]._qvar1 == 0) { quests[Q_BLIND]._qactive = QUEST_ACTIVE; - quests[Q_BLIND]._qlog = TRUE; + quests[Q_BLIND]._qlog = true; quests[Q_BLIND]._qvar1 = 1; } if (object[i]._otype == OBJ_BLOODBOOK && quests[Q_BLOOD]._qvar1 == 0) { quests[Q_BLOOD]._qactive = QUEST_ACTIVE; - quests[Q_BLOOD]._qlog = TRUE; + quests[Q_BLOOD]._qlog = true; quests[Q_BLOOD]._qvar1 = 1; SpawnQuestItem(IDI_BLDSTONE, 2 * setpc_x + 25, 2 * setpc_y + 33, 0, 1); } object[i]._otype = object[i]._otype; if (object[i]._otype == OBJ_STEELTOME && quests[Q_WARLORD]._qvar1 == 0) { quests[Q_WARLORD]._qactive = QUEST_ACTIVE; - quests[Q_WARLORD]._qlog = TRUE; + quests[Q_WARLORD]._qlog = true; quests[Q_WARLORD]._qvar1 = 1; } if (object[i]._oAnimFrame != object[i]._oVar6) { @@ -3028,7 +3028,7 @@ void OperateBookLever(int pnum, int i) object[i]._oAnimFrame = object[i]._oVar6; InitQTextMsg(object[i]._oVar7); if (pnum == myplr) - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); } } @@ -3045,7 +3045,7 @@ void OperateSChambBk(int pnum, int i) object[i]._oAnimFrame = object[i]._oVar6; if (quests[Q_SCHAMB]._qactive == QUEST_INIT) { quests[Q_SCHAMB]._qactive = QUEST_ACTIVE; - quests[Q_SCHAMB]._qlog = TRUE; + quests[Q_SCHAMB]._qlog = true; } if (plr[myplr]._pClass == PC_WARRIOR) { textdef = TEXT_BONER; @@ -3078,12 +3078,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, FALSE); + CreateRndItem(object[i]._ox, object[i]._oy, true, sendmsg, false); } } else { for (j = 0; j < object[i]._oVar1; j++) { if (object[i]._oVar2 != 0) - CreateRndItem(object[i]._ox, object[i]._oy, FALSE, sendmsg, FALSE); + CreateRndItem(object[i]._ox, object[i]._oy, false, sendmsg, false); else CreateRndUseful(pnum, object[i]._ox, object[i]._oy, sendmsg); } @@ -3113,10 +3113,10 @@ void OperateChest(int pnum, int i, bool sendmsg) mtype = MIS_ARROW; } AddMissile(object[i]._ox, object[i]._oy, plr[pnum]._px, plr[pnum]._py, mdir, mtype, TARGET_PLAYERS, -1, 0, 0); - object[i]._oTrapFlag = FALSE; + object[i]._oTrapFlag = false; } if (pnum == myplr) - NetSendCmdParam2(FALSE, CMD_PLROPOBJ, pnum, i); + NetSendCmdParam2(false, CMD_PLROPOBJ, pnum, i); return; } } @@ -3205,26 +3205,26 @@ void OperateSlainHero(int pnum, int i, bool sendmsg) object[i]._oSelFlag = 0; if (!deltaload) { if (plr[pnum]._pClass == PC_WARRIOR) { - CreateMagicArmor(object[i]._ox, object[i]._oy, ITYPE_HARMOR, ICURS_BREAST_PLATE, FALSE, TRUE); + CreateMagicArmor(object[i]._ox, object[i]._oy, ITYPE_HARMOR, ICURS_BREAST_PLATE, false, true); PlaySfxLoc(PS_WARR9, plr[myplr]._px, plr[myplr]._py); } else if (plr[pnum]._pClass == PC_ROGUE) { - CreateMagicWeapon(object[i]._ox, object[i]._oy, ITYPE_BOW, ICURS_LONG_WAR_BOW, FALSE, TRUE); + CreateMagicWeapon(object[i]._ox, object[i]._oy, ITYPE_BOW, ICURS_LONG_WAR_BOW, false, true); PlaySfxLoc(PS_ROGUE9, plr[myplr]._px, plr[myplr]._py); } else if (plr[pnum]._pClass == PC_SORCERER) { - CreateSpellBook(object[i]._ox, object[i]._oy, SPL_LIGHTNING, FALSE, TRUE); + CreateSpellBook(object[i]._ox, object[i]._oy, SPL_LIGHTNING, false, true); PlaySfxLoc(PS_MAGE9, plr[myplr]._px, plr[myplr]._py); } else if (plr[pnum]._pClass == PC_MONK) { - CreateMagicWeapon(object[i]._ox, object[i]._oy, ITYPE_STAFF, ICURS_WAR_STAFF, FALSE, TRUE); + CreateMagicWeapon(object[i]._ox, object[i]._oy, ITYPE_STAFF, ICURS_WAR_STAFF, false, true); PlaySfxLoc(PS_MONK9, plr[myplr]._px, plr[myplr]._py); } else if (plr[pnum]._pClass == PC_BARD) { - CreateMagicWeapon(object[i]._ox, object[i]._oy, ITYPE_SWORD, ICURS_BASTARD_SWORD, FALSE, TRUE); + CreateMagicWeapon(object[i]._ox, object[i]._oy, ITYPE_SWORD, ICURS_BASTARD_SWORD, false, true); PlaySfxLoc(PS_ROGUE9, plr[myplr]._px, plr[myplr]._py); } else if (plr[pnum]._pClass == PC_BARBARIAN) { - CreateMagicWeapon(object[i]._ox, object[i]._oy, ITYPE_AXE, ICURS_BATTLE_AXE, FALSE, TRUE); + CreateMagicWeapon(object[i]._ox, object[i]._oy, ITYPE_AXE, ICURS_BATTLE_AXE, false, true); PlaySfxLoc(PS_WARR9, plr[myplr]._px, plr[myplr]._py); } if (pnum == myplr) - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); } } } @@ -3275,11 +3275,11 @@ 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, FALSE, sendmsg, FALSE); + 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) - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); } } } @@ -3357,21 +3357,21 @@ void TryDisarm(int pnum, int i) trapdisper = 2 * plr[pnum]._pDexterity - 5 * currlevel; if (random_(154, 100) <= trapdisper) { for (j = 0; j < nobjects; j++) { - checkflag = FALSE; + checkflag = false; oi = objectactive[j]; oti = object[oi]._otype; if (oti == OBJ_TRAPL) - checkflag = TRUE; + checkflag = true; if (oti == OBJ_TRAPR) - checkflag = TRUE; + checkflag = true; if (checkflag && dObject[object[oi]._oVar1][object[oi]._oVar2] - 1 == i) { object[oi]._oVar4 = 1; - object[i]._oTrapFlag = FALSE; + object[i]._oTrapFlag = false; } } oti = object[i]._otype; if (oti >= OBJ_TCHEST1 && oti <= OBJ_TCHEST3) - object[i]._oTrapFlag = FALSE; + object[i]._oTrapFlag = false; } } } @@ -3397,7 +3397,7 @@ void OperateShrine(int pnum, int i, _sfx_id sType) int v1, v2, v3, v4; if (dropGoldFlag) { - dropGoldFlag = FALSE; + dropGoldFlag = false; dropGoldValue = 0; } @@ -3465,7 +3465,7 @@ void OperateShrine(int pnum, int i, _sfx_id sType) plr[pnum].InvBody[j]._iDurability = plr[pnum].InvBody[j]._iMaxDur; } } - while (TRUE) { + while (true) { cnt = 0; for (j = 0; j < NUM_INVLOC; j++) { if (!plr[pnum].InvBody[j].isEmpty()) @@ -3731,14 +3731,14 @@ void OperateShrine(int pnum, int i, _sfx_id sType) || plr[pnum].InvList[j]._iMiscId == IMISC_MANA) { SetPlrHandItem(&plr[pnum].HoldItem, ItemMiscIdIdx(IMISC_REJUV)); GetPlrHandSeed(&plr[pnum].HoldItem); - plr[pnum].HoldItem._iStatFlag = TRUE; + plr[pnum].HoldItem._iStatFlag = true; plr[pnum].InvList[j] = plr[pnum].HoldItem; } if (plr[pnum].InvList[j]._iMiscId == IMISC_FULLHEAL || plr[pnum].InvList[j]._iMiscId == IMISC_FULLMANA) { SetPlrHandItem(&plr[pnum].HoldItem, ItemMiscIdIdx(IMISC_FULLREJUV)); GetPlrHandSeed(&plr[pnum].HoldItem); - plr[pnum].HoldItem._iStatFlag = TRUE; + plr[pnum].HoldItem._iStatFlag = true; plr[pnum].InvList[j] = plr[pnum].HoldItem; } } @@ -3749,14 +3749,14 @@ void OperateShrine(int pnum, int i, _sfx_id sType) || plr[pnum].SpdList[j]._iMiscId == IMISC_MANA) { SetPlrHandItem(&plr[pnum].HoldItem, ItemMiscIdIdx(IMISC_REJUV)); GetPlrHandSeed(&plr[pnum].HoldItem); - plr[pnum].HoldItem._iStatFlag = TRUE; + plr[pnum].HoldItem._iStatFlag = true; plr[pnum].SpdList[j] = plr[pnum].HoldItem; } if (plr[pnum].SpdList[j]._iMiscId == IMISC_FULLHEAL || plr[pnum].SpdList[j]._iMiscId == IMISC_FULLMANA) { SetPlrHandItem(&plr[pnum].HoldItem, ItemMiscIdIdx(IMISC_FULLREJUV)); GetPlrHandSeed(&plr[pnum].HoldItem); - plr[pnum].HoldItem._iStatFlag = TRUE; + plr[pnum].HoldItem._iStatFlag = true; plr[pnum].SpdList[j] = plr[pnum].HoldItem; } } @@ -3778,11 +3778,11 @@ void OperateShrine(int pnum, int i, _sfx_id sType) if (pnum != myplr) return; if (2 * currlevel < 7) { - 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); + 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, FALSE, TRUE); - 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); + 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; @@ -3903,7 +3903,7 @@ void OperateShrine(int pnum, int i, _sfx_id sType) for (yy = 0; yy < DMAXY; yy++) { for (xx = 0; xx < DMAXX; xx++) { - automapview[xx][yy] = TRUE; + automapview[xx][yy] = true; } } InitDiabloMsg(EMSG_SHRINE_SECLUDED); @@ -3942,15 +3942,15 @@ void OperateShrine(int pnum, int i, _sfx_id sType) return; for (j = 0; j < NUM_INVLOC; j++) { if (plr[pnum].InvBody[j]._iMagical && !plr[pnum].InvBody[j]._iIdentified) - plr[pnum].InvBody[j]._iIdentified = TRUE; + plr[pnum].InvBody[j]._iIdentified = true; } for (j = 0; j < plr[pnum]._pNumInv; j++) { if (plr[pnum].InvList[j]._iMagical && !plr[pnum].InvList[j]._iIdentified) - plr[pnum].InvList[j]._iIdentified = TRUE; + plr[pnum].InvList[j]._iIdentified = true; } for (j = 0; j < MAXBELTITEMS; j++) { if (plr[pnum].SpdList[j]._iMagical && !plr[pnum].SpdList[j]._iIdentified) - plr[pnum].SpdList[j]._iIdentified = TRUE; // belt items can't be magical? + plr[pnum].SpdList[j]._iIdentified = true; // belt items can't be magical? } InitDiabloMsg(EMSG_SHRINE_GLIMMERING); break; @@ -4144,14 +4144,14 @@ void OperateShrine(int pnum, int i, _sfx_id sType) if (pnum != myplr) return; InitDiabloMsg(EMSG_SHRINE_MURPHYS); - bool broke = FALSE; + bool broke = false; for (int j = 0; j < NUM_INVLOC; j++) { ItemStruct *item = &plr[myplr].InvBody[j]; if (!item->isEmpty() && random_(0, 3) == 0) { if (item->_iDurability != DUR_INDESTRUCTIBLE) { if (item->_iDurability) { item->_iDurability /= 2; - broke = TRUE; + broke = true; break; } } @@ -4163,11 +4163,11 @@ void OperateShrine(int pnum, int i, _sfx_id sType) break; } - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); force_redraw = 255; if (pnum == myplr) - NetSendCmdParam2(FALSE, CMD_PLROPOBJ, pnum, i); + NetSendCmdParam2(false, CMD_PLROPOBJ, pnum, i); } void OperateSkelBook(int pnum, int i, bool sendmsg) @@ -4180,11 +4180,11 @@ void OperateSkelBook(int pnum, int i, bool sendmsg) if (!deltaload) { SetRndSeed(object[i]._oRndSeed); if (random_(161, 5) != 0) - CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_SCROLL, sendmsg, FALSE); + CreateTypeItem(object[i]._ox, object[i]._oy, false, ITYPE_MISC, IMISC_SCROLL, sendmsg, false); else - CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_BOOK, sendmsg, FALSE); + CreateTypeItem(object[i]._ox, object[i]._oy, false, ITYPE_MISC, IMISC_BOOK, sendmsg, false); if (pnum == myplr) - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); } } } @@ -4198,7 +4198,7 @@ void OperateBookCase(int pnum, int i, bool sendmsg) object[i]._oAnimFrame -= 2; if (!deltaload) { SetRndSeed(object[i]._oRndSeed); - CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_MISC, IMISC_BOOK, sendmsg, FALSE); + CreateTypeItem(object[i]._ox, object[i]._oy, false, ITYPE_MISC, IMISC_BOOK, sendmsg, false); if (QuestStatus(Q_ZHAR) && monster[MAX_PLRS]._uniqtype - 1 == UMT_ZHAR && monster[MAX_PLRS]._msquelch == UCHAR_MAX @@ -4209,7 +4209,7 @@ void OperateBookCase(int pnum, int i, bool sendmsg) monster[MAX_PLRS]._mmode = MM_TALK; } if (pnum == myplr) - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); } } } @@ -4220,9 +4220,9 @@ 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, FALSE, sendmsg, FALSE); + CreateRndItem(object[i]._ox, object[i]._oy, false, sendmsg, false); if (pnum == myplr) - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); } } } @@ -4238,18 +4238,18 @@ 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, IMISC_NONE, sendmsg, FALSE); + CreateTypeItem(object[i]._ox, object[i]._oy, true, ITYPE_LARMOR, IMISC_NONE, sendmsg, false); } else if (currlevel >= 6 && currlevel <= 9) { - CreateTypeItem(object[i]._ox, object[i]._oy, uniqueRnd, ITYPE_MARMOR, IMISC_NONE, sendmsg, FALSE); + CreateTypeItem(object[i]._ox, object[i]._oy, uniqueRnd, ITYPE_MARMOR, IMISC_NONE, sendmsg, false); } else if (currlevel >= 10 && currlevel <= 12) { - CreateTypeItem(object[i]._ox, object[i]._oy, FALSE, ITYPE_HARMOR, IMISC_NONE, sendmsg, FALSE); + CreateTypeItem(object[i]._ox, object[i]._oy, false, ITYPE_HARMOR, IMISC_NONE, sendmsg, false); } else if (currlevel >= 13 && currlevel <= 16) { - CreateTypeItem(object[i]._ox, object[i]._oy, TRUE, ITYPE_HARMOR, IMISC_NONE, sendmsg, FALSE); + CreateTypeItem(object[i]._ox, object[i]._oy, true, ITYPE_HARMOR, IMISC_NONE, sendmsg, false); } else if (currlevel >= 17) { - CreateTypeItem(object[i]._ox, object[i]._oy, TRUE, ITYPE_HARMOR, IMISC_NONE, sendmsg, FALSE); + CreateTypeItem(object[i]._ox, object[i]._oy, true, ITYPE_HARMOR, IMISC_NONE, sendmsg, false); } if (pnum == myplr) - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); return; } } @@ -4260,26 +4260,26 @@ int FindValidShrine(int i) int rv; bool done; - done = FALSE; + done = false; do { rv = random_(0, gbIsHellfire ? NUM_SHRINETYPE : 26); if (currlevel >= shrinemin[rv] && currlevel <= shrinemax[rv] && rv != SHRINE_THAUMATURGIC) { - done = TRUE; + done = true; } if (done) { if (gbIsMultiplayer) { if (shrineavail[rv] == SHRINETYPE_SINGLE) { - done = FALSE; + done = false; continue; } } if (!gbIsMultiplayer) { if (shrineavail[rv] == SHRINETYPE_MULTI) { - done = FALSE; + done = false; continue; } } - done = TRUE; + done = true; } } while (!done); return rv; @@ -4310,14 +4310,14 @@ bool OperateFountains(int pnum, int i) bool applied; bool done; - applied = FALSE; + applied = false; SetRndSeed(object[i]._oRndSeed); switch (object[i]._otype) { case OBJ_BLOODFTN: if (deltaload) - return FALSE; + return false; if (pnum != myplr) - return FALSE; + return false; if (plr[pnum]._pHitPoints < plr[pnum]._pMaxHP) { PlaySfxLoc(LS_FOUNTAIN, object[i]._ox, object[i]._oy); @@ -4327,15 +4327,15 @@ bool OperateFountains(int pnum, int i) plr[pnum]._pHitPoints = plr[pnum]._pMaxHP; plr[pnum]._pHPBase = plr[pnum]._pMaxHPBase; } - applied = TRUE; + applied = true; } else PlaySfxLoc(LS_FOUNTAIN, object[i]._ox, object[i]._oy); break; case OBJ_PURIFYINGFTN: if (deltaload) - return FALSE; + return false; if (pnum != myplr) - return FALSE; + return false; if (plr[pnum]._pMana < plr[pnum]._pMaxMana) { PlaySfxLoc(LS_FOUNTAIN, object[i]._ox, object[i]._oy); @@ -4347,7 +4347,7 @@ bool OperateFountains(int pnum, int i) plr[pnum]._pManaBase = plr[pnum]._pMaxManaBase; } - applied = TRUE; + applied = true; } else PlaySfxLoc(LS_FOUNTAIN, object[i]._ox, object[i]._oy); break; @@ -4358,7 +4358,7 @@ bool OperateFountains(int pnum, int i) PlaySfxLoc(LS_FOUNTAIN, object[i]._ox, object[i]._oy); object[i]._oSelFlag = 0; if (deltaload) - return FALSE; + return false; AddMissile( plr[pnum]._px, plr[pnum]._py, @@ -4370,24 +4370,24 @@ bool OperateFountains(int pnum, int i) pnum, 0, 2 * leveltype); - applied = TRUE; + applied = true; if (pnum == myplr) - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); break; case OBJ_TEARFTN: if (object[i]._oSelFlag == 0) break; prev = -1; add = -1; - done = FALSE; + done = false; cnt = 0; if (!deltaload) PlaySfxLoc(LS_FOUNTAIN, object[i]._ox, object[i]._oy); object[i]._oSelFlag = 0; if (deltaload) - return FALSE; + return false; if (pnum != myplr) - return FALSE; + return false; while (!done) { rnd = random_(0, 4); if (rnd != prev) { @@ -4412,12 +4412,12 @@ bool OperateFountains(int pnum, int i) if (cnt <= 1) continue; - done = TRUE; + done = true; } CheckStats(pnum); - applied = TRUE; + applied = true; if (pnum == myplr) - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); break; } force_redraw = 255; @@ -4452,10 +4452,10 @@ void OperateWeaponRack(int pnum, int i, bool sendmsg) if (deltaload) return; - CreateTypeItem(object[i]._ox, object[i]._oy, leveltype > 1, weaponType, IMISC_NONE, sendmsg, FALSE); + CreateTypeItem(object[i]._ox, object[i]._oy, leveltype > 1, weaponType, IMISC_NONE, sendmsg, false); if (pnum == myplr) - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); } void OperateStoryBook(int pnum, int i) @@ -4465,7 +4465,7 @@ void OperateStoryBook(int pnum, int i) PlaySfxLoc(IS_ISCROL, object[i]._ox, object[i]._oy); if (object[i]._oVar8 != 0 && currlevel == 24) { if (IsUberLeverActivated != 1 && quests[Q_NAKRUL]._qactive != 3 && objects_lv_24_454B04(object[i]._oVar8)) { - NetSendCmd(FALSE, CMD_NAKRUL); + NetSendCmd(false, CMD_NAKRUL); return; } } else if (currlevel >= 21) { @@ -4474,7 +4474,7 @@ void OperateStoryBook(int pnum, int i) quests[Q_NAKRUL]._qmsg = object[i]._oVar2; } InitQTextMsg(object[i]._oVar2); - NetSendCmdParam1(FALSE, CMD_OPERATEOBJ, i); + NetSendCmdParam1(false, CMD_OPERATEOBJ, i); } } @@ -4504,37 +4504,37 @@ void OperateObject(int pnum, int i, bool TeleFlag) case OBJ_L1RDOOR: if (TeleFlag) { if (object[i]._otype == OBJ_L1LDOOR) - OperateL1LDoor(pnum, i, TRUE); + OperateL1LDoor(pnum, i, true); if (object[i]._otype == OBJ_L1RDOOR) - OperateL1RDoor(pnum, i, TRUE); + OperateL1RDoor(pnum, i, true); break; } if (pnum == myplr) - OperateL1Door(pnum, i, TRUE); + OperateL1Door(pnum, i, true); break; case OBJ_L2LDOOR: case OBJ_L2RDOOR: if (TeleFlag) { if (object[i]._otype == OBJ_L2LDOOR) - OperateL2LDoor(pnum, i, TRUE); + OperateL2LDoor(pnum, i, true); if (object[i]._otype == OBJ_L2RDOOR) - OperateL2RDoor(pnum, i, TRUE); + OperateL2RDoor(pnum, i, true); break; } if (pnum == myplr) - OperateL2Door(pnum, i, TRUE); + OperateL2Door(pnum, i, true); break; case OBJ_L3LDOOR: case OBJ_L3RDOOR: if (TeleFlag) { if (object[i]._otype == OBJ_L3LDOOR) - OperateL3LDoor(pnum, i, TRUE); + OperateL3LDoor(pnum, i, true); if (object[i]._otype == OBJ_L3RDOOR) - OperateL3RDoor(pnum, i, TRUE); + OperateL3RDoor(pnum, i, true); break; } if (pnum == myplr) - OperateL3Door(pnum, i, TRUE); + OperateL3Door(pnum, i, true); break; case OBJ_LEVER: case OBJ_SWITCHSKL: @@ -4628,17 +4628,17 @@ void SyncOpL1Door(int pnum, int cmd, int i) if (pnum == myplr) return; - do_sync = FALSE; + do_sync = false; if (cmd == CMD_OPENDOOR && object[i]._oVar4 == 0) { - do_sync = TRUE; + do_sync = true; } if (cmd == CMD_CLOSEDOOR && object[i]._oVar4 == 1) - do_sync = TRUE; + do_sync = true; if (do_sync) { if (object[i]._otype == OBJ_L1LDOOR) - OperateL1LDoor(-1, i, FALSE); + OperateL1LDoor(-1, i, false); if (object[i]._otype == OBJ_L1RDOOR) - OperateL1RDoor(-1, i, FALSE); + OperateL1RDoor(-1, i, false); } } @@ -4649,17 +4649,17 @@ void SyncOpL2Door(int pnum, int cmd, int i) if (pnum == myplr) return; - do_sync = FALSE; + do_sync = false; if (cmd == CMD_OPENDOOR && object[i]._oVar4 == 0) { - do_sync = TRUE; + do_sync = true; } if (cmd == CMD_CLOSEDOOR && object[i]._oVar4 == 1) - do_sync = TRUE; + do_sync = true; if (do_sync) { if (object[i]._otype == OBJ_L2LDOOR) - OperateL2LDoor(-1, i, FALSE); + OperateL2LDoor(-1, i, false); if (object[i]._otype == OBJ_L2RDOOR) - OperateL2RDoor(-1, i, FALSE); + OperateL2RDoor(-1, i, false); } } @@ -4670,17 +4670,17 @@ void SyncOpL3Door(int pnum, int cmd, int i) if (pnum == myplr) return; - do_sync = FALSE; + do_sync = false; if (cmd == CMD_OPENDOOR && object[i]._oVar4 == 0) { - do_sync = TRUE; + do_sync = true; } if (cmd == CMD_CLOSEDOOR && object[i]._oVar4 == 1) - do_sync = TRUE; + do_sync = true; if (do_sync) { if (object[i]._otype == OBJ_L3LDOOR) - OperateL3LDoor(-1, i, FALSE); + OperateL3LDoor(-1, i, false); if (object[i]._otype == OBJ_L3RDOOR) - OperateL3RDoor(-1, i, FALSE); + OperateL3RDoor(-1, i, false); } } @@ -4709,10 +4709,10 @@ void SyncOpObject(int pnum, int cmd, int i) case OBJ_TCHEST1: case OBJ_TCHEST2: case OBJ_TCHEST3: - OperateChest(pnum, i, FALSE); + OperateChest(pnum, i, false); break; case OBJ_SARC: - OperateSarc(pnum, i, FALSE); + OperateSarc(pnum, i, false); break; case OBJ_BLINDBOOK: case OBJ_BLOODBOOK: @@ -4725,18 +4725,18 @@ void SyncOpObject(int pnum, int cmd, int i) break; case OBJ_SKELBOOK: case OBJ_BOOKSTAND: - OperateSkelBook(pnum, i, FALSE); + OperateSkelBook(pnum, i, false); break; case OBJ_BOOKCASEL: case OBJ_BOOKCASER: - OperateBookCase(pnum, i, FALSE); + OperateBookCase(pnum, i, false); break; case OBJ_DECAP: - OperateDecap(pnum, i, FALSE); + OperateDecap(pnum, i, false); break; case OBJ_ARMORSTAND: case OBJ_WARARMOR: - OperateArmorStand(pnum, i, FALSE); + OperateArmorStand(pnum, i, false); break; case OBJ_GOATSHRINE: OperateGoatShrine(pnum, i, LS_GSHRINE); @@ -4756,13 +4756,13 @@ void SyncOpObject(int pnum, int cmd, int i) break; case OBJ_WARWEAP: case OBJ_WEAPONRACK: - OperateWeaponRack(pnum, i, FALSE); + OperateWeaponRack(pnum, i, false); break; case OBJ_MUSHPATCH: OperateMushPatch(pnum, i); break; case OBJ_SLAINHERO: - OperateSlainHero(pnum, i, FALSE); + OperateSlainHero(pnum, i, false); break; case OBJ_SIGNCHEST: OperateInnSignChest(pnum, i); @@ -4778,18 +4778,18 @@ void BreakCrux(int i) object[i]._oAnimFlag = 1; object[i]._oAnimFrame = 1; object[i]._oAnimDelay = 1; - object[i]._oSolidFlag = TRUE; - object[i]._oMissFlag = TRUE; + object[i]._oSolidFlag = true; + object[i]._oMissFlag = true; object[i]._oBreak = -1; object[i]._oSelFlag = 0; - triggered = TRUE; + triggered = true; for (j = 0; j < nobjects; j++) { oi = objectactive[j]; if (object[oi]._otype != OBJ_CRUX1 && object[oi]._otype != OBJ_CRUX2 && object[oi]._otype != OBJ_CRUX3) continue; if (object[i]._oVar8 != object[oi]._oVar8 || object[oi]._oBreak == -1) continue; - triggered = FALSE; + triggered = false; } if (!triggered) return; @@ -4824,11 +4824,11 @@ void BreakBarrel(int pnum, int i, int dam, bool forcebreak, bool sendmsg) object[i]._oAnimFlag = 1; object[i]._oAnimFrame = 1; object[i]._oAnimDelay = 1; - object[i]._oSolidFlag = FALSE; - object[i]._oMissFlag = TRUE; + object[i]._oSolidFlag = false; + object[i]._oMissFlag = true; object[i]._oBreak = -1; object[i]._oSelFlag = 0; - object[i]._oPreFlag = TRUE; + object[i]._oPreFlag = true; if (deltaload) { object[i]._oAnimFrame = object[i]._oAnimLen; object[i]._oAnimCnt = 0; @@ -4846,14 +4846,14 @@ void BreakBarrel(int pnum, int i, int dam, bool forcebreak, bool 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, MIS_FIREBOLT, FALSE); + MonsterTrapHit(dMonster[xp][yp] - 1, 1, 4, 0, MIS_FIREBOLT, false); bool unused; if (dPlayer[xp][yp] > 0) - PlayerMHit(dPlayer[xp][yp] - 1, -1, 0, 8, 16, MIS_FIREBOLT, FALSE, 0, &unused); + PlayerMHit(dPlayer[xp][yp] - 1, -1, 0, 8, 16, MIS_FIREBOLT, false, 0, &unused); if (dObject[xp][yp] > 0) { oi = dObject[xp][yp] - 1; if (object[oi]._otype == OBJ_BARRELEX && object[oi]._oBreak != -1) - BreakBarrel(pnum, oi, dam, TRUE, sendmsg); + BreakBarrel(pnum, oi, dam, true, sendmsg); } } } @@ -4869,13 +4869,13 @@ void BreakBarrel(int pnum, int i, int dam, bool forcebreak, bool sendmsg) if (object[i]._oVar3 == 0) CreateRndUseful(pnum, object[i]._ox, object[i]._oy, sendmsg); else - CreateRndItem(object[i]._ox, object[i]._oy, FALSE, sendmsg, FALSE); + 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); } if (pnum == myplr) - NetSendCmdParam2(FALSE, CMD_BREAKOBJ, pnum, i); + NetSendCmdParam2(false, CMD_BREAKOBJ, pnum, i); } void BreakObject(int pnum, int oi) @@ -4898,7 +4898,7 @@ void BreakObject(int pnum, int oi) break; case OBJ_BARREL: case OBJ_BARRELEX: - BreakBarrel(pnum, oi, objdam, FALSE, TRUE); + BreakBarrel(pnum, oi, objdam, false, true); break; } } @@ -4906,7 +4906,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, FALSE); + BreakBarrel(pnum, oi, 0, true, false); } void SyncL1Doors(int i) @@ -4914,11 +4914,11 @@ void SyncL1Doors(int i) int x, y; if (object[i]._oVar4 == 0) { - object[i]._oMissFlag = FALSE; + object[i]._oMissFlag = false; return; } - object[i]._oMissFlag = TRUE; + object[i]._oMissFlag = true; x = object[i]._ox; y = object[i]._oy; @@ -4959,7 +4959,7 @@ void SyncCrux(int i) bool found; int j, oi, type; - found = TRUE; + found = true; for (j = 0; j < nobjects; j++) { oi = objectactive[j]; type = object[oi]._otype; @@ -4967,7 +4967,7 @@ void SyncCrux(int i) continue; if (object[i]._oVar8 != object[oi]._oVar8 || object[oi]._oBreak == -1) continue; - found = FALSE; + found = false; } if (found) ObjChangeMap(object[i]._oVar1, object[i]._oVar2, object[i]._oVar3, object[i]._oVar4); @@ -5017,9 +5017,9 @@ void SyncL2Doors(int i) int x, y; if (object[i]._oVar4 == 0) - object[i]._oMissFlag = FALSE; + object[i]._oMissFlag = false; else - object[i]._oMissFlag = TRUE; + object[i]._oMissFlag = true; x = object[i]._ox; y = object[i]._oy; object[i]._oSelFlag = 2; @@ -5042,7 +5042,7 @@ void SyncL3Doors(int i) { int x, y; - object[i]._oMissFlag = TRUE; + object[i]._oMissFlag = true; x = object[i]._ox; y = object[i]._oy; object[i]._oSelFlag = 2; @@ -5310,11 +5310,11 @@ bool objects_lv_24_454B04(int s) break; case 8: if (dword_6DE0E0 == 2) - return TRUE; + return true; dword_6DE0E0 = 0; break; } - return FALSE; + return false; } } // namespace devilution diff --git a/Source/pack.cpp b/Source/pack.cpp index 78fa0f0b..46442db3 100644 --- a/Source/pack.cpp +++ b/Source/pack.cpp @@ -121,7 +121,7 @@ void PackPlayer(PkPlayerStruct *pPack, int pnum, bool manashield) if (!gbIsMultiplayer || manashield) pPack->pManaShield = SwapLE32(pPlayer->pManaShield); else - pPack->pManaShield = FALSE; + pPack->pManaShield = false; } /** @@ -218,7 +218,7 @@ void UnPackPlayer(PkPlayerStruct *pPack, int pnum, bool netSync) pPlayer->destAction = ACTION_NONE; strcpy(pPlayer->_pName, pPack->pName); pPlayer->_pClass = (plr_class)pPack->pClass; - InitPlayer(pnum, TRUE); + InitPlayer(pnum, true); pPlayer->_pBaseStr = pPack->pBaseStr; pPlayer->_pStrength = pPack->pBaseStr; pPlayer->_pBaseMag = pPack->pBaseMag; @@ -288,7 +288,7 @@ void UnPackPlayer(PkPlayerStruct *pPack, int pnum, bool netSync) witchitem[i]._itype = ITYPE_NONE; } - CalcPlrInv(pnum, FALSE); + CalcPlrInv(pnum, false); pPlayer->wReflections = SwapLE16(pPack->wReflections); pPlayer->pTownWarps = 0; pPlayer->pDungMsgs = 0; diff --git a/Source/palette.cpp b/Source/palette.cpp index d8989a78..f955fd53 100644 --- a/Source/palette.cpp +++ b/Source/palette.cpp @@ -18,7 +18,7 @@ Uint8 paletteTransparencyLookup[256][256]; //Lookup table for transparency /* data */ /** Specifies whether the palette has max brightness. */ -bool sgbFadedIn = TRUE; +bool sgbFadedIn = true; void palette_update() { @@ -237,7 +237,7 @@ void PaletteFadeIn(int fr) } SetFadeLevel(256); memcpy(logical_palette, orig_palette, sizeof(orig_palette)); - sgbFadedIn = TRUE; + sgbFadedIn = true; } void PaletteFadeOut(int fr) @@ -253,7 +253,7 @@ void PaletteFadeOut(int fr) RenderPresent(); } SetFadeLevel(0); - sgbFadedIn = FALSE; + sgbFadedIn = false; } } diff --git a/Source/path.cpp b/Source/path.cpp index 238f88a8..289a2ee4 100644 --- a/Source/path.cpp +++ b/Source/path.cpp @@ -150,7 +150,7 @@ PATHNODE *GetNextPath() */ bool path_solid_pieces(PATHNODE *pPath, int dx, int dy) { - bool rv = TRUE; + bool rv = true; switch (path_directions[3 * (dy - pPath->y) + 3 - pPath->x + 1 + dx]) { case 5: rv = !nSolidTable[dPiece[dx][dy + 1]] && !nSolidTable[dPiece[dx + 1][dy]]; @@ -171,7 +171,7 @@ bool path_solid_pieces(PATHNODE *pPath, int dx, int dy) /** * @brief perform a single step of A* bread-first search by trying to step in every possible direction from pPath with goal (x,y). Check each step with PosOk * - * @return FALSE if we ran out of preallocated nodes to use, else TRUE + * @return false if we ran out of preallocated nodes to use, else true */ bool path_get_path(bool (*PosOk)(int, int, int), int PosOkArg, PATHNODE *pPath, int x, int y) { @@ -185,17 +185,17 @@ bool path_get_path(bool (*PosOk)(int, int, int), int PosOkArg, PATHNODE *pPath, ok = PosOk(PosOkArg, dx, dy); if ((ok && path_solid_pieces(pPath, dx, dy)) || (!ok && dx == x && dy == y)) { if (!path_parent_path(pPath, dx, dy, x, y)) - return FALSE; + return false; } } - return TRUE; + return true; } /** * @brief add a step from pPath to (dx,dy), return 1 if successful, and update the frontier/visited nodes accordingly * - * @return TRUE if step successfully added, FALSE if we ran out of nodes to use + * @return true if step successfully added, false if we ran out of nodes to use */ bool path_parent_path(PATHNODE *pPath, int dx, int dy, int sx, int sy) { @@ -243,7 +243,7 @@ bool path_parent_path(PATHNODE *pPath, int dx, int dy, int sx, int sy) // case 3: (dx,dy) is totally new dxdy = path_new_step(); if (dxdy == NULL) - return FALSE; + return false; dxdy->Parent = pPath; dxdy->g = next_g; dxdy->h = path_get_h_cost(dx, dy, sx, sy); @@ -260,7 +260,7 @@ bool path_parent_path(PATHNODE *pPath, int dx, int dy, int sx, int sy) pPath->Child[i] = dxdy; } } - return TRUE; + return true; } /** diff --git a/Source/pfile.cpp b/Source/pfile.cpp index 3f3d7c6b..4165a6a8 100644 --- a/Source/pfile.cpp +++ b/Source/pfile.cpp @@ -104,12 +104,12 @@ static bool pfile_read_hero(HANDLE archive, PkPlayerStruct *pPack) buf = pfile_read_archive(archive, "hero", &read); if (buf == NULL) - return FALSE; + return false; - bool ret = FALSE; + bool ret = false; if (read == sizeof(*pPack)) { memcpy(pPack, buf, sizeof(*pPack)); - ret = TRUE; + ret = true; } mem_free_dbg(buf); @@ -132,9 +132,9 @@ static void pfile_encode_hero(const PkPlayerStruct *pPack) static bool pfile_open_archive(DWORD save_num) { if (OpenMPQ(GetSavePath(save_num).c_str(), save_num)) - return TRUE; + return true; - return FALSE; + return false; } static void pfile_flush(bool is_single_player, DWORD save_num) @@ -200,12 +200,12 @@ bool pfile_create_player_description() game_2_ui_player(&plr[myplr], &uihero, gbValidSaveFile); UiSetupPlayerInfo(gszHero, &uihero, GAME_ID); - return TRUE; + return true; } void pfile_flush_W() { - pfile_flush(TRUE, pfile_get_save_num_from_name(plr[myplr]._pName)); + pfile_flush(true, pfile_get_save_num_from_name(plr[myplr]._pName)); } bool pfile_ui_set_hero_infos(bool (*ui_add_hero_info)(_uiheroinfo *)) @@ -223,11 +223,11 @@ bool pfile_ui_set_hero_infos(bool (*ui_add_hero_info)(_uiheroinfo *)) if (hasSaveGame) pkplr.bIsHellfire = gbIsHellfireSaveGame; - UnPackPlayer(&pkplr, 0, FALSE); + UnPackPlayer(&pkplr, 0, false); LoadHeroItems(&plr[0]); RemoveEmptyInventory(0); - CalcPlrInv(0, FALSE); + CalcPlrInv(0, false); game_2_ui_player(&plr[0], &uihero, hasSaveGame); ui_add_hero_info(&uihero); @@ -236,18 +236,18 @@ bool pfile_ui_set_hero_infos(bool (*ui_add_hero_info)(_uiheroinfo *)) } } - return TRUE; + return true; } bool pfile_archive_contains_game(HANDLE hsArchive, DWORD save_num) { if (gbIsMultiplayer) - return FALSE; + return false; DWORD dwLen; BYTE *gameData = pfile_read_archive(hsArchive, "game", &dwLen); if (gameData == NULL) - return FALSE; + return false; Uint32 hdr = LOAD_LE32(gameData); mem_free_dbg(gameData); @@ -275,25 +275,25 @@ bool pfile_ui_save_create(_uiheroinfo *heroinfo) break; } if (save_num >= MAX_CHARACTERS) - return FALSE; + return false; } if (!pfile_open_archive(save_num)) - return FALSE; + return false; mpqapi_remove_hash_entries(pfile_get_file_name); strncpy(hero_names[save_num], heroinfo->name, PLR_NAME_LEN); hero_names[save_num][PLR_NAME_LEN - 1] = '\0'; CreatePlayer(0, heroinfo->heroclass); strncpy(plr[0]._pName, heroinfo->name, PLR_NAME_LEN); plr[0]._pName[PLR_NAME_LEN - 1] = '\0'; - PackPlayer(&pkplr, 0, TRUE); + PackPlayer(&pkplr, 0, true); pfile_encode_hero(&pkplr); - game_2_ui_player(&plr[0], heroinfo, FALSE); + game_2_ui_player(&plr[0], heroinfo, false); if (!gbVanilla) { SaveHotkeys(); SaveHeroItems(&plr[0]); } - pfile_flush(TRUE, save_num); - return TRUE; + pfile_flush(true, save_num); + return true; } bool pfile_get_file_name(DWORD lvl, char *dst) @@ -302,7 +302,7 @@ bool pfile_get_file_name(DWORD lvl, char *dst) if (gbIsMultiplayer) { if (lvl) - return FALSE; + return false; fmt = "hero"; } else { if (lvl < giNumberOfLevels) @@ -315,10 +315,10 @@ bool pfile_get_file_name(DWORD lvl, char *dst) else if (lvl == giNumberOfLevels * 2 + 1) fmt = "hero"; else - return FALSE; + return false; } sprintf(dst, fmt, lvl); - return TRUE; + return true; } bool pfile_delete_save(_uiheroinfo *hero_info) @@ -330,7 +330,7 @@ bool pfile_delete_save(_uiheroinfo *hero_info) hero_names[save_num][0] = '\0'; RemoveFile(GetSavePath(save_num).c_str()); } - return TRUE; + return true; } void pfile_read_player_from_save() @@ -350,11 +350,11 @@ void pfile_read_player_from_save() if (gbValidSaveFile) pkplr.bIsHellfire = gbIsHellfireSaveGame; - UnPackPlayer(&pkplr, myplr, FALSE); + UnPackPlayer(&pkplr, myplr, false); LoadHeroItems(&plr[myplr]); RemoveEmptyInventory(myplr); - CalcPlrInv(myplr, FALSE); + CalcPlrInv(myplr, false); pfile_SFileCloseArchive(archive); } @@ -370,7 +370,7 @@ bool LevelFileExists() app_fatal("Unable to read to save file archive"); bool has_file = mpqapi_has_file(szName); - pfile_flush(TRUE, save_num); + pfile_flush(true, save_num); return has_file; } @@ -393,7 +393,7 @@ void GetPermLevelNames(char *szPerm) app_fatal("Unable to read to save file archive"); has_file = mpqapi_has_file(szPerm); - pfile_flush(TRUE, save_num); + pfile_flush(true, save_num); if (!has_file) { if (setlevel) sprintf(szPerm, "perms%02d", setlvlnum); @@ -412,10 +412,10 @@ static bool GetPermSaveNames(DWORD dwIndex, char *szPerm) dwIndex -= giNumberOfLevels; fmt = "perms%02d"; } else - return FALSE; + return false; sprintf(szPerm, fmt, dwIndex); - return TRUE; + return true; } static bool GetTempSaveNames(DWORD dwIndex, char *szTemp) @@ -428,10 +428,10 @@ static bool GetTempSaveNames(DWORD dwIndex, char *szTemp) dwIndex -= giNumberOfLevels; fmt = "temps%02d"; } else - return FALSE; + return false; sprintf(szTemp, fmt, dwIndex); - return TRUE; + return true; } void pfile_remove_temp_files() @@ -443,7 +443,7 @@ void pfile_remove_temp_files() if (!pfile_open_archive(save_num)) app_fatal("Unable to write to save file archive"); mpqapi_remove_hash_entries(GetTempSaveNames); - pfile_flush(TRUE, save_num); + pfile_flush(true, save_num); } void pfile_rename_temp_to_perm() @@ -471,7 +471,7 @@ void pfile_rename_temp_to_perm() } } assert(!GetPermSaveNames(dwIndex, szPerm)); - pfile_flush(TRUE, dwChar); + pfile_flush(true, dwChar); } void pfile_write_save_file(const char *pszName, BYTE *pbData, DWORD dwLen, DWORD qwLen) @@ -483,7 +483,7 @@ void pfile_write_save_file(const char *pszName, BYTE *pbData, DWORD dwLen, DWORD if (!pfile_open_archive(save_num)) app_fatal("Unable to write to save file archive"); mpqapi_write_file(pszName, pbData, qwLen); - pfile_flush(TRUE, save_num); + pfile_flush(true, save_num); } BYTE *pfile_read(const char *pszName, DWORD *pdwLen) diff --git a/Source/player.cpp b/Source/player.cpp index 3a9355cb..e2c055da 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -713,7 +713,7 @@ void CreatePlayer(int pnum, plr_class c) plr[pnum]._pLghtResist = 0; } plr[pnum]._pLightRad = 10; - plr[pnum]._pInfraFlag = FALSE; + plr[pnum]._pInfraFlag = false; plr[pnum]._pRSplType = RSPLTYPE_SKILL; if (c == PC_WARRIOR) { @@ -775,18 +775,18 @@ void CreatePlayer(int pnum, plr_class c) } for (i = 0; i < NUMLEVELS; i++) { - plr[pnum]._pLvlVisited[i] = FALSE; + plr[pnum]._pLvlVisited[i] = false; } for (i = 0; i < 10; i++) { - plr[pnum]._pSLvlVisited[i] = FALSE; + plr[pnum]._pSLvlVisited[i] = false; } - plr[pnum]._pLvlChanging = FALSE; + plr[pnum]._pLvlChanging = false; plr[pnum].pTownWarps = 0; plr[pnum].pLvlLoad = 0; - plr[pnum].pBattleNet = FALSE; - plr[pnum].pManaShield = FALSE; + plr[pnum].pBattleNet = false; + plr[pnum].pManaShield = false; plr[pnum].pDamAcFlags = 0; plr[pnum].wReflections = 0; @@ -818,7 +818,7 @@ void NextPlrLevel(int pnum) plr[pnum]._pLevel++; plr[pnum]._pMaxLvl++; - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); if (CalcStatDiff(pnum) < 5) { plr[pnum]._pStatPts = CalcStatDiff(pnum); @@ -838,7 +838,7 @@ void NextPlrLevel(int pnum) plr[pnum]._pHPBase = plr[pnum]._pMaxHPBase; if (pnum == myplr) { - drawhpflag = TRUE; + drawhpflag = true; } if (plr[pnum]._pClass == PC_WARRIOR) @@ -860,13 +860,13 @@ void NextPlrLevel(int pnum) } if (pnum == myplr) { - drawmanaflag = TRUE; + drawmanaflag = true; } if (sgbControllerActive) FocusOnCharInfo(); - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); } void AddPlrExperience(int pnum, int lvl, int exp) @@ -933,7 +933,7 @@ void AddPlrExperience(int pnum, int lvl, int exp) } } - NetSendCmdParam1(FALSE, CMD_PLRLEVEL, plr[myplr]._pLevel); + NetSendCmdParam1(false, CMD_PLRLEVEL, plr[myplr]._pLevel); } void AddPlrMonstExper(int lvl, int exp, char pmask) @@ -975,7 +975,7 @@ void InitPlayer(int pnum, bool FirstTime) } else { plr[pnum]._pwtype = WT_MELEE; } - plr[pnum].pManaShield = FALSE; + plr[pnum].pManaShield = false; } if (plr[pnum].plrlevel == currlevel || leveldebug) { @@ -1060,11 +1060,11 @@ void InitPlayer(int pnum, bool FirstTime) #endif plr[pnum]._pNextExper = ExpLvlsTbl[plr[pnum]._pLevel]; - plr[pnum]._pInvincible = FALSE; + plr[pnum]._pInvincible = false; if (pnum == myplr) { deathdelay = 0; - deathflag = FALSE; + deathflag = false; ScrollInfo._sxoff = 0; ScrollInfo._syoff = 0; ScrollInfo._sdir = SDIR_NONE; @@ -1084,7 +1084,7 @@ void InitMultiView() bool SolidLoc(int x, int y) { if (x < 0 || y < 0 || x >= MAXDUNX || y >= MAXDUNY) { - return FALSE; + return false; } return nSolidTable[dPiece[x][y]]; @@ -1103,10 +1103,10 @@ bool PlrDirOK(int pnum, int dir) py = plr[pnum]._py + offset_y[dir]; if (px < 0 || !dPiece[px][py] || !PosOkPlayer(pnum, px, py)) { - return FALSE; + return false; } - isOk = TRUE; + isOk = true; if (dir == DIR_E) { isOk = !SolidLoc(px, py + 1) && !(dFlags[px][py + 1] & BFLAG_PLAYERLR); } @@ -1124,7 +1124,7 @@ void PlrClrTrans(int x, int y) for (i = y - 1; i <= y + 1; i++) { for (j = x - 1; j <= x + 1; j++) { - TransList[dTransVal[j][i]] = FALSE; + TransList[dTransVal[j][i]] = false; } } } @@ -1134,12 +1134,12 @@ void PlrDoTrans(int x, int y) int i, j; if (leveltype != DTYPE_CATHEDRAL && leveltype != DTYPE_CATACOMBS) { - TransList[1] = TRUE; + TransList[1] = true; } else { for (i = y - 1; i <= y + 1; i++) { for (j = x - 1; j <= x + 1; j++) { if (!nSolidTable[dPiece[j][i]] && dTransVal[j][i]) { - TransList[dTransVal[j][i]] = TRUE; + TransList[dTransVal[j][i]] = true; } } } @@ -1609,7 +1609,7 @@ void StartPlrHit(int pnum, int dam, bool forcehit) PlaySfxLoc(PS_WARR69, plr[pnum]._px, plr[pnum]._py); } - drawhpflag = TRUE; + drawhpflag = true; if (plr[pnum]._pClass == PC_BARBARIAN) { if (dam >> 6 < plr[pnum]._pLevel + plr[pnum]._pLevel / 4 && !forcehit) { return; @@ -1644,7 +1644,7 @@ void RespawnDeadItem(ItemStruct *itm, int x, int y) items[ii] = *itm; items[ii]._ix = x; items[ii]._iy = y; - RespawnItem(&items[ii], TRUE); + RespawnItem(&items[ii], true); itm->_itype = ITYPE_NONE; } @@ -1666,7 +1666,7 @@ static void PlrDeadItem(int pnum, ItemStruct *itm, int xx, int yy) if ((xx || yy) && ItemSpaceOk(x, y)) { RespawnDeadItem(itm, x, y); plr[pnum].HoldItem = *itm; - NetSendCmdPItem(FALSE, CMD_RESPAWNITEM, x, y); + NetSendCmdPItem(false, CMD_RESPAWNITEM, x, y); return; } @@ -1678,7 +1678,7 @@ static void PlrDeadItem(int pnum, ItemStruct *itm, int xx, int yy) if (ItemSpaceOk(x, y)) { RespawnDeadItem(itm, x, y); plr[pnum].HoldItem = *itm; - NetSendCmdPItem(FALSE, CMD_RESPAWNITEM, x, y); + NetSendCmdPItem(false, CMD_RESPAWNITEM, x, y); return; } } @@ -1704,7 +1704,7 @@ StartPlayerKill(int pnum, int earflag) } if (myplr == pnum) { - NetSendCmdParam1(TRUE, CMD_PLRDEAD, earflag); + NetSendCmdParam1(true, CMD_PLRDEAD, earflag); } diablolevel = gbIsMultiplayer && plr[pnum].plrlevel == 16; @@ -1739,9 +1739,9 @@ StartPlayerKill(int pnum, int earflag) NewPlrAnim(pnum, p->_pDAnim[p->_pdir], p->_pDFrames, 1, p->_pDWidth); - p->_pBlockFlag = FALSE; + p->_pBlockFlag = false; p->_pmode = PM_DEATH; - p->_pInvincible = TRUE; + p->_pInvincible = true; SetPlayerHitPoints(pnum, 0); p->_pVar8 = 1; @@ -1749,7 +1749,7 @@ StartPlayerKill(int pnum, int earflag) for (i = 0; i < NUM_INVLOC; i++) { p->InvBody[i]._itype = ITYPE_NONE; } - CalcPlrInv(pnum, FALSE); + CalcPlrInv(pnum, false); } if (plr[pnum].plrlevel == currlevel) { @@ -1759,7 +1759,7 @@ StartPlayerKill(int pnum, int earflag) SetPlayerOld(pnum); if (pnum == myplr) { - drawhpflag = TRUE; + drawhpflag = true; deathdelay = 30; if (pcurs >= CURSOR_FIRSTITEM) { @@ -1799,7 +1799,7 @@ StartPlayerKill(int pnum, int earflag) pi++; } - CalcPlrInv(pnum, FALSE); + CalcPlrInv(pnum, false); } } } @@ -1959,7 +1959,7 @@ void SyncPlrKill(int pnum, int earflag) for (i = 0; i < nummissiles; i++) { ma = missileactive[i]; - if (missile[ma]._mitype == MIS_MANASHIELD && missile[ma]._misource == pnum && missile[ma]._miDelFlag == FALSE) { + if (missile[ma]._mitype == MIS_MANASHIELD && missile[ma]._misource == pnum && missile[ma]._miDelFlag == false) { if (earflag != -1) { missile[ma]._miVar8 = earflag; } @@ -1983,7 +1983,7 @@ void RemovePlrMissiles(int pnum) mx = monster[myplr]._mx; my = monster[myplr]._my; dMonster[mx][my] = 0; - monster[myplr]._mDelFlag = TRUE; + monster[myplr]._mDelFlag = true; DeleteMonsterList(); } @@ -2007,7 +2007,7 @@ void InitLevelChange(int pnum) { RemovePlrMissiles(pnum); if (pnum == myplr && qtextflag) { - qtextflag = FALSE; + qtextflag = false; stream_stop(); } @@ -2016,12 +2016,12 @@ void InitLevelChange(int pnum) if (pnum == myplr) { dPlayer[plr[myplr]._px][plr[myplr]._py] = myplr + 1; } else { - plr[pnum]._pLvlVisited[plr[pnum].plrlevel] = TRUE; + plr[pnum]._pLvlVisited[plr[pnum].plrlevel] = true; } ClrPlrPath(pnum); plr[pnum].destAction = ACTION_NONE; - plr[pnum]._pLvlChanging = TRUE; + plr[pnum]._pLvlChanging = true; if (pnum == myplr) { plr[pnum].pLvlLoad = 10; @@ -2064,10 +2064,10 @@ StartNewLvl(int pnum, int fom, int lvl) if (pnum == myplr) { plr[pnum]._pmode = PM_NEWLVL; - plr[pnum]._pInvincible = TRUE; + plr[pnum]._pInvincible = true; PostMessage(fom, 0, 0); if (gbIsMultiplayer) { - NetSendCmdParam2(TRUE, CMD_NEWLVL, fom, lvl); + NetSendCmdParam2(true, CMD_NEWLVL, fom, lvl); } } } @@ -2079,18 +2079,18 @@ void RestartTownLvl(int pnum) } plr[pnum].plrlevel = 0; - plr[pnum]._pInvincible = FALSE; + plr[pnum]._pInvincible = false; SetPlayerHitPoints(pnum, 64); plr[pnum]._pMana = 0; plr[pnum]._pManaBase = plr[pnum]._pMana - (plr[pnum]._pMaxMana - plr[pnum]._pMaxManaBase); - CalcPlrInv(pnum, FALSE); + CalcPlrInv(pnum, false); if (pnum == myplr) { plr[pnum]._pmode = PM_NEWLVL; - plr[pnum]._pInvincible = TRUE; + plr[pnum]._pInvincible = true; PostMessage(WM_DIABRETOWN, 0, 0); } } @@ -2110,14 +2110,14 @@ void StartWarpLvl(int pnum, int pidx) if (pnum == myplr) { SetCurrentPortal(pidx); plr[pnum]._pmode = PM_NEWLVL; - plr[pnum]._pInvincible = TRUE; + plr[pnum]._pInvincible = true; PostMessage(WM_DIABWARPLVL, 0, 0); } } bool PM_DoStand(int pnum) { - return FALSE; + return false; } /** @@ -2220,12 +2220,12 @@ static bool WeaponDurDecay(int pnum, int ii) if (!plr[pnum].InvBody[ii].isEmpty() && plr[pnum].InvBody[ii]._iClass == ICLASS_WEAPON && plr[pnum].InvBody[ii]._iDamAcFlags & 2) { plr[pnum].InvBody[ii]._iPLDam -= 5; if (plr[pnum].InvBody[ii]._iPLDam <= -100) { - NetSendCmdDelItem(TRUE, ii); + NetSendCmdDelItem(true, ii); plr[pnum].InvBody[ii]._itype = ITYPE_NONE; - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); return true; } - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); } return false; } @@ -2233,16 +2233,16 @@ static bool WeaponDurDecay(int pnum, int ii) bool WeaponDur(int pnum, int durrnd) { if (pnum != myplr) { - return FALSE; + return false; } if (WeaponDurDecay(pnum, INVLOC_HAND_LEFT)) - return TRUE; + return true; if (WeaponDurDecay(pnum, INVLOC_HAND_RIGHT)) - return TRUE; + return true; if (random_(3, durrnd) != 0) { - return FALSE; + return false; } if ((DWORD)pnum >= MAX_PLRS) { @@ -2251,61 +2251,61 @@ bool WeaponDur(int pnum, int durrnd) if (!plr[pnum].InvBody[INVLOC_HAND_LEFT].isEmpty() && plr[pnum].InvBody[INVLOC_HAND_LEFT]._iClass == ICLASS_WEAPON) { if (plr[pnum].InvBody[INVLOC_HAND_LEFT]._iDurability == DUR_INDESTRUCTIBLE) { - return FALSE; + return false; } plr[pnum].InvBody[INVLOC_HAND_LEFT]._iDurability--; if (plr[pnum].InvBody[INVLOC_HAND_LEFT]._iDurability <= 0) { - NetSendCmdDelItem(TRUE, INVLOC_HAND_LEFT); + NetSendCmdDelItem(true, INVLOC_HAND_LEFT); plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype = ITYPE_NONE; - CalcPlrInv(pnum, TRUE); - return TRUE; + CalcPlrInv(pnum, true); + return true; } } if (!plr[pnum].InvBody[INVLOC_HAND_RIGHT].isEmpty() && plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iClass == ICLASS_WEAPON) { if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iDurability == DUR_INDESTRUCTIBLE) { - return FALSE; + return false; } plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iDurability--; if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iDurability == 0) { - NetSendCmdDelItem(TRUE, INVLOC_HAND_RIGHT); + NetSendCmdDelItem(true, INVLOC_HAND_RIGHT); plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype = ITYPE_NONE; - CalcPlrInv(pnum, TRUE); - return TRUE; + CalcPlrInv(pnum, true); + return true; } } if (plr[pnum].InvBody[INVLOC_HAND_LEFT].isEmpty() && plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype == ITYPE_SHIELD) { if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iDurability == DUR_INDESTRUCTIBLE) { - return FALSE; + return false; } plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iDurability--; if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iDurability == 0) { - NetSendCmdDelItem(TRUE, INVLOC_HAND_RIGHT); + NetSendCmdDelItem(true, INVLOC_HAND_RIGHT); plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype = ITYPE_NONE; - CalcPlrInv(pnum, TRUE); - return TRUE; + CalcPlrInv(pnum, true); + return true; } } if (plr[pnum].InvBody[INVLOC_HAND_RIGHT].isEmpty() && plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype == ITYPE_SHIELD) { if (plr[pnum].InvBody[INVLOC_HAND_LEFT]._iDurability == DUR_INDESTRUCTIBLE) { - return FALSE; + return false; } plr[pnum].InvBody[INVLOC_HAND_LEFT]._iDurability--; if (plr[pnum].InvBody[INVLOC_HAND_LEFT]._iDurability == 0) { - NetSendCmdDelItem(TRUE, INVLOC_HAND_LEFT); + NetSendCmdDelItem(true, INVLOC_HAND_LEFT); plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype = ITYPE_NONE; - CalcPlrInv(pnum, TRUE); - return TRUE; + CalcPlrInv(pnum, true); + return true; } } - return FALSE; + return false; } bool PlrHitMonst(int pnum, int m) @@ -2313,27 +2313,27 @@ bool PlrHitMonst(int pnum, int m) bool rv, ret; int hit, hper, mind, maxd, ddp, dam, skdam, phanditype, tmac; hper = 0; - ret = FALSE; - bool adjacentDamage = FALSE; + ret = false; + bool adjacentDamage = false; if ((DWORD)m >= MAXMONSTERS) { app_fatal("PlrHitMonst: illegal monster %d", m); } if ((monster[m]._mhitpoints >> 6) <= 0) { - return FALSE; + return false; } if (monster[m].MType->mtype == MT_ILLWEAV && monster[m]._mgoal == MGOAL_RETREAT) { - return FALSE; + return false; } if (monster[m]._mmode == MM_CHARGE) { - return FALSE; + return false; } if (pnum < 0) { - adjacentDamage = TRUE; + adjacentDamage = true; pnum = -pnum; if (plr[pnum]._pLevel > 20) hper -= 30; @@ -2345,7 +2345,7 @@ bool PlrHitMonst(int pnum, int m) app_fatal("PlrHitMonst: illegal player %d", pnum); } - rv = FALSE; + rv = false; hit = random_(4, 100); if (monster[m]._mmode == MM_STONE) { @@ -2485,7 +2485,7 @@ bool PlrHitMonst(int pnum, int m) if (plr[pnum]._pHPBase > plr[pnum]._pMaxHPBase) { plr[pnum]._pHPBase = plr[pnum]._pMaxHPBase; } - drawhpflag = TRUE; + drawhpflag = true; } if (plr[pnum]._pIFlags & (ISPL_STEALMANA_3 | ISPL_STEALMANA_5) && !(plr[pnum]._pIFlags & ISPL_NOMANA)) { if (plr[pnum]._pIFlags & ISPL_STEALMANA_3) { @@ -2502,7 +2502,7 @@ bool PlrHitMonst(int pnum, int m) if (plr[pnum]._pManaBase > plr[pnum]._pMaxManaBase) { plr[pnum]._pManaBase = plr[pnum]._pMaxManaBase; } - drawmanaflag = TRUE; + drawmanaflag = true; } if (plr[pnum]._pIFlags & (ISPL_STEALLIFE_3 | ISPL_STEALLIFE_5)) { if (plr[pnum]._pIFlags & ISPL_STEALLIFE_3) { @@ -2519,7 +2519,7 @@ bool PlrHitMonst(int pnum, int m) if (plr[pnum]._pHPBase > plr[pnum]._pMaxHPBase) { plr[pnum]._pHPBase = plr[pnum]._pMaxHPBase; } - drawhpflag = TRUE; + drawhpflag = true; } if (plr[pnum]._pIFlags & ISPL_NOHEALPLR) { monster[m]._mFlags |= MFLAG_NOHEAL; @@ -2547,7 +2547,7 @@ bool PlrHitMonst(int pnum, int m) M_StartHit(m, pnum, dam); } } - rv = TRUE; + rv = true; } return rv; @@ -2562,7 +2562,7 @@ bool PlrHitPlr(int pnum, char p) app_fatal("PlrHitPlr: illegal target player %d", p); } - rv = FALSE; + rv = false; if (plr[p]._pInvincible) { return rv; @@ -2633,15 +2633,15 @@ bool PlrHitPlr(int pnum, char p) if (plr[pnum]._pHPBase > plr[pnum]._pMaxHPBase) { plr[pnum]._pHPBase = plr[pnum]._pMaxHPBase; } - drawhpflag = TRUE; + drawhpflag = true; } if (pnum == myplr) { - NetSendCmdDamage(TRUE, p, skdam); + NetSendCmdDamage(true, p, skdam); } - StartPlrHit(p, skdam, FALSE); + StartPlrHit(p, skdam, false); } - rv = TRUE; + rv = true; } return rv; @@ -2659,16 +2659,16 @@ bool PlrHitObj(int pnum, int mx, int my) if (object[oi]._oBreak == 1) { BreakObject(pnum, oi); - return TRUE; + return true; } - return FALSE; + return false; } bool PM_DoAttack(int pnum) { int frame, dir, dx, dy, m; - bool didhit = FALSE; + bool didhit = false; if ((DWORD)pnum >= MAX_PLRS) { app_fatal("PM_DoAttack: illegal player %d", pnum); @@ -2703,7 +2703,7 @@ bool PM_DoAttack(int pnum) } if (CanTalkToMonst(m)) { plr[pnum]._pVar1 = 0; - return FALSE; + return false; } } @@ -2750,30 +2750,30 @@ bool PM_DoAttack(int pnum) m = ((dMonster[dx][dy] > 0) ? dMonster[dx][dy] : -dMonster[dx][dy]) - 1; if (dMonster[dx][dy] != 0 && !CanTalkToMonst(m) && monster[m]._moldx == dx && monster[m]._moldy == dy) { if (PlrHitMonst(-pnum, m)) - didhit = TRUE; + didhit = true; } dx = plr[pnum]._px + offset_x[(plr[pnum]._pdir + 7) % 8]; dy = plr[pnum]._py + offset_y[(plr[pnum]._pdir + 7) % 8]; m = ((dMonster[dx][dy] > 0) ? dMonster[dx][dy] : -dMonster[dx][dy]) - 1; if (dMonster[dx][dy] != 0 && !CanTalkToMonst(m) && monster[m]._moldx == dx && monster[m]._moldy == dy) { if (PlrHitMonst(-pnum, m)) - didhit = TRUE; + didhit = true; } } if (didhit && WeaponDur(pnum, 30)) { StartStand(pnum, plr[pnum]._pdir); ClearPlrPVars(pnum); - return TRUE; + return true; } } if (plr[pnum]._pAnimFrame == plr[pnum]._pAFrames) { StartStand(pnum, plr[pnum]._pdir); ClearPlrPVars(pnum); - return TRUE; + return true; } else { - return FALSE; + return false; } } @@ -2848,16 +2848,16 @@ bool PM_DoRangeAttack(int pnum) if (WeaponDur(pnum, 40)) { StartStand(pnum, plr[pnum]._pdir); ClearPlrPVars(pnum); - return TRUE; + return true; } } if (plr[pnum]._pAnimFrame >= plr[pnum]._pAFrames) { StartStand(pnum, plr[pnum]._pdir); ClearPlrPVars(pnum); - return TRUE; + return true; } else { - return FALSE; + return false; } } @@ -2878,9 +2878,9 @@ void ShieldDur(int pnum) plr[pnum].InvBody[INVLOC_HAND_LEFT]._iDurability--; if (plr[pnum].InvBody[INVLOC_HAND_LEFT]._iDurability == 0) { - NetSendCmdDelItem(TRUE, INVLOC_HAND_LEFT); + NetSendCmdDelItem(true, INVLOC_HAND_LEFT); plr[pnum].InvBody[INVLOC_HAND_LEFT]._itype = ITYPE_NONE; - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); } } @@ -2888,9 +2888,9 @@ void ShieldDur(int pnum) if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iDurability != DUR_INDESTRUCTIBLE) { plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iDurability--; if (plr[pnum].InvBody[INVLOC_HAND_RIGHT]._iDurability == 0) { - NetSendCmdDelItem(TRUE, INVLOC_HAND_RIGHT); + NetSendCmdDelItem(true, INVLOC_HAND_RIGHT); plr[pnum].InvBody[INVLOC_HAND_RIGHT]._itype = ITYPE_NONE; - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); } } } @@ -2913,10 +2913,10 @@ bool PM_DoBlock(int pnum) if (random_(3, 10) == 0) { ShieldDur(pnum); } - return TRUE; + return true; } - return FALSE; + return false; } static void ArmorDur(int pnum) @@ -2961,12 +2961,12 @@ static void ArmorDur(int pnum) } if (a != 0) { - NetSendCmdDelItem(TRUE, INVLOC_CHEST); + NetSendCmdDelItem(true, INVLOC_CHEST); } else { - NetSendCmdDelItem(TRUE, INVLOC_HEAD); + NetSendCmdDelItem(true, INVLOC_HEAD); } pi->_itype = ITYPE_NONE; - CalcPlrInv(pnum, TRUE); + CalcPlrInv(pnum, true); } bool PM_DoSpell(int pnum) @@ -2996,15 +2996,15 @@ bool PM_DoSpell(int pnum) if (plr[pnum]._pVar8 > plr[pnum]._pSFrames) { StartWalkStand(pnum); ClearPlrPVars(pnum); - return TRUE; + return true; } } else if (plr[pnum]._pAnimFrame == plr[pnum]._pSFrames) { StartStand(pnum, plr[pnum]._pdir); ClearPlrPVars(pnum); - return TRUE; + return true; } - return FALSE; + return false; } bool PM_DoGotHit(int pnum) @@ -3033,10 +3033,10 @@ bool PM_DoGotHit(int pnum) ArmorDur(pnum); } - return TRUE; + return true; } - return FALSE; + return false; } bool PM_DoDeath(int pnum) @@ -3049,7 +3049,7 @@ bool PM_DoDeath(int pnum) if (deathdelay > 1 && pnum == myplr) { deathdelay--; if (deathdelay == 1) { - deathflag = TRUE; + deathflag = true; if (!gbIsMultiplayer) { gamemenu_on(); } @@ -3065,12 +3065,12 @@ bool PM_DoDeath(int pnum) plr[pnum]._pVar8++; } - return FALSE; + return false; } bool PM_DoNewLvl(int pnum) { - return FALSE; + return false; } void CheckNewPath(int pnum) @@ -3084,12 +3084,12 @@ void CheckNewPath(int pnum) if (plr[pnum].destAction == ACTION_ATTACKMON) { i = plr[pnum].destParam1; - MakePlrPath(pnum, monster[i]._mfutx, monster[i]._mfuty, FALSE); + MakePlrPath(pnum, monster[i]._mfutx, monster[i]._mfuty, false); } if (plr[pnum].destAction == ACTION_ATTACKPLR) { i = plr[pnum].destParam1; - MakePlrPath(pnum, plr[i]._pfutx, plr[i]._pfuty, FALSE); + MakePlrPath(pnum, plr[i]._pfutx, plr[i]._pfuty, false); } direction d; @@ -3256,7 +3256,7 @@ void CheckNewPath(int pnum) d = GetDirection(plr[pnum]._px, plr[pnum]._py, object[i]._ox, object[i]._oy); StartAttack(pnum, d); } else { - OperateObject(pnum, i, FALSE); + OperateObject(pnum, i, false); } } break; @@ -3273,14 +3273,14 @@ void CheckNewPath(int pnum) StartAttack(pnum, d); } else { TryDisarm(pnum, i); - OperateObject(pnum, i, FALSE); + OperateObject(pnum, i, false); } } break; case ACTION_OPERATETK: i = plr[pnum].destParam1; if (object[i]._oBreak != 1) { - OperateObject(pnum, i, TRUE); + OperateObject(pnum, i, true); } break; case ACTION_PICKUPITEM: @@ -3289,8 +3289,8 @@ void CheckNewPath(int pnum) x = abs(plr[pnum]._px - items[i]._ix); y = abs(plr[pnum]._py - items[i]._iy); if (x <= 1 && y <= 1 && pcurs == CURSOR_HAND && !items[i]._iRequest) { - NetSendCmdGItem(TRUE, CMD_REQUESTGITEM, myplr, myplr, i); - items[i]._iRequest = TRUE; + NetSendCmdGItem(true, CMD_REQUESTGITEM, myplr, myplr, i); + items[i]._iRequest = true; } } break; @@ -3300,7 +3300,7 @@ void CheckNewPath(int pnum) x = abs(plr[pnum]._px - items[i]._ix); y = abs(plr[pnum]._py - items[i]._iy); if (x <= 1 && y <= 1 && pcurs == CURSOR_HAND) { - NetSendCmdGItem(TRUE, CMD_REQUESTAGITEM, myplr, myplr, i); + NetSendCmdGItem(true, CMD_REQUESTAGITEM, myplr, myplr, i); } } break; @@ -3354,7 +3354,7 @@ void CheckNewPath(int pnum) d = GetDirection(plr[pnum]._px, plr[pnum]._py, object[i]._ox, object[i]._oy); StartAttack(pnum, d); } else { - OperateObject(pnum, i, FALSE); + OperateObject(pnum, i, false); } } } @@ -3400,7 +3400,7 @@ void CheckNewPath(int pnum) bool PlrDeathModeOK(int p) { if (p != myplr) { - return TRUE; + return true; } if ((DWORD)p >= MAX_PLRS) { @@ -3408,14 +3408,14 @@ bool PlrDeathModeOK(int p) } if (plr[p]._pmode == PM_DEATH) { - return TRUE; + return true; } else if (plr[p]._pmode == PM_QUIT) { - return TRUE; + return true; } else if (plr[p]._pmode == PM_NEWLVL) { - return TRUE; + return true; } - return FALSE; + return false; } void ValidatePlayer() @@ -3551,12 +3551,12 @@ void ProcessPlayers() if ((plr[pnum]._pHitPoints >> 6) <= 0) { SyncPlrKill(pnum, 0); } - drawhpflag = TRUE; + drawhpflag = true; } if (plr[pnum]._pIFlags & ISPL_NOMANA && plr[pnum]._pManaBase > 0) { plr[pnum]._pManaBase -= plr[pnum]._pMana; plr[pnum]._pMana = 0; - drawmanaflag = TRUE; + drawmanaflag = true; } } @@ -3626,11 +3626,11 @@ bool PosOkPlayer(int pnum, int x, int y) char bv; if (x < 0 || x >= MAXDUNX || y < 0 || y >= MAXDUNY) - return FALSE; + return false; if (dPiece[x][y] == 0) - return FALSE; + return false; if (SolidLoc(x, y)) - return FALSE; + return false; if (dPlayer[x][y] != 0) { if (dPlayer[x][y] > 0) { p = dPlayer[x][y] - 1; @@ -3640,19 +3640,19 @@ bool PosOkPlayer(int pnum, int x, int y) if (p != pnum && p < MAX_PLRS && plr[p]._pHitPoints != 0) { - return FALSE; + return false; } } if (dMonster[x][y] != 0) { if (currlevel == 0) { - return FALSE; + return false; } if (dMonster[x][y] <= 0) { - return FALSE; + return false; } if ((monster[dMonster[x][y] - 1]._mhitpoints >> 6) > 0) { - return FALSE; + return false; } } @@ -3663,11 +3663,11 @@ bool PosOkPlayer(int pnum, int x, int y) bv = -(dObject[x][y] + 1); } if (object[bv]._oSolidFlag) { - return FALSE; + return false; } } - return TRUE; + return true; } void MakePlrPath(int pnum, int xx, int yy, bool endspace) @@ -3732,7 +3732,7 @@ void MakePlrPath(int pnum, int xx, int yy, bool endspace) void CheckPlrSpell() { - bool addflag = FALSE; + bool addflag = false; int rspell, sd, sl; if ((DWORD)myplr >= MAX_PLRS) { @@ -3797,7 +3797,7 @@ void CheckPlrSpell() switch (plr[myplr]._pRSplType) { case RSPLTYPE_SKILL: case RSPLTYPE_SPELL: - addflag = CheckSpell(myplr, rspell, plr[myplr]._pRSplType, FALSE); + addflag = CheckSpell(myplr, rspell, plr[myplr]._pRSplType, false); break; case RSPLTYPE_SCROLL: addflag = UseScroll(); @@ -3813,16 +3813,16 @@ void CheckPlrSpell() if (plr[myplr]._pRSpell == SPL_FIREWALL || plr[myplr]._pRSpell == SPL_LIGHTWALL) { sd = GetDirection(plr[myplr]._px, plr[myplr]._py, cursmx, cursmy); sl = GetSpellLevel(myplr, plr[myplr]._pRSpell); - NetSendCmdLocParam3(TRUE, CMD_SPELLXYD, cursmx, cursmy, plr[myplr]._pRSpell, sd, sl); + NetSendCmdLocParam3(true, CMD_SPELLXYD, cursmx, cursmy, plr[myplr]._pRSpell, sd, sl); } else if (pcursmonst != -1) { sl = GetSpellLevel(myplr, plr[myplr]._pRSpell); - NetSendCmdParam3(TRUE, CMD_SPELLID, pcursmonst, plr[myplr]._pRSpell, sl); + NetSendCmdParam3(true, CMD_SPELLID, pcursmonst, plr[myplr]._pRSpell, sl); } else if (pcursplr != -1) { sl = GetSpellLevel(myplr, plr[myplr]._pRSpell); - NetSendCmdParam3(TRUE, CMD_SPELLPID, pcursplr, plr[myplr]._pRSpell, sl); + NetSendCmdParam3(true, CMD_SPELLPID, pcursplr, plr[myplr]._pRSpell, sl); } else { //145 sl = GetSpellLevel(myplr, plr[myplr]._pRSpell); - NetSendCmdLocParam2(TRUE, CMD_SPELLXY, cursmx, cursmy, plr[myplr]._pRSpell, sl); + NetSendCmdLocParam2(true, CMD_SPELLXY, cursmx, cursmy, plr[myplr]._pRSpell, sl); } return; } @@ -3922,14 +3922,14 @@ void SyncInitPlrPos(int pnum) } if (!PosOkPlayer(pnum, x, y)) { - posOk = FALSE; + posOk = false; for (range = 1; range < 50 && !posOk; range++) { for (yy = -range; yy <= range && !posOk; yy++) { y = yy + plr[pnum]._py; for (xx = -range; xx <= range && !posOk; xx++) { x = xx + plr[pnum]._px; if (PosOkPlayer(pnum, x, y) && !PosOkPortal(currlevel, x, y)) { - posOk = TRUE; + posOk = true; } } } @@ -4024,10 +4024,10 @@ void ModifyPlrStr(int p, int l) plr[p]._pDamageMod = plr[p]._pLevel * plr[p]._pStrength / 100; } - CalcPlrInv(p, TRUE); + CalcPlrInv(p, true); if (p == myplr) { - NetSendCmdParam1(FALSE, CMD_SETSTR, plr[p]._pBaseStr); + NetSendCmdParam1(false, CMD_SETSTR, plr[p]._pBaseStr); } } @@ -4061,10 +4061,10 @@ void ModifyPlrMag(int p, int l) plr[p]._pMana += ms; } - CalcPlrInv(p, TRUE); + CalcPlrInv(p, true); if (p == myplr) { - NetSendCmdParam1(FALSE, CMD_SETMAG, plr[p]._pBaseMag); + NetSendCmdParam1(false, CMD_SETMAG, plr[p]._pBaseMag); } } @@ -4083,14 +4083,14 @@ void ModifyPlrDex(int p, int l) plr[p]._pDexterity += l; plr[p]._pBaseDex += l; - CalcPlrInv(p, TRUE); + CalcPlrInv(p, true); if (plr[p]._pClass == PC_ROGUE) { plr[p]._pDamageMod = plr[p]._pLevel * (plr[p]._pDexterity + plr[p]._pStrength) / 200; } if (p == myplr) { - NetSendCmdParam1(FALSE, CMD_SETDEX, plr[p]._pBaseDex); + NetSendCmdParam1(false, CMD_SETDEX, plr[p]._pBaseDex); } } @@ -4122,10 +4122,10 @@ void ModifyPlrVit(int p, int l) plr[p]._pHitPoints += ms; plr[p]._pMaxHP += ms; - CalcPlrInv(p, TRUE); + CalcPlrInv(p, true); if (p == myplr) { - NetSendCmdParam1(FALSE, CMD_SETVIT, plr[p]._pBaseVit); + NetSendCmdParam1(false, CMD_SETVIT, plr[p]._pBaseVit); } } @@ -4139,7 +4139,7 @@ void SetPlayerHitPoints(int pnum, int val) plr[pnum]._pHPBase = val + plr[pnum]._pMaxHPBase - plr[pnum]._pMaxHP; if (pnum == myplr) { - drawhpflag = TRUE; + drawhpflag = true; } } @@ -4152,7 +4152,7 @@ void SetPlrStr(int p, int v) } plr[p]._pBaseStr = v; - CalcPlrInv(p, TRUE); + CalcPlrInv(p, true); if (plr[p]._pClass == PC_ROGUE) { dm = plr[p]._pLevel * (plr[p]._pStrength + plr[p]._pDexterity) / 200; @@ -4182,7 +4182,7 @@ void SetPlrMag(int p, int v) plr[p]._pMaxManaBase = m; plr[p]._pMaxMana = m; - CalcPlrInv(p, TRUE); + CalcPlrInv(p, true); } void SetPlrDex(int p, int v) @@ -4194,7 +4194,7 @@ void SetPlrDex(int p, int v) } plr[p]._pBaseDex = v; - CalcPlrInv(p, TRUE); + CalcPlrInv(p, true); if (plr[p]._pClass == PC_ROGUE) { dm = plr[p]._pLevel * (plr[p]._pStrength + plr[p]._pDexterity) / 200; @@ -4224,7 +4224,7 @@ void SetPlrVit(int p, int v) plr[p]._pHPBase = hp; plr[p]._pMaxHPBase = hp; - CalcPlrInv(p, TRUE); + CalcPlrInv(p, true); } void InitDungMsgs(int pnum) diff --git a/Source/portal.cpp b/Source/portal.cpp index ec9c5a2f..d52ddd6e 100644 --- a/Source/portal.cpp +++ b/Source/portal.cpp @@ -23,7 +23,7 @@ void InitPortals() for (i = 0; i < MAXPORTAL; i++) { if (delta_portal_inited(i)) - portal[i].open = FALSE; + portal[i].open = false; } } @@ -34,7 +34,7 @@ void SetPortalStats(int i, bool o, int x, int y, int lvl, dungeon_type lvltype) portal[i].y = y; portal[i].level = lvl; portal[i].ltype = lvltype; - portal[i].setlvl = FALSE; + portal[i].setlvl = false; } void AddWarpMissile(int i, int x, int y) @@ -81,7 +81,7 @@ void AddInTownPortal(int i) void ActivatePortal(int i, int x, int y, int lvl, dungeon_type lvltype, bool sp) { - portal[i].open = TRUE; + portal[i].open = true; if (lvl != 0) { portal[i].x = x; @@ -94,13 +94,13 @@ void ActivatePortal(int i, int x, int y, int lvl, dungeon_type lvltype, bool sp) void DeactivatePortal(int i) { - portal[i].open = FALSE; + portal[i].open = false; } bool PortalOnLevel(int i) { if (portal[i].level == currlevel) - return TRUE; + return true; else return currlevel == 0; } @@ -132,25 +132,25 @@ void SetCurrentPortal(int p) void GetPortalLevel() { if (currlevel != 0) { - setlevel = FALSE; + setlevel = false; currlevel = 0; plr[myplr].plrlevel = 0; leveltype = DTYPE_TOWN; } else { if (portal[portalindex].setlvl) { - setlevel = TRUE; + setlevel = true; setlvlnum = portal[portalindex].level; currlevel = portal[portalindex].level; plr[myplr].plrlevel = setlvlnum; leveltype = portal[portalindex].ltype; } else { - setlevel = FALSE; + setlevel = false; currlevel = portal[portalindex].level; plr[myplr].plrlevel = currlevel; leveltype = portal[portalindex].ltype; } if (portalindex == myplr) { - NetSendCmd(TRUE, CMD_DEACTIVATEPORTAL); + NetSendCmd(true, CMD_DEACTIVATEPORTAL); DeactivatePortal(portalindex); } } @@ -178,9 +178,9 @@ bool PosOkPortal(int lvl, int x, int y) for (i = 0; i < MAXPORTAL; i++) { if (portal[i].open && portal[i].level == lvl && ((portal[i].x == x && portal[i].y == y) || (portal[i].x == x - 1 && portal[i].y == y - 1))) - return TRUE; + return true; } - return FALSE; + return false; } } // namespace devilution diff --git a/Source/quests.cpp b/Source/quests.cpp index e6f325f3..4e005d8b 100644 --- a/Source/quests.cpp +++ b/Source/quests.cpp @@ -114,7 +114,7 @@ void InitQuests() Qtalklist[TOWN_HEALER][Q_MUSHROOM] = TEXT_NONE; Qtalklist[TOWN_WITCH][Q_MUSHROOM] = TEXT_MUSH9; - questlog = FALSE; + questlog = false; WaterDone = 0; initiatedQuests = 0; @@ -127,14 +127,14 @@ void InitQuests() if (!delta_quest_inited(initiatedQuests)) { quests[z]._qactive = QUEST_INIT; quests[z]._qvar1 = 0; - quests[z]._qlog = FALSE; + quests[z]._qlog = false; } initiatedQuests++; } else { quests[z]._qactive = QUEST_INIT; quests[z]._qlevel = questlist[z]._qdlvl; quests[z]._qvar1 = 0; - quests[z]._qlog = FALSE; + quests[z]._qlog = false; } quests[z]._qslvl = questlist[z]._qslvl; @@ -188,7 +188,7 @@ void CheckQuests() if (QuestStatus(Q_BETRAYER) && gbIsMultiplayer && quests[Q_BETRAYER]._qvar1 == 2) { AddObject(OBJ_ALTBOY, 2 * setpc_x + 20, 2 * setpc_y + 22); quests[Q_BETRAYER]._qvar1 = 3; - NetSendCmdQuest(TRUE, Q_BETRAYER); + NetSendCmdQuest(true, Q_BETRAYER); } if (gbIsMultiplayer) { @@ -257,10 +257,10 @@ bool ForceQuests() int i, j, qx, qy, ql; if (gbIsSpawn) - return FALSE; + return false; if (gbIsMultiplayer) { - return FALSE; + return false; } for (i = 0; i < MAXQUESTS; i++) { @@ -275,26 +275,26 @@ bool ForceQuests() sprintf(infostr, "To %s", questtrigstr[ql]); cursmx = qx; cursmy = qy; - return TRUE; + return true; } } } } - return FALSE; + return false; } bool QuestStatus(int i) { if (setlevel) - return FALSE; + return false; if (currlevel != quests[i]._qlevel) - return FALSE; + return false; if (quests[i]._qactive == QUEST_NOTAVAIL) - return FALSE; + return false; if (gbIsMultiplayer && !(questlist[i]._qflags & QUEST_ANY)) - return FALSE; - return TRUE; + return false; + return true; } void CheckQuestKill(int m, bool sendmsg) @@ -321,7 +321,7 @@ void CheckQuestKill(int m, bool sendmsg) sfxdnum = PS_WARR82; } if (sendmsg) - NetSendCmdQuest(TRUE, Q_SKELKING); + NetSendCmdQuest(true, Q_SKELKING); } else if (monster[m].MType->mtype == MT_CLEAVER) { quests[Q_BUTCHER]._qactive = QUEST_DONE; @@ -340,7 +340,7 @@ void CheckQuestKill(int m, bool sendmsg) sfxdnum = PS_WARR80; } if (sendmsg) - NetSendCmdQuest(TRUE, Q_BUTCHER); + NetSendCmdQuest(true, Q_BUTCHER); } else if (monster[m]._uniqtype - 1 == UMT_GARBUD) { //"Gharbad the Weak" quests[Q_GARBUD]._qactive = QUEST_DONE; sfxdelay = 30; @@ -403,8 +403,8 @@ void CheckQuestKill(int m, bool sendmsg) sfxdnum = PS_WARR83; } if (sendmsg) { - NetSendCmdQuest(TRUE, Q_BETRAYER); - NetSendCmdQuest(TRUE, Q_DIABLO); + NetSendCmdQuest(true, Q_BETRAYER); + NetSendCmdQuest(true, Q_DIABLO); } } else if (monster[m]._uniqtype - 1 == UMT_LAZURUS && !gbIsMultiplayer) { //"Arch-Bishop Lazarus" quests[Q_BETRAYER]._qactive = QUEST_DONE; @@ -697,35 +697,35 @@ void ResyncMPQuests() && currlevel >= quests[Q_SKELKING]._qlevel - 1 && currlevel <= quests[Q_SKELKING]._qlevel + 1) { quests[Q_SKELKING]._qactive = QUEST_ACTIVE; - NetSendCmdQuest(TRUE, Q_SKELKING); + NetSendCmdQuest(true, Q_SKELKING); } if (quests[Q_BUTCHER]._qactive == QUEST_INIT && currlevel >= quests[Q_BUTCHER]._qlevel - 1 && currlevel <= quests[Q_BUTCHER]._qlevel + 1) { quests[Q_BUTCHER]._qactive = QUEST_ACTIVE; - NetSendCmdQuest(TRUE, Q_BUTCHER); + NetSendCmdQuest(true, Q_BUTCHER); } if (quests[Q_BETRAYER]._qactive == QUEST_INIT && currlevel == quests[Q_BETRAYER]._qlevel - 1) { quests[Q_BETRAYER]._qactive = QUEST_ACTIVE; - NetSendCmdQuest(TRUE, Q_BETRAYER); + NetSendCmdQuest(true, Q_BETRAYER); } if (QuestStatus(Q_BETRAYER)) AddObject(OBJ_ALTBOY, 2 * setpc_x + 20, 2 * setpc_y + 22); if (quests[Q_GRAVE]._qactive == 1 && currlevel == quests[Q_GRAVE]._qlevel - 1) { quests[Q_GRAVE]._qactive = 2; - NetSendCmdQuest(TRUE, Q_GRAVE); + NetSendCmdQuest(true, Q_GRAVE); } if (quests[Q_DEFILER]._qactive == 1 && currlevel == quests[Q_DEFILER]._qlevel - 1) { quests[Q_DEFILER]._qactive = 2; - NetSendCmdQuest(TRUE, Q_DEFILER); + NetSendCmdQuest(true, Q_DEFILER); } if (quests[Q_NAKRUL]._qactive == 1 && currlevel == quests[Q_NAKRUL]._qlevel - 1) { quests[Q_NAKRUL]._qactive = 2; - NetSendCmdQuest(TRUE, Q_NAKRUL); + NetSendCmdQuest(true, Q_NAKRUL); } if (quests[Q_JERSEY]._qactive == 1 && currlevel == quests[Q_JERSEY]._qlevel - 1) { quests[Q_JERSEY]._qactive = 2; - NetSendCmdQuest(TRUE, Q_JERSEY); + NetSendCmdQuest(true, Q_JERSEY); } } @@ -843,14 +843,14 @@ void DrawQuestLog(CelOutputBuffer out) { int y, i; - PrintQLString(out, 0, 2, TRUE, "Quest Log", COL_GOLD); + PrintQLString(out, 0, 2, true, "Quest Log", COL_GOLD); CelDrawTo(out, 0, 351, pQLogCel, 1, SPANEL_WIDTH); y = qtopline; for (i = 0; i < numqlines; i++) { - PrintQLString(out, 0, y, TRUE, questlist[qlist[i]]._qlstr, COL_WHITE); + PrintQLString(out, 0, y, true, questlist[qlist[i]]._qlstr, COL_WHITE); y += 2; } - PrintQLString(out, 0, 22, TRUE, "Close Quest Log", COL_WHITE); + PrintQLString(out, 0, 22, true, "Close Quest Log", COL_WHITE); } void StartQuestlog() @@ -872,7 +872,7 @@ void StartQuestlog() qline = 22; if (numqlines != 0) qline = qtopline; - questlog = TRUE; + questlog = true; } void QuestlogUp() @@ -908,7 +908,7 @@ void QuestlogEnter() PlaySFX(IS_TITLSLCT); if (numqlines && qline != 22) InitQTextMsg(quests[qlist[(qline - qtopline) >> 1]]._qmsg); - questlog = FALSE; + questlog = false; } void QuestlogESC() diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp index 25b188bd..c8fa3082 100644 --- a/Source/scrollrt.cpp +++ b/Source/scrollrt.cpp @@ -728,7 +728,7 @@ static void scrollrt_draw_dungeon(CelOutputBuffer out, int sx, int sy, int dx, i #endif if (MissilePreFlag) { - DrawMissile(out, sx, sy, dx, dy, TRUE); + DrawMissile(out, sx, sy, dx, dy, true); } if (light_table_index < lightmax && bDead != 0) { @@ -771,7 +771,7 @@ static void scrollrt_draw_dungeon(CelOutputBuffer out, int sx, int sy, int dx, i if (dMonster[sx][sy] > 0) { DrawMonsterHelper(out, sx, sy, 0, dx, dy); } - DrawMissile(out, sx, sy, dx, dy, FALSE); + DrawMissile(out, sx, sy, dx, dy, false); DrawObject(out, sx, sy, dx, dy, 0); DrawItem(out, sx, sy, dx, dy, 0); @@ -1281,70 +1281,70 @@ void ScrollView() if (pcurs >= CURSOR_FIRSTITEM) return; - scroll = FALSE; + scroll = false; if (MouseX < 20) { if (dmaxy - 1 <= ViewY || dminx >= ViewX) { if (dmaxy - 1 > ViewY) { ViewY++; - scroll = TRUE; + scroll = true; } if (dminx < ViewX) { ViewX--; - scroll = TRUE; + scroll = true; } } else { ViewY++; ViewX--; - scroll = TRUE; + scroll = true; } } if (MouseX > gnScreenWidth - 20) { if (dmaxx - 1 <= ViewX || dminy >= ViewY) { if (dmaxx - 1 > ViewX) { ViewX++; - scroll = TRUE; + scroll = true; } if (dminy < ViewY) { ViewY--; - scroll = TRUE; + scroll = true; } } else { ViewY--; ViewX++; - scroll = TRUE; + scroll = true; } } if (MouseY < 20) { if (dminy >= ViewY || dminx >= ViewX) { if (dminy < ViewY) { ViewY--; - scroll = TRUE; + scroll = true; } if (dminx < ViewX) { ViewX--; - scroll = TRUE; + scroll = true; } } else { ViewX--; ViewY--; - scroll = TRUE; + scroll = true; } } if (MouseY > gnScreenHeight - 20) { if (dmaxy - 1 <= ViewY || dmaxx - 1 <= ViewX) { if (dmaxy - 1 > ViewY) { ViewY++; - scroll = TRUE; + scroll = true; } if (dmaxx - 1 > ViewX) { ViewX++; - scroll = TRUE; + scroll = true; } } else { ViewX++; ViewY++; - scroll = TRUE; + scroll = true; } } @@ -1475,7 +1475,7 @@ void scrollrt_draw_game_screen(bool draw_cursor) unlock_buf(0); } - DrawMain(hgt, FALSE, FALSE, FALSE, FALSE, FALSE); + DrawMain(hgt, false, false, false, false, false); if (draw_cursor) { lock_buf(0); @@ -1499,10 +1499,10 @@ void DrawAndBlit() bool ctrlPan = false; if (gnScreenWidth > PANEL_WIDTH || force_redraw == 255) { - drawhpflag = TRUE; - drawmanaflag = TRUE; - drawbtnflag = TRUE; - drawsbarflag = TRUE; + drawhpflag = true; + drawmanaflag = true; + drawbtnflag = true; + drawsbarflag = true; ddsdesc = false; ctrlPan = true; hgt = gnScreenHeight; @@ -1551,10 +1551,10 @@ void DrawAndBlit() unlock_buf(0); RenderPresent(); - drawhpflag = FALSE; - drawmanaflag = FALSE; - drawbtnflag = FALSE; - drawsbarflag = FALSE; + drawhpflag = false; + drawmanaflag = false; + drawbtnflag = false; + drawsbarflag = false; } } // namespace devilution diff --git a/Source/spelldat.cpp b/Source/spelldat.cpp index dbdf1202..14405685 100644 --- a/Source/spelldat.cpp +++ b/Source/spelldat.cpp @@ -11,58 +11,58 @@ namespace devilution { SpellData spelldata[] = { // clang-format off // sName, sManaCost, sType, sNameText, sSkillText, sBookLvl, sStaffLvl, sTargeted, sTownSpell, sMinInt, sSFX, sMissiles[3], sManaAdj, sMinMana, sStaffMin, sStaffMax, sBookCost, sStaffCost - { SPL_NULL, 0, STYPE_FIRE, NULL, NULL, 0, 0, FALSE, FALSE, 0, SFX_NONE, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, - { SPL_FIREBOLT, 6, STYPE_FIRE, "Firebolt", "Firebolt", 1, 1, TRUE, FALSE, 15, IS_CAST2, { MIS_FIREBOLT, MIS_NULL, MIS_NULL }, 1, 3, 40, 80, 1000, 50 }, - { SPL_HEAL, 5, STYPE_MAGIC, "Healing", NULL, 1, 1, FALSE, TRUE, 17, IS_CAST8, { MIS_HEAL, MIS_NULL, MIS_NULL }, 3, 1, 20, 40, 1000, 50 }, - { SPL_LIGHTNING, 10, STYPE_LIGHTNING, "Lightning", NULL, 4, 3, TRUE, FALSE, 20, IS_CAST4, { MIS_LIGHTCTRL, MIS_NULL, MIS_NULL }, 1, 6, 20, 60, 3000, 150 }, - { SPL_FLASH, 30, STYPE_LIGHTNING, "Flash", NULL, 5, 4, FALSE, FALSE, 33, IS_CAST4, { MIS_FLASH, MIS_FLASH2, MIS_NULL }, 2, 16, 20, 40, 7500, 500 }, - { SPL_IDENTIFY, 13, STYPE_MAGIC, "Identify", "Identify", -1, -1, FALSE, TRUE, 23, IS_CAST6, { MIS_IDENTIFY, MIS_NULL, MIS_NULL }, 2, 1, 8, 12, 0, 100 }, - { SPL_FIREWALL, 28, STYPE_FIRE, "Fire Wall", NULL, 3, 2, TRUE, FALSE, 27, IS_CAST2, { MIS_FIREWALLC, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, - { SPL_TOWN, 35, STYPE_MAGIC, "Town Portal", NULL, 3, 3, TRUE, FALSE, 20, IS_CAST6, { MIS_TOWN, MIS_NULL, MIS_NULL }, 3, 18, 8, 12, 3000, 200 }, - { SPL_STONE, 60, STYPE_MAGIC, "Stone Curse", NULL, 6, 5, TRUE, FALSE, 51, IS_CAST2, { MIS_STONE, MIS_NULL, MIS_NULL }, 3, 40, 8, 16, 12000, 800 }, - { SPL_INFRA, 40, STYPE_MAGIC, "Infravision", NULL, -1, -1, FALSE, FALSE, 36, IS_CAST8, { MIS_INFRA, MIS_NULL, MIS_NULL }, 5, 20, 0, 0, 0, 600 }, - { SPL_RNDTELEPORT, 12, STYPE_MAGIC, "Phasing", NULL, 7, 6, FALSE, FALSE, 39, IS_CAST2, { MIS_RNDTELEPORT, MIS_NULL, MIS_NULL }, 2, 4, 40, 80, 3500, 200 }, - { SPL_MANASHIELD, 33, STYPE_MAGIC, "Mana Shield", NULL, 6, 5, FALSE, FALSE, 25, IS_CAST2, { MIS_MANASHIELD, MIS_NULL, MIS_NULL }, 0, 33, 4, 10, 16000, 1200 }, - { SPL_FIREBALL, 16, STYPE_FIRE, "Fireball", NULL, 8, 7, TRUE, FALSE, 48, IS_CAST2, { MIS_FIREBALL, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, - { SPL_GUARDIAN, 50, STYPE_FIRE, "Guardian", NULL, 9, 8, TRUE, FALSE, 61, IS_CAST2, { MIS_GUARDIAN, MIS_NULL, MIS_NULL }, 2, 30, 16, 32, 14000, 950 }, - { SPL_CHAIN, 30, STYPE_LIGHTNING, "Chain Lightning", NULL, 8, 7, FALSE, FALSE, 54, IS_CAST2, { MIS_CHAIN, MIS_NULL, MIS_NULL }, 1, 18, 20, 60, 11000, 750 }, - { SPL_WAVE, 35, STYPE_FIRE, "Flame Wave", NULL, 9, 8, TRUE, FALSE, 54, IS_CAST2, { MIS_WAVE, MIS_NULL, MIS_NULL }, 3, 20, 20, 40, 10000, 650 }, - { SPL_DOOMSERP, 0, STYPE_LIGHTNING, "Doom Serpents", NULL, -1, -1, FALSE, FALSE, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, - { SPL_BLODRIT, 0, STYPE_MAGIC, "Blood Ritual", NULL, -1, -1, FALSE, FALSE, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, - { SPL_NOVA, 60, STYPE_MAGIC, "Nova", NULL, 14, 10, FALSE, FALSE, 87, IS_CAST4, { MIS_NOVA, MIS_NULL, MIS_NULL }, 3, 35, 16, 32, 21000, 1300 }, - { SPL_INVISIBIL, 0, STYPE_MAGIC, "Invisibility", NULL, -1, -1, FALSE, FALSE, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, - { SPL_FLAME, 11, STYPE_FIRE, "Inferno", NULL, 3, 2, TRUE, FALSE, 20, IS_CAST2, { MIS_FLAMEC, MIS_NULL, MIS_NULL }, 1, 6, 20, 40, 2000, 100 }, - { SPL_GOLEM, 100, STYPE_FIRE, "Golem", NULL, 11, 9, FALSE, FALSE, 81, IS_CAST2, { MIS_GOLEM, MIS_NULL, MIS_NULL }, 6, 60, 16, 32, 18000, 1100 }, - { SPL_BLODBOIL, 15, STYPE_MAGIC, "Rage", "Rage", -1, -1, FALSE, FALSE, 0, IS_CAST8, { MIS_BLODBOIL, MIS_NULL, MIS_NULL }, 1, 1, 0, 0, 0, 0 }, - { SPL_TELEPORT, 35, STYPE_MAGIC, "Teleport", NULL, 14, 12, TRUE, FALSE, 105, IS_CAST6, { MIS_TELEPORT, MIS_NULL, MIS_NULL }, 3, 15, 16, 32, 20000, 1250 }, - { SPL_APOCA, 150, STYPE_FIRE, "Apocalypse", NULL, 19, 15, FALSE, FALSE, 149, IS_CAST2, { MIS_APOCA, MIS_NULL, MIS_NULL }, 6, 90, 8, 12, 30000, 2000 }, - { SPL_ETHEREALIZE, 100, STYPE_MAGIC, "Etherealize", NULL, -1, -1, FALSE, FALSE, 93, IS_CAST2, { MIS_ETHEREALIZE, MIS_NULL, MIS_NULL }, 0, 100, 2, 6, 26000, 1600 }, - { SPL_REPAIR, 0, STYPE_MAGIC, "Item Repair", "Item Repair", -1, -1, FALSE, TRUE, -1, IS_CAST6, { MIS_REPAIR, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, - { SPL_RECHARGE, 0, STYPE_MAGIC, "Staff Recharge", "Staff Recharge", -1, -1, FALSE, TRUE, -1, IS_CAST6, { MIS_RECHARGE, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, - { SPL_DISARM, 0, STYPE_MAGIC, "Trap Disarm", "Trap Disarm", -1, -1, FALSE, FALSE, -1, IS_CAST6, { MIS_DISARM, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, - { SPL_ELEMENT, 35, STYPE_FIRE, "Elemental", NULL, 8, 6, FALSE, FALSE, 68, IS_CAST2, { MIS_ELEMENT, MIS_NULL, MIS_NULL }, 2, 20, 20, 60, 10500, 700 }, - { SPL_CBOLT, 6, STYPE_LIGHTNING, "Charged Bolt", NULL, 1, 1, TRUE, FALSE, 25, IS_CAST2, { MIS_CBOLT, MIS_NULL, MIS_NULL }, 1, 6, 40, 80, 1000, 50 }, - { SPL_HBOLT, 7, STYPE_MAGIC, "Holy Bolt", NULL, 1, 1, TRUE, FALSE, 20, IS_CAST2, { MIS_HBOLT, MIS_NULL, MIS_NULL }, 1, 3, 40, 80, 1000, 50 }, - { SPL_RESURRECT, 20, STYPE_MAGIC, "Resurrect", NULL, -1, 5, FALSE, TRUE, 30, IS_CAST8, { MIS_RESURRECT, MIS_NULL, MIS_NULL }, 0, 20, 4, 10, 4000, 250 }, - { SPL_TELEKINESIS, 15, STYPE_MAGIC, "Telekinesis", NULL, 2, 2, FALSE, FALSE, 33, IS_CAST2, { MIS_TELEKINESIS, MIS_NULL, MIS_NULL }, 2, 8, 20, 40, 2500, 200 }, - { SPL_HEALOTHER, 5, STYPE_MAGIC, "Heal Other", NULL, 1, 1, FALSE, TRUE, 17, IS_CAST8, { MIS_HEALOTHER, MIS_NULL, MIS_NULL }, 3, 1, 20, 40, 1000, 50 }, - { SPL_FLARE, 25, STYPE_MAGIC, "Blood Star", NULL, 14, 13, FALSE, FALSE, 70, IS_CAST2, { MIS_FLARE, MIS_NULL, MIS_NULL }, 2, 14, 20, 60, 27500, 1800 }, - { SPL_BONESPIRIT, 24, STYPE_MAGIC, "Bone Spirit", NULL, 9, 7, FALSE, FALSE, 34, IS_CAST2, { MIS_BONESPIRIT, MIS_NULL, MIS_NULL }, 1, 12, 20, 60, 11500, 800 }, - { SPL_MANA, 255, STYPE_MAGIC, "Mana", NULL, -1, 5, FALSE, TRUE, 17, IS_CAST8, { MIS_MANA, MIS_NULL, MIS_NULL }, 3, 1, 12, 24, 1000, 50 }, - { SPL_MAGI, 255, STYPE_MAGIC, "the Magi", NULL, -1, 20, FALSE, TRUE, 45, IS_CAST8, { MIS_MAGI, MIS_NULL, MIS_NULL }, 3, 1, 15, 30, 100000, 200 }, - { SPL_JESTER, 255, STYPE_MAGIC, "the Jester", NULL, -1, 4, TRUE, FALSE, 30, IS_CAST8, { MIS_JESTER, MIS_NULL, MIS_NULL }, 3, 1, 15, 30, 100000, 200 }, - { SPL_LIGHTWALL, 28, STYPE_LIGHTNING, "Lightning Wall", NULL, 3, 2, TRUE, FALSE, 27, IS_CAST4, { MIS_LIGHTNINGWALL, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, - { SPL_IMMOLAT, 60, STYPE_FIRE, "Immolation", NULL, 14, 10, FALSE, FALSE, 87, IS_CAST2, { MIS_IMMOLATION, MIS_NULL, MIS_NULL }, 3, 35, 16, 32, 21000, 1300 }, - { SPL_WARP, 35, STYPE_MAGIC, "Warp", NULL, 3, 3, FALSE, FALSE, 25, IS_CAST6, { MIS_WARP, MIS_NULL, MIS_NULL }, 3, 18, 8, 12, 3000, 200 }, - { SPL_REFLECT, 35, STYPE_MAGIC, "Reflect", NULL, 3, 3, FALSE, FALSE, 25, IS_CAST6, { MIS_REFLECT, MIS_NULL, MIS_NULL }, 3, 15, 8, 12, 3000, 200 }, - { SPL_BERSERK, 35, STYPE_MAGIC, "Berserk", NULL, 3, 3, TRUE, FALSE, 35, IS_CAST6, { MIS_BERSERK, MIS_NULL, MIS_NULL }, 3, 15, 8, 12, 3000, 200 }, - { SPL_FIRERING, 28, STYPE_FIRE, "Ring of Fire", NULL, 5, 5, FALSE, FALSE, 27, IS_CAST2, { MIS_FIRERING, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, - { SPL_SEARCH, 15, STYPE_MAGIC, "Search", "Search", 1, 3, FALSE, FALSE, 25, IS_CAST6, { MIS_SEARCH, MIS_NULL, MIS_NULL }, 1, 1, 8, 12, 3000, 200 }, - { SPL_RUNEFIRE, 255, STYPE_MAGIC, "Rune of Fire", NULL, -1, -1, TRUE, FALSE, 48, IS_CAST8, { MIS_RUNEFIRE, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, - { SPL_RUNELIGHT, 255, STYPE_MAGIC, "Rune of Light", NULL, -1, -1, TRUE, FALSE, 48, IS_CAST8, { MIS_RUNELIGHT, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, - { SPL_RUNENOVA, 255, STYPE_MAGIC, "Rune of Nova", NULL, -1, -1, TRUE, FALSE, 48, IS_CAST8, { MIS_RUNENOVA, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, - { SPL_RUNEIMMOLAT, 255, STYPE_MAGIC, "Rune of Immolation", NULL, -1, -1, TRUE, FALSE, 48, IS_CAST8, { MIS_RUNEIMMOLAT, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, - { SPL_RUNESTONE, 255, STYPE_MAGIC, "Rune of Stone", NULL, -1, -1, TRUE, FALSE, 48, IS_CAST8, { MIS_RUNESTONE, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_NULL, 0, STYPE_FIRE, NULL, NULL, 0, 0, false, false, 0, SFX_NONE, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, + { SPL_FIREBOLT, 6, STYPE_FIRE, "Firebolt", "Firebolt", 1, 1, true, false, 15, IS_CAST2, { MIS_FIREBOLT, MIS_NULL, MIS_NULL }, 1, 3, 40, 80, 1000, 50 }, + { SPL_HEAL, 5, STYPE_MAGIC, "Healing", NULL, 1, 1, false, true, 17, IS_CAST8, { MIS_HEAL, MIS_NULL, MIS_NULL }, 3, 1, 20, 40, 1000, 50 }, + { SPL_LIGHTNING, 10, STYPE_LIGHTNING, "Lightning", NULL, 4, 3, true, false, 20, IS_CAST4, { MIS_LIGHTCTRL, MIS_NULL, MIS_NULL }, 1, 6, 20, 60, 3000, 150 }, + { SPL_FLASH, 30, STYPE_LIGHTNING, "Flash", NULL, 5, 4, false, false, 33, IS_CAST4, { MIS_FLASH, MIS_FLASH2, MIS_NULL }, 2, 16, 20, 40, 7500, 500 }, + { SPL_IDENTIFY, 13, STYPE_MAGIC, "Identify", "Identify", -1, -1, false, true, 23, IS_CAST6, { MIS_IDENTIFY, MIS_NULL, MIS_NULL }, 2, 1, 8, 12, 0, 100 }, + { SPL_FIREWALL, 28, STYPE_FIRE, "Fire Wall", NULL, 3, 2, true, false, 27, IS_CAST2, { MIS_FIREWALLC, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, + { SPL_TOWN, 35, STYPE_MAGIC, "Town Portal", NULL, 3, 3, true, false, 20, IS_CAST6, { MIS_TOWN, MIS_NULL, MIS_NULL }, 3, 18, 8, 12, 3000, 200 }, + { SPL_STONE, 60, STYPE_MAGIC, "Stone Curse", NULL, 6, 5, true, false, 51, IS_CAST2, { MIS_STONE, MIS_NULL, MIS_NULL }, 3, 40, 8, 16, 12000, 800 }, + { SPL_INFRA, 40, STYPE_MAGIC, "Infravision", NULL, -1, -1, false, false, 36, IS_CAST8, { MIS_INFRA, MIS_NULL, MIS_NULL }, 5, 20, 0, 0, 0, 600 }, + { SPL_RNDTELEPORT, 12, STYPE_MAGIC, "Phasing", NULL, 7, 6, false, false, 39, IS_CAST2, { MIS_RNDTELEPORT, MIS_NULL, MIS_NULL }, 2, 4, 40, 80, 3500, 200 }, + { SPL_MANASHIELD, 33, STYPE_MAGIC, "Mana Shield", NULL, 6, 5, false, false, 25, IS_CAST2, { MIS_MANASHIELD, MIS_NULL, MIS_NULL }, 0, 33, 4, 10, 16000, 1200 }, + { SPL_FIREBALL, 16, STYPE_FIRE, "Fireball", NULL, 8, 7, true, false, 48, IS_CAST2, { MIS_FIREBALL, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_GUARDIAN, 50, STYPE_FIRE, "Guardian", NULL, 9, 8, true, false, 61, IS_CAST2, { MIS_GUARDIAN, MIS_NULL, MIS_NULL }, 2, 30, 16, 32, 14000, 950 }, + { SPL_CHAIN, 30, STYPE_LIGHTNING, "Chain Lightning", NULL, 8, 7, false, false, 54, IS_CAST2, { MIS_CHAIN, MIS_NULL, MIS_NULL }, 1, 18, 20, 60, 11000, 750 }, + { SPL_WAVE, 35, STYPE_FIRE, "Flame Wave", NULL, 9, 8, true, false, 54, IS_CAST2, { MIS_WAVE, MIS_NULL, MIS_NULL }, 3, 20, 20, 40, 10000, 650 }, + { SPL_DOOMSERP, 0, STYPE_LIGHTNING, "Doom Serpents", NULL, -1, -1, false, false, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, + { SPL_BLODRIT, 0, STYPE_MAGIC, "Blood Ritual", NULL, -1, -1, false, false, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, + { SPL_NOVA, 60, STYPE_MAGIC, "Nova", NULL, 14, 10, false, false, 87, IS_CAST4, { MIS_NOVA, MIS_NULL, MIS_NULL }, 3, 35, 16, 32, 21000, 1300 }, + { SPL_INVISIBIL, 0, STYPE_MAGIC, "Invisibility", NULL, -1, -1, false, false, 0, IS_CAST2, { MIS_NULL, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, + { SPL_FLAME, 11, STYPE_FIRE, "Inferno", NULL, 3, 2, true, false, 20, IS_CAST2, { MIS_FLAMEC, MIS_NULL, MIS_NULL }, 1, 6, 20, 40, 2000, 100 }, + { SPL_GOLEM, 100, STYPE_FIRE, "Golem", NULL, 11, 9, false, false, 81, IS_CAST2, { MIS_GOLEM, MIS_NULL, MIS_NULL }, 6, 60, 16, 32, 18000, 1100 }, + { SPL_BLODBOIL, 15, STYPE_MAGIC, "Rage", "Rage", -1, -1, false, false, 0, IS_CAST8, { MIS_BLODBOIL, MIS_NULL, MIS_NULL }, 1, 1, 0, 0, 0, 0 }, + { SPL_TELEPORT, 35, STYPE_MAGIC, "Teleport", NULL, 14, 12, true, false, 105, IS_CAST6, { MIS_TELEPORT, MIS_NULL, MIS_NULL }, 3, 15, 16, 32, 20000, 1250 }, + { SPL_APOCA, 150, STYPE_FIRE, "Apocalypse", NULL, 19, 15, false, false, 149, IS_CAST2, { MIS_APOCA, MIS_NULL, MIS_NULL }, 6, 90, 8, 12, 30000, 2000 }, + { SPL_ETHEREALIZE, 100, STYPE_MAGIC, "Etherealize", NULL, -1, -1, false, false, 93, IS_CAST2, { MIS_ETHEREALIZE, MIS_NULL, MIS_NULL }, 0, 100, 2, 6, 26000, 1600 }, + { SPL_REPAIR, 0, STYPE_MAGIC, "Item Repair", "Item Repair", -1, -1, false, true, -1, IS_CAST6, { MIS_REPAIR, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, + { SPL_RECHARGE, 0, STYPE_MAGIC, "Staff Recharge", "Staff Recharge", -1, -1, false, true, -1, IS_CAST6, { MIS_RECHARGE, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, + { SPL_DISARM, 0, STYPE_MAGIC, "Trap Disarm", "Trap Disarm", -1, -1, false, false, -1, IS_CAST6, { MIS_DISARM, MIS_NULL, MIS_NULL }, 0, 0, 40, 80, 0, 0 }, + { SPL_ELEMENT, 35, STYPE_FIRE, "Elemental", NULL, 8, 6, false, false, 68, IS_CAST2, { MIS_ELEMENT, MIS_NULL, MIS_NULL }, 2, 20, 20, 60, 10500, 700 }, + { SPL_CBOLT, 6, STYPE_LIGHTNING, "Charged Bolt", NULL, 1, 1, true, false, 25, IS_CAST2, { MIS_CBOLT, MIS_NULL, MIS_NULL }, 1, 6, 40, 80, 1000, 50 }, + { SPL_HBOLT, 7, STYPE_MAGIC, "Holy Bolt", NULL, 1, 1, true, false, 20, IS_CAST2, { MIS_HBOLT, MIS_NULL, MIS_NULL }, 1, 3, 40, 80, 1000, 50 }, + { SPL_RESURRECT, 20, STYPE_MAGIC, "Resurrect", NULL, -1, 5, false, true, 30, IS_CAST8, { MIS_RESURRECT, MIS_NULL, MIS_NULL }, 0, 20, 4, 10, 4000, 250 }, + { SPL_TELEKINESIS, 15, STYPE_MAGIC, "Telekinesis", NULL, 2, 2, false, false, 33, IS_CAST2, { MIS_TELEKINESIS, MIS_NULL, MIS_NULL }, 2, 8, 20, 40, 2500, 200 }, + { SPL_HEALOTHER, 5, STYPE_MAGIC, "Heal Other", NULL, 1, 1, false, true, 17, IS_CAST8, { MIS_HEALOTHER, MIS_NULL, MIS_NULL }, 3, 1, 20, 40, 1000, 50 }, + { SPL_FLARE, 25, STYPE_MAGIC, "Blood Star", NULL, 14, 13, false, false, 70, IS_CAST2, { MIS_FLARE, MIS_NULL, MIS_NULL }, 2, 14, 20, 60, 27500, 1800 }, + { SPL_BONESPIRIT, 24, STYPE_MAGIC, "Bone Spirit", NULL, 9, 7, false, false, 34, IS_CAST2, { MIS_BONESPIRIT, MIS_NULL, MIS_NULL }, 1, 12, 20, 60, 11500, 800 }, + { SPL_MANA, 255, STYPE_MAGIC, "Mana", NULL, -1, 5, false, true, 17, IS_CAST8, { MIS_MANA, MIS_NULL, MIS_NULL }, 3, 1, 12, 24, 1000, 50 }, + { SPL_MAGI, 255, STYPE_MAGIC, "the Magi", NULL, -1, 20, false, true, 45, IS_CAST8, { MIS_MAGI, MIS_NULL, MIS_NULL }, 3, 1, 15, 30, 100000, 200 }, + { SPL_JESTER, 255, STYPE_MAGIC, "the Jester", NULL, -1, 4, true, false, 30, IS_CAST8, { MIS_JESTER, MIS_NULL, MIS_NULL }, 3, 1, 15, 30, 100000, 200 }, + { SPL_LIGHTWALL, 28, STYPE_LIGHTNING, "Lightning Wall", NULL, 3, 2, true, false, 27, IS_CAST4, { MIS_LIGHTNINGWALL, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, + { SPL_IMMOLAT, 60, STYPE_FIRE, "Immolation", NULL, 14, 10, false, false, 87, IS_CAST2, { MIS_IMMOLATION, MIS_NULL, MIS_NULL }, 3, 35, 16, 32, 21000, 1300 }, + { SPL_WARP, 35, STYPE_MAGIC, "Warp", NULL, 3, 3, false, false, 25, IS_CAST6, { MIS_WARP, MIS_NULL, MIS_NULL }, 3, 18, 8, 12, 3000, 200 }, + { SPL_REFLECT, 35, STYPE_MAGIC, "Reflect", NULL, 3, 3, false, false, 25, IS_CAST6, { MIS_REFLECT, MIS_NULL, MIS_NULL }, 3, 15, 8, 12, 3000, 200 }, + { SPL_BERSERK, 35, STYPE_MAGIC, "Berserk", NULL, 3, 3, true, false, 35, IS_CAST6, { MIS_BERSERK, MIS_NULL, MIS_NULL }, 3, 15, 8, 12, 3000, 200 }, + { SPL_FIRERING, 28, STYPE_FIRE, "Ring of Fire", NULL, 5, 5, false, false, 27, IS_CAST2, { MIS_FIRERING, MIS_NULL, MIS_NULL }, 2, 16, 8, 16, 6000, 400 }, + { SPL_SEARCH, 15, STYPE_MAGIC, "Search", "Search", 1, 3, false, false, 25, IS_CAST6, { MIS_SEARCH, MIS_NULL, MIS_NULL }, 1, 1, 8, 12, 3000, 200 }, + { SPL_RUNEFIRE, 255, STYPE_MAGIC, "Rune of Fire", NULL, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNEFIRE, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_RUNELIGHT, 255, STYPE_MAGIC, "Rune of Light", NULL, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNELIGHT, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_RUNENOVA, 255, STYPE_MAGIC, "Rune of Nova", NULL, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNENOVA, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_RUNEIMMOLAT, 255, STYPE_MAGIC, "Rune of Immolation", NULL, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNEIMMOLAT, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, + { SPL_RUNESTONE, 255, STYPE_MAGIC, "Rune of Stone", NULL, -1, -1, true, false, 48, IS_CAST8, { MIS_RUNESTONE, MIS_NULL, MIS_NULL }, 1, 10, 40, 80, 8000, 300 }, // clang-format on }; diff --git a/Source/spells.cpp b/Source/spells.cpp index 3258676a..e8fae91f 100644 --- a/Source/spells.cpp +++ b/Source/spells.cpp @@ -78,7 +78,7 @@ void UseMana(int id, int sn) ma = GetManaAmount(id, sn); plr[id]._pMana -= ma; plr[id]._pManaBase -= ma; - drawmanaflag = TRUE; + drawmanaflag = true; #ifdef _DEBUG } #endif @@ -164,16 +164,16 @@ bool CheckSpell(int id, int sn, char st, bool manaonly) #ifdef _DEBUG if (debug_mode_key_inverted_v) - return TRUE; + return true; #endif - result = TRUE; + result = true; if (!manaonly && pcurs != CURSOR_HAND) { - result = FALSE; + result = false; } else { if (st != RSPLTYPE_SKILL) { if (GetSpellLevel(id, sn) <= 0) { - result = FALSE; + result = false; } else { result = plr[id]._pMana >= GetManaAmount(id, sn); } @@ -222,7 +222,7 @@ static void PlacePlayer(int pnum) } if (!PosOkPlayer(pnum, nx, ny)) { - done = FALSE; + done = false; for (max = 1, min = -1; min > -50 && !done; max++, min--) { for (y = min; y <= max && !done; y++) { @@ -232,7 +232,7 @@ static void PlacePlayer(int pnum) nx = plr[pnum]._px + x; if (PosOkPlayer(pnum, nx, ny)) { - done = TRUE; + done = true; } } } @@ -269,15 +269,15 @@ void DoResurrect(int pnum, int rid) if ((char)rid != -1 && plr[rid]._pHitPoints == 0) { if (rid == myplr) { - deathflag = FALSE; + deathflag = false; gamemenu_off(); - drawhpflag = TRUE; - drawmanaflag = TRUE; + drawhpflag = true; + drawmanaflag = true; } ClrPlrPath(rid); plr[rid].destAction = ACTION_NONE; - plr[rid]._pInvincible = FALSE; + plr[rid]._pInvincible = false; PlacePlayer(rid); hp = 10 << 6; @@ -290,7 +290,7 @@ void DoResurrect(int pnum, int rid) plr[rid]._pMana = 0; plr[rid]._pManaBase = plr[rid]._pMana + (plr[rid]._pMaxManaBase - plr[rid]._pMaxMana); - CalcPlrInv(rid, TRUE); + CalcPlrInv(rid, true); if (plr[rid].plrlevel == currlevel) { StartStand(rid, plr[rid]._pdir); @@ -339,7 +339,7 @@ void DoHealOther(int pnum, int rid) plr[rid]._pHPBase = plr[rid]._pMaxHPBase; } - drawhpflag = TRUE; + drawhpflag = true; } } diff --git a/Source/stores.cpp b/Source/stores.cpp index 42b2c949..a89b3dfd 100644 --- a/Source/stores.cpp +++ b/Source/stores.cpp @@ -154,7 +154,7 @@ void PrintStoreItem(ItemStruct *x, int l, text_color iclr) strcat(sstr, tempstr); } if (sstr[0]) { - AddSText(40, l, FALSE, sstr, iclr, FALSE); + AddSText(40, l, false, sstr, iclr, false); l++; } sstr[0] = '\0'; @@ -185,10 +185,10 @@ void PrintStoreItem(ItemStruct *x, int l, text_color iclr) sprintf(tempstr + strlen(tempstr), " %i Dex", dex); strcat(sstr, tempstr); } - AddSText(40, l++, FALSE, sstr, iclr, FALSE); + AddSText(40, l++, false, sstr, iclr, false); if (x->_iMagical == ITEM_QUALITY_UNIQUE) { if (x->_iIdentified) - AddSText(40, l, FALSE, "Unique Item", iclr, FALSE); + AddSText(40, l, false, "Unique Item", iclr, false); } } @@ -208,15 +208,15 @@ void S_StartSmith() { stextsize = false; stextscrl = false; - AddSText(0, 1, TRUE, "Welcome to the", COL_GOLD, FALSE); - AddSText(0, 3, TRUE, "Blacksmith's shop", COL_GOLD, FALSE); - AddSText(0, 7, TRUE, "Would you like to:", COL_GOLD, FALSE); - AddSText(0, 10, TRUE, "Talk to Griswold", COL_BLUE, TRUE); - AddSText(0, 12, TRUE, "Buy basic items", COL_WHITE, TRUE); - AddSText(0, 14, TRUE, "Buy premium items", COL_WHITE, TRUE); - AddSText(0, 16, TRUE, "Sell items", COL_WHITE, TRUE); - AddSText(0, 18, TRUE, "Repair items", COL_WHITE, TRUE); - AddSText(0, 20, TRUE, "Leave the shop", COL_WHITE, TRUE); + AddSText(0, 1, true, "Welcome to the", COL_GOLD, false); + AddSText(0, 3, true, "Blacksmith's shop", COL_GOLD, false); + AddSText(0, 7, true, "Would you like to:", COL_GOLD, false); + AddSText(0, 10, true, "Talk to Griswold", COL_BLUE, true); + AddSText(0, 12, true, "Buy basic items", COL_WHITE, true); + AddSText(0, 14, true, "Buy premium items", COL_WHITE, true); + AddSText(0, 16, true, "Sell items", COL_WHITE, true); + AddSText(0, 18, true, "Repair items", COL_WHITE, true); + AddSText(0, 20, true, "Leave the shop", COL_WHITE, true); AddSLine(5); storenumh = 20; } @@ -241,9 +241,9 @@ void S_ScrollSBuy(int idx) } if (smithitem[ls]._iMagical) { - AddSText(20, l, FALSE, smithitem[ls]._iIName, iclr, TRUE); + AddSText(20, l, false, smithitem[ls]._iIName, iclr, true); } else { - AddSText(20, l, FALSE, smithitem[ls]._iName, iclr, TRUE); + AddSText(20, l, false, smithitem[ls]._iName, iclr, true); } AddSTextVal(l, smithitem[ls]._iIvalue); @@ -265,11 +265,11 @@ void S_StartSBuy() stextscrl = true; stextsval = 0; sprintf(tempstr, "I have these items for sale: Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); S_ScrollSBuy(stextsval); - AddSText(0, 22, TRUE, "Back", COL_WHITE, FALSE); + AddSText(0, 22, true, "Back", COL_WHITE, false); OffsetSTextY(22, 6); storenumh = 0; for (i = 0; !smithitem[i].isEmpty(); i++) { @@ -301,7 +301,7 @@ void S_ScrollSPBuy(int idx) iclr = COL_BLUE; if (!premiumitem[idx]._iStatFlag) iclr = COL_RED; - AddSText(20, l, FALSE, premiumitem[idx]._iIName, iclr, TRUE); + AddSText(20, l, false, premiumitem[idx]._iIName, iclr, true); AddSTextVal(l, premiumitem[idx]._iIvalue); PrintStoreItem(&premiumitem[idx], l + 1, iclr); stextdown = l; @@ -326,7 +326,7 @@ bool S_StartSPBuy() if (!storenumh) { StartStore(STORE_SMITH); stextsel = 14; - return FALSE; + return false; } stextsize = true; @@ -334,10 +334,10 @@ bool S_StartSPBuy() stextsval = 0; sprintf(tempstr, "I have these premium items for sale: Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); - AddSText(0, 22, TRUE, "Back", COL_WHITE, FALSE); + AddSText(0, 22, true, "Back", COL_WHITE, false); OffsetSTextY(22, 6); stextsmax = storenumh - 4; @@ -346,7 +346,7 @@ bool S_StartSPBuy() S_ScrollSPBuy(stextsval); - return TRUE; + return true; } bool SmithSellOk(int i) @@ -360,23 +360,23 @@ bool SmithSellOk(int i) } if (pI->isEmpty()) - return FALSE; + return false; if (pI->_iMiscId > IMISC_OILFIRST && pI->_iMiscId < IMISC_OILLAST) - return TRUE; + return true; if (pI->_itype == ITYPE_MISC) - return FALSE; + return false; if (pI->_itype == ITYPE_GOLD) - return FALSE; + return false; if (pI->_itype == ITYPE_STAFF && (!gbIsHellfire || pI->_iSpell != SPL_NULL)) - return FALSE; + return false; if (pI->_iClass == ICLASS_QUEST) - return FALSE; + return false; if (pI->IDidx == IDI_LAZSTAFF) - return FALSE; + return false; - return TRUE; + return true; } void S_ScrollSSell(int idx) @@ -400,10 +400,10 @@ void S_ScrollSSell(int idx) } if (storehold[idx]._iMagical && storehold[idx]._iIdentified) { - AddSText(20, l, FALSE, storehold[idx]._iIName, iclr, TRUE); + AddSText(20, l, false, storehold[idx]._iIName, iclr, true); AddSTextVal(l, storehold[idx]._iIvalue); } else { - AddSText(20, l, FALSE, storehold[idx]._iName, iclr, TRUE); + AddSText(20, l, false, storehold[idx]._iName, iclr, true); AddSTextVal(l, storehold[idx]._ivalue); } @@ -424,7 +424,7 @@ void S_StartSSell() bool sellok; stextsize = true; - sellok = FALSE; + sellok = false; storenumh = 0; for (i = 0; i < 48; i++) @@ -434,7 +434,7 @@ void S_StartSSell() if (storenumh >= 48) break; if (SmithSellOk(i)) { - sellok = TRUE; + sellok = true; storehold[storenumh] = plr[myplr].InvList[i]; if (storehold[storenumh]._iMagical != ITEM_QUALITY_NORMAL && storehold[storenumh]._iIdentified) @@ -453,7 +453,7 @@ void S_StartSSell() break; if (SmithSellOk(-(i + 1))) { storehold[storenumh] = plr[myplr].SpdList[i]; - sellok = TRUE; + sellok = true; if (storehold[storenumh]._iMagical != ITEM_QUALITY_NORMAL && storehold[storenumh]._iIdentified) storehold[storenumh]._ivalue = storehold[storenumh]._iIvalue; @@ -469,21 +469,21 @@ void S_StartSSell() if (!sellok) { stextscrl = false; sprintf(tempstr, "You have nothing I want. Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, 22, true, "Back", COL_WHITE, true); OffsetSTextY(22, 6); } else { stextscrl = true; stextsval = 0; stextsmax = plr[myplr]._pNumInv; sprintf(tempstr, "Which item is for sale? Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); S_ScrollSSell(stextsval); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, 22, true, "Back", COL_WHITE, true); OffsetSTextY(22, 6); } } @@ -491,15 +491,15 @@ void S_StartSSell() bool SmithRepairOk(int i) { if (plr[myplr].InvList[i].isEmpty()) - return FALSE; + return false; if (plr[myplr].InvList[i]._itype == ITYPE_MISC) - return FALSE; + return false; if (plr[myplr].InvList[i]._itype == ITYPE_GOLD) - return FALSE; + return false; if (plr[myplr].InvList[i]._iDurability == plr[myplr].InvList[i]._iMaxDur) - return FALSE; + return false; - return TRUE; + return true; } void S_StartSRepair() @@ -508,41 +508,41 @@ void S_StartSRepair() int i; stextsize = true; - repairok = FALSE; + repairok = false; storenumh = 0; for (i = 0; i < 48; i++) storehold[i]._itype = ITYPE_NONE; if (!plr[myplr].InvBody[INVLOC_HEAD].isEmpty() && plr[myplr].InvBody[INVLOC_HEAD]._iDurability != plr[myplr].InvBody[INVLOC_HEAD]._iMaxDur) { - repairok = TRUE; + repairok = true; AddStoreHoldRepair(plr[myplr].InvBody, -1); } if (!plr[myplr].InvBody[INVLOC_CHEST].isEmpty() && plr[myplr].InvBody[INVLOC_CHEST]._iDurability != plr[myplr].InvBody[INVLOC_CHEST]._iMaxDur) { - repairok = TRUE; + repairok = true; AddStoreHoldRepair(&plr[myplr].InvBody[INVLOC_CHEST], -2); } if (!plr[myplr].InvBody[INVLOC_HAND_LEFT].isEmpty() && plr[myplr].InvBody[INVLOC_HAND_LEFT]._iDurability != plr[myplr].InvBody[INVLOC_HAND_LEFT]._iMaxDur) { - repairok = TRUE; + repairok = true; AddStoreHoldRepair(&plr[myplr].InvBody[INVLOC_HAND_LEFT], -3); } if (!plr[myplr].InvBody[INVLOC_HAND_RIGHT].isEmpty() && plr[myplr].InvBody[INVLOC_HAND_RIGHT]._iDurability != plr[myplr].InvBody[INVLOC_HAND_RIGHT]._iMaxDur) { - repairok = TRUE; + repairok = true; AddStoreHoldRepair(&plr[myplr].InvBody[INVLOC_HAND_RIGHT], -4); } for (i = 0; i < plr[myplr]._pNumInv; i++) { if (storenumh >= 48) break; if (SmithRepairOk(i)) { - repairok = TRUE; + repairok = true; AddStoreHoldRepair(&plr[myplr].InvList[i], i); } } if (!repairok) { stextscrl = false; sprintf(tempstr, "You have nothing to repair. Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, 22, true, "Back", COL_WHITE, true); OffsetSTextY(22, 6); return; } @@ -551,11 +551,11 @@ void S_StartSRepair() stextsval = 0; stextsmax = plr[myplr]._pNumInv; sprintf(tempstr, "Repair which item? Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); S_ScrollSSell(stextsval); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, 22, true, "Back", COL_WHITE, true); OffsetSTextY(22, 6); } @@ -568,7 +568,7 @@ void FillManaPlayer() } plr[myplr]._pMana = plr[myplr]._pMaxMana; plr[myplr]._pManaBase = plr[myplr]._pMaxManaBase; - drawmanaflag = TRUE; + drawmanaflag = true; } void S_StartWitch() @@ -576,13 +576,13 @@ void S_StartWitch() FillManaPlayer(); stextsize = false; stextscrl = false; - AddSText(0, 2, TRUE, "Witch's shack", COL_GOLD, FALSE); - AddSText(0, 9, TRUE, "Would you like to:", COL_GOLD, FALSE); - AddSText(0, 12, TRUE, "Talk to Adria", COL_BLUE, TRUE); - AddSText(0, 14, TRUE, "Buy items", COL_WHITE, TRUE); - AddSText(0, 16, TRUE, "Sell items", COL_WHITE, TRUE); - AddSText(0, 18, TRUE, "Recharge staves", COL_WHITE, TRUE); - AddSText(0, 20, TRUE, "Leave the shack", COL_WHITE, TRUE); + AddSText(0, 2, true, "Witch's shack", COL_GOLD, false); + AddSText(0, 9, true, "Would you like to:", COL_GOLD, false); + AddSText(0, 12, true, "Talk to Adria", COL_BLUE, true); + AddSText(0, 14, true, "Buy items", COL_WHITE, true); + AddSText(0, 16, true, "Sell items", COL_WHITE, true); + AddSText(0, 18, true, "Recharge staves", COL_WHITE, true); + AddSText(0, 20, true, "Leave the shack", COL_WHITE, true); AddSLine(5); storenumh = 20; } @@ -607,9 +607,9 @@ void S_ScrollWBuy(int idx) } if (witchitem[ls]._iMagical) { - AddSText(20, l, FALSE, witchitem[ls]._iIName, iclr, TRUE); + AddSText(20, l, false, witchitem[ls]._iIName, iclr, true); } else { - AddSText(20, l, FALSE, witchitem[ls]._iName, iclr, TRUE); + AddSText(20, l, false, witchitem[ls]._iName, iclr, true); } AddSTextVal(l, witchitem[ls]._iIvalue); @@ -632,11 +632,11 @@ void S_StartWBuy() stextsval = 0; stextsmax = 20; sprintf(tempstr, "I have these items for sale: Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); S_ScrollWBuy(stextsval); - AddSText(0, 22, TRUE, "Back", COL_WHITE, FALSE); + AddSText(0, 22, true, "Back", COL_WHITE, false); OffsetSTextY(22, 6); storenumh = 0; @@ -653,7 +653,7 @@ bool WitchSellOk(int i) bool rv; ItemStruct *pI; - rv = FALSE; + rv = false; if (i >= 0) pI = &plr[myplr].InvList[i]; @@ -661,17 +661,17 @@ bool WitchSellOk(int i) pI = &plr[myplr].SpdList[-(i + 1)]; if (pI->_itype == ITYPE_MISC) - rv = TRUE; + rv = true; if (pI->_iMiscId > 29 && pI->_iMiscId < 41) - rv = FALSE; + rv = false; if (pI->_iClass == ICLASS_QUEST) - rv = FALSE; + rv = false; if (pI->_itype == ITYPE_STAFF && (!gbIsHellfire || pI->_iSpell != SPL_NULL)) - rv = TRUE; + rv = true; if (pI->IDidx >= IDI_FIRSTQUEST && pI->IDidx <= IDI_LASTQUEST) - rv = FALSE; + rv = false; if (pI->IDidx == IDI_LAZSTAFF) - rv = FALSE; + rv = false; return rv; } @@ -681,7 +681,7 @@ void S_StartWSell() bool sellok; stextsize = true; - sellok = FALSE; + sellok = false; storenumh = 0; for (i = 0; i < 48; i++) @@ -691,7 +691,7 @@ void S_StartWSell() if (storenumh >= 48) break; if (WitchSellOk(i)) { - sellok = TRUE; + sellok = true; storehold[storenumh] = plr[myplr].InvList[i]; if (storehold[storenumh]._iMagical != ITEM_QUALITY_NORMAL && storehold[storenumh]._iIdentified) @@ -709,7 +709,7 @@ void S_StartWSell() if (storenumh >= 48) break; if (!plr[myplr].SpdList[i].isEmpty() && WitchSellOk(-(i + 1))) { - sellok = TRUE; + sellok = true; storehold[storenumh] = plr[myplr].SpdList[i]; if (storehold[storenumh]._iMagical != ITEM_QUALITY_NORMAL && storehold[storenumh]._iIdentified) @@ -726,21 +726,21 @@ void S_StartWSell() if (!sellok) { stextscrl = false; sprintf(tempstr, "You have nothing I want. Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, 22, true, "Back", COL_WHITE, true); OffsetSTextY(22, 6); } else { stextscrl = true; stextsval = 0; stextsmax = plr[myplr]._pNumInv; sprintf(tempstr, "Which item is for sale? Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); S_ScrollSSell(stextsval); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, 22, true, "Back", COL_WHITE, true); OffsetSTextY(22, 6); } } @@ -749,14 +749,14 @@ bool WitchRechargeOk(int i) { bool rv; - rv = FALSE; + rv = false; if (plr[myplr].InvList[i]._itype == ITYPE_STAFF && plr[myplr].InvList[i]._iCharges != plr[myplr].InvList[i]._iMaxCharges) { - rv = TRUE; + rv = true; } if ((plr[myplr].InvList[i]._iMiscId == IMISC_UNIQUE || plr[myplr].InvList[i]._iMiscId == IMISC_STAFF) && plr[myplr].InvList[i]._iCharges < plr[myplr].InvList[i]._iMaxCharges) { - rv = TRUE; + rv = true; } return rv; } @@ -777,7 +777,7 @@ void S_StartWRecharge() bool rechargeok; stextsize = true; - rechargeok = FALSE; + rechargeok = false; storenumh = 0; for (i = 0; i < 48; i++) { @@ -786,7 +786,7 @@ void S_StartWRecharge() if ((plr[myplr].InvBody[INVLOC_HAND_LEFT]._itype == ITYPE_STAFF || plr[myplr].InvBody[INVLOC_HAND_LEFT]._iMiscId == IMISC_UNIQUE) && plr[myplr].InvBody[INVLOC_HAND_LEFT]._iCharges != plr[myplr].InvBody[INVLOC_HAND_LEFT]._iMaxCharges) { - rechargeok = TRUE; + rechargeok = true; AddStoreHoldRecharge(plr[myplr].InvBody[INVLOC_HAND_LEFT], -1); } @@ -794,7 +794,7 @@ void S_StartWRecharge() if (storenumh >= 48) break; if (WitchRechargeOk(i)) { - rechargeok = TRUE; + rechargeok = true; AddStoreHoldRecharge(plr[myplr].InvList[i], i); } } @@ -802,21 +802,21 @@ void S_StartWRecharge() if (!rechargeok) { stextscrl = false; sprintf(tempstr, "You have nothing to recharge. Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, 22, true, "Back", COL_WHITE, true); OffsetSTextY(22, 6); } else { stextscrl = true; stextsval = 0; stextsmax = plr[myplr]._pNumInv; sprintf(tempstr, "Recharge which item? Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); S_ScrollSSell(stextsval); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, 22, true, "Back", COL_WHITE, true); OffsetSTextY(22, 6); } } @@ -827,7 +827,7 @@ void S_StartNoMoney() stextscrl = false; stextsize = true; ClearSText(5, 23); - AddSText(0, 14, TRUE, "You do not have enough gold", COL_WHITE, TRUE); + AddSText(0, 14, true, "You do not have enough gold", COL_WHITE, true); } void S_StartNoRoom() @@ -835,7 +835,7 @@ void S_StartNoRoom() StartStore(stextshold); stextscrl = false; ClearSText(5, 23); - AddSText(0, 14, TRUE, "You do not have enough room in inventory", COL_WHITE, TRUE); + AddSText(0, 14, true, "You do not have enough room in inventory", COL_WHITE, true); } void S_StartConfirm() @@ -855,21 +855,21 @@ void S_StartConfirm() idprint = plr[myplr].HoldItem._iMagical != ITEM_QUALITY_NORMAL; if (stextshold == STORE_SIDENTIFY) - idprint = FALSE; + idprint = false; if (plr[myplr].HoldItem._iMagical != ITEM_QUALITY_NORMAL && !plr[myplr].HoldItem._iIdentified) { if (stextshold == STORE_SSELL) - idprint = FALSE; + idprint = false; if (stextshold == STORE_WSELL) - idprint = FALSE; + idprint = false; if (stextshold == STORE_SREPAIR) - idprint = FALSE; + idprint = false; if (stextshold == STORE_WRECHARGE) - idprint = FALSE; + idprint = false; } if (idprint) - AddSText(20, 8, FALSE, plr[myplr].HoldItem._iIName, iclr, FALSE); + AddSText(20, 8, false, plr[myplr].HoldItem._iIName, iclr, false); else - AddSText(20, 8, FALSE, plr[myplr].HoldItem._iName, iclr, FALSE); + AddSText(20, 8, false, plr[myplr].HoldItem._iName, iclr, false); AddSTextVal(8, plr[myplr].HoldItem._iIvalue); PrintStoreItem(&plr[myplr].HoldItem, 9, iclr); @@ -900,27 +900,27 @@ void S_StartConfirm() default: app_fatal("Unknown store dialog %d", stextshold); } - AddSText(0, 15, TRUE, tempstr, COL_WHITE, FALSE); - AddSText(0, 18, TRUE, "Yes", COL_WHITE, TRUE); - AddSText(0, 20, TRUE, "No", COL_WHITE, TRUE); + AddSText(0, 15, true, tempstr, COL_WHITE, false); + AddSText(0, 18, true, "Yes", COL_WHITE, true); + AddSText(0, 20, true, "No", COL_WHITE, true); } void S_StartBoy() { stextsize = false; stextscrl = false; - AddSText(0, 2, TRUE, "Wirt the Peg-legged boy", COL_GOLD, FALSE); + AddSText(0, 2, true, "Wirt the Peg-legged boy", COL_GOLD, false); AddSLine(5); if (!boyitem.isEmpty()) { - AddSText(0, 8, TRUE, "Talk to Wirt", COL_BLUE, TRUE); - AddSText(0, 12, TRUE, "I have something for sale,", COL_GOLD, FALSE); - AddSText(0, 14, TRUE, "but it will cost 50 gold", COL_GOLD, FALSE); - AddSText(0, 16, TRUE, "just to take a look. ", COL_GOLD, FALSE); - AddSText(0, 18, TRUE, "What have you got?", COL_WHITE, TRUE); - AddSText(0, 20, TRUE, "Say goodbye", COL_WHITE, TRUE); + AddSText(0, 8, true, "Talk to Wirt", COL_BLUE, true); + AddSText(0, 12, true, "I have something for sale,", COL_GOLD, false); + AddSText(0, 14, true, "but it will cost 50 gold", COL_GOLD, false); + AddSText(0, 16, true, "just to take a look. ", COL_GOLD, false); + AddSText(0, 18, true, "What have you got?", COL_WHITE, true); + AddSText(0, 20, true, "Say goodbye", COL_WHITE, true); } else { - AddSText(0, 12, TRUE, "Talk to Wirt", COL_BLUE, TRUE); - AddSText(0, 18, TRUE, "Say goodbye", COL_WHITE, TRUE); + AddSText(0, 12, true, "Talk to Wirt", COL_BLUE, true); + AddSText(0, 18, true, "Say goodbye", COL_WHITE, true); } } @@ -929,7 +929,7 @@ void S_StartBBoy() stextsize = true; stextscrl = false; sprintf(tempstr, "I have this item for sale: Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); text_color iclr = COL_WHITE; @@ -939,16 +939,16 @@ void S_StartBBoy() if (!boyitem._iStatFlag) iclr = COL_RED; if (boyitem._iMagical != ITEM_QUALITY_NORMAL) - AddSText(20, 10, FALSE, boyitem._iIName, iclr, TRUE); + AddSText(20, 10, false, boyitem._iIName, iclr, true); else - AddSText(20, 10, FALSE, boyitem._iName, iclr, TRUE); + AddSText(20, 10, false, boyitem._iName, iclr, true); if (gbIsHellfire) AddSTextVal(10, boyitem._iIvalue - (boyitem._iIvalue >> 2)); else AddSTextVal(10, boyitem._iIvalue + (boyitem._iIvalue >> 1)); PrintStoreItem(&boyitem, 11, iclr); - AddSText(0, 22, TRUE, "Leave", COL_WHITE, TRUE); + AddSText(0, 22, true, "Leave", COL_WHITE, true); OffsetSTextY(22, 6); } @@ -959,7 +959,7 @@ void HealPlayer() } plr[myplr]._pHitPoints = plr[myplr]._pMaxHP; plr[myplr]._pHPBase = plr[myplr]._pMaxHPBase; - drawhpflag = TRUE; + drawhpflag = true; } void S_StartHealer() @@ -967,12 +967,12 @@ void S_StartHealer() HealPlayer(); stextsize = false; stextscrl = false; - AddSText(0, 1, TRUE, "Welcome to the", COL_GOLD, FALSE); - AddSText(0, 3, TRUE, "Healer's home", COL_GOLD, FALSE); - AddSText(0, 9, TRUE, "Would you like to:", COL_GOLD, FALSE); - AddSText(0, 12, TRUE, "Talk to Pepin", COL_BLUE, TRUE); - AddSText(0, 14, TRUE, "Buy items", COL_WHITE, TRUE); - AddSText(0, 16, TRUE, "Leave Healer's home", COL_WHITE, TRUE); + AddSText(0, 1, true, "Welcome to the", COL_GOLD, false); + AddSText(0, 3, true, "Healer's home", COL_GOLD, false); + AddSText(0, 9, true, "Would you like to:", COL_GOLD, false); + AddSText(0, 12, true, "Talk to Pepin", COL_BLUE, true); + AddSText(0, 14, true, "Buy items", COL_WHITE, true); + AddSText(0, 16, true, "Leave Healer's home", COL_WHITE, true); AddSLine(5); storenumh = 20; } @@ -990,7 +990,7 @@ void S_ScrollHBuy(int idx) iclr = COL_RED; } - AddSText(20, l, FALSE, healitem[idx]._iName, iclr, TRUE); + AddSText(20, l, false, healitem[idx]._iName, iclr, true); AddSTextVal(l, healitem[idx]._iIvalue); PrintStoreItem(&healitem[idx], l + 1, iclr); stextdown = l; @@ -1010,11 +1010,11 @@ void S_StartHBuy() stextscrl = true; stextsval = 0; sprintf(tempstr, "I have these items for sale: Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); S_ScrollHBuy(stextsval); - AddSText(0, 22, TRUE, "Back", COL_WHITE, FALSE); + AddSText(0, 22, true, "Back", COL_WHITE, false); OffsetSTextY(22, 6); storenumh = 0; @@ -1030,21 +1030,21 @@ void S_StartStory() { stextsize = false; stextscrl = false; - AddSText(0, 2, TRUE, "The Town Elder", COL_GOLD, FALSE); - AddSText(0, 9, TRUE, "Would you like to:", COL_GOLD, FALSE); - AddSText(0, 12, TRUE, "Talk to Cain", COL_BLUE, TRUE); - AddSText(0, 14, TRUE, "Identify an item", COL_WHITE, TRUE); - AddSText(0, 18, TRUE, "Say goodbye", COL_WHITE, TRUE); + AddSText(0, 2, true, "The Town Elder", COL_GOLD, false); + AddSText(0, 9, true, "Would you like to:", COL_GOLD, false); + AddSText(0, 12, true, "Talk to Cain", COL_BLUE, true); + AddSText(0, 14, true, "Identify an item", COL_WHITE, true); + AddSText(0, 18, true, "Say goodbye", COL_WHITE, true); AddSLine(5); } bool IdItemOk(ItemStruct *i) { if (i->isEmpty()) { - return FALSE; + return false; } if (i->_iMagical == ITEM_QUALITY_NORMAL) { - return FALSE; + return false; } return !i->_iIdentified; } @@ -1063,7 +1063,7 @@ void S_StartSIdentify() bool idok; int i; - idok = FALSE; + idok = false; stextsize = true; storenumh = 0; @@ -1071,31 +1071,31 @@ void S_StartSIdentify() storehold[i]._itype = ITYPE_NONE; if (IdItemOk(&plr[myplr].InvBody[INVLOC_HEAD])) { - idok = TRUE; + idok = true; AddStoreHoldId(plr[myplr].InvBody[INVLOC_HEAD], -1); } if (IdItemOk(&plr[myplr].InvBody[INVLOC_CHEST])) { - idok = TRUE; + idok = true; AddStoreHoldId(plr[myplr].InvBody[INVLOC_CHEST], -2); } if (IdItemOk(&plr[myplr].InvBody[INVLOC_HAND_LEFT])) { - idok = TRUE; + idok = true; AddStoreHoldId(plr[myplr].InvBody[INVLOC_HAND_LEFT], -3); } if (IdItemOk(&plr[myplr].InvBody[INVLOC_HAND_RIGHT])) { - idok = TRUE; + idok = true; AddStoreHoldId(plr[myplr].InvBody[INVLOC_HAND_RIGHT], -4); } if (IdItemOk(&plr[myplr].InvBody[INVLOC_RING_LEFT])) { - idok = TRUE; + idok = true; AddStoreHoldId(plr[myplr].InvBody[INVLOC_RING_LEFT], -5); } if (IdItemOk(&plr[myplr].InvBody[INVLOC_RING_RIGHT])) { - idok = TRUE; + idok = true; AddStoreHoldId(plr[myplr].InvBody[INVLOC_RING_RIGHT], -6); } if (IdItemOk(&plr[myplr].InvBody[INVLOC_AMULET])) { - idok = TRUE; + idok = true; AddStoreHoldId(plr[myplr].InvBody[INVLOC_AMULET], -7); } @@ -1103,7 +1103,7 @@ void S_StartSIdentify() if (storenumh >= 48) break; if (IdItemOk(&plr[myplr].InvList[i])) { - idok = TRUE; + idok = true; AddStoreHoldId(plr[myplr].InvList[i], i); } } @@ -1111,21 +1111,21 @@ void S_StartSIdentify() if (!idok) { stextscrl = false; sprintf(tempstr, "You have nothing to identify. Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, 22, true, "Back", COL_WHITE, true); OffsetSTextY(22, 6); } else { stextscrl = true; stextsval = 0; stextsmax = plr[myplr]._pNumInv; sprintf(tempstr, "Identify which item? Your gold: %i", plr[myplr]._pGold); - AddSText(0, 1, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 1, true, tempstr, COL_GOLD, false); AddSLine(3); AddSLine(21); S_ScrollSSell(stextsval); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, 22, true, "Back", COL_WHITE, true); OffsetSTextY(22, 6); } } @@ -1142,10 +1142,10 @@ void S_StartIdShow() if (!plr[myplr].HoldItem._iStatFlag) iclr = COL_RED; - AddSText(0, 7, TRUE, "This item is:", COL_WHITE, FALSE); - AddSText(20, 11, FALSE, plr[myplr].HoldItem._iIName, iclr, FALSE); + AddSText(0, 7, true, "This item is:", COL_WHITE, false); + AddSText(20, 11, false, plr[myplr].HoldItem._iIName, iclr, false); PrintStoreItem(&plr[myplr].HoldItem, 12, iclr); - AddSText(0, 18, TRUE, "Done", COL_WHITE, TRUE); + AddSText(0, 18, true, "Done", COL_WHITE, true); } void S_StartTalk() @@ -1155,15 +1155,15 @@ void S_StartTalk() stextsize = false; stextscrl = false; sprintf(tempstr, "Talk to %s", talkname[talker]); - AddSText(0, 2, TRUE, tempstr, COL_GOLD, FALSE); + AddSText(0, 2, true, tempstr, COL_GOLD, false); AddSLine(5); if (gbIsSpawn) { sprintf(tempstr, "Talking to %s", talkname[talker]); - AddSText(0, 10, TRUE, tempstr, COL_WHITE, FALSE); - AddSText(0, 12, TRUE, "is not available", COL_WHITE, FALSE); - AddSText(0, 14, TRUE, "in the shareware", COL_WHITE, FALSE); - AddSText(0, 16, TRUE, "version", COL_WHITE, FALSE); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, 10, true, tempstr, COL_WHITE, false); + AddSText(0, 12, true, "is not available", COL_WHITE, false); + AddSText(0, 14, true, "in the shareware", COL_WHITE, false); + AddSText(0, 16, true, "version", COL_WHITE, false); + AddSText(0, 22, true, "Back", COL_WHITE, true); return; } @@ -1185,23 +1185,23 @@ void S_StartTalk() for (i = 0; i < MAXQUESTS; i++) { if (quests[i]._qactive == QUEST_ACTIVE && Qtalklist[talker][i] != TEXT_NONE && quests[i]._qlog) { - AddSText(0, sn, TRUE, questlist[i]._qlstr, COL_WHITE, TRUE); + AddSText(0, sn, true, questlist[i]._qlstr, COL_WHITE, true); sn += la; } } - AddSText(0, sn2, TRUE, "Gossip", COL_BLUE, TRUE); - AddSText(0, 22, TRUE, "Back", COL_WHITE, TRUE); + AddSText(0, sn2, true, "Gossip", COL_BLUE, true); + AddSText(0, 22, true, "Back", COL_WHITE, true); } void S_StartTavern() { stextsize = false; stextscrl = false; - AddSText(0, 1, TRUE, "Welcome to the", COL_GOLD, FALSE); - AddSText(0, 3, TRUE, "Rising Sun", COL_GOLD, FALSE); - AddSText(0, 9, TRUE, "Would you like to:", COL_GOLD, FALSE); - AddSText(0, 12, TRUE, "Talk to Ogden", COL_BLUE, TRUE); - AddSText(0, 18, TRUE, "Leave the tavern", COL_WHITE, TRUE); + AddSText(0, 1, true, "Welcome to the", COL_GOLD, false); + AddSText(0, 3, true, "Rising Sun", COL_GOLD, false); + AddSText(0, 9, true, "Would you like to:", COL_GOLD, false); + AddSText(0, 12, true, "Talk to Ogden", COL_BLUE, true); + AddSText(0, 18, true, "Leave the tavern", COL_WHITE, true); AddSLine(5); storenumh = 20; } @@ -1210,10 +1210,10 @@ void S_StartBarMaid() { stextsize = false; stextscrl = false; - AddSText(0, 2, TRUE, "Gillian", COL_GOLD, FALSE); - AddSText(0, 9, TRUE, "Would you like to:", COL_GOLD, FALSE); - AddSText(0, 12, TRUE, "Talk to Gillian", COL_BLUE, TRUE); - AddSText(0, 18, TRUE, "Say goodbye", COL_WHITE, TRUE); + AddSText(0, 2, true, "Gillian", COL_GOLD, false); + AddSText(0, 9, true, "Would you like to:", COL_GOLD, false); + AddSText(0, 12, true, "Talk to Gillian", COL_BLUE, true); + AddSText(0, 18, true, "Say goodbye", COL_WHITE, true); AddSLine(5); storenumh = 20; } @@ -1222,10 +1222,10 @@ void S_StartDrunk() { stextsize = false; stextscrl = false; - AddSText(0, 2, TRUE, "Farnham the Drunk", COL_GOLD, FALSE); - AddSText(0, 9, TRUE, "Would you like to:", COL_GOLD, FALSE); - AddSText(0, 12, TRUE, "Talk to Farnham", COL_BLUE, TRUE); - AddSText(0, 18, TRUE, "Say Goodbye", COL_WHITE, TRUE); + AddSText(0, 2, true, "Farnham the Drunk", COL_GOLD, false); + AddSText(0, 9, true, "Would you like to:", COL_GOLD, false); + AddSText(0, 12, true, "Talk to Farnham", COL_BLUE, true); + AddSText(0, 18, true, "Say Goodbye", COL_WHITE, true); AddSLine(5); storenumh = 20; } @@ -1268,7 +1268,7 @@ void SmithBuyItem() TakePlrsMoney(plr[myplr].HoldItem._iIvalue); if (plr[myplr].HoldItem._iMagical == ITEM_QUALITY_NORMAL) - plr[myplr].HoldItem._iIdentified = FALSE; + plr[myplr].HoldItem._iIdentified = false; StoreAutoPlace(); idx = stextvhold + ((stextlhold - stextup) >> 2); if (idx == SMITH_ITEMS - 1) { @@ -1279,7 +1279,7 @@ void SmithBuyItem() } smithitem[idx]._itype = ITYPE_NONE; } - CalcPlrInv(myplr, TRUE); + CalcPlrInv(myplr, true); } void S_SBuyEnter() @@ -1323,7 +1323,7 @@ void SmithBuyPItem() TakePlrsMoney(plr[myplr].HoldItem._iIvalue); if (plr[myplr].HoldItem._iMagical == ITEM_QUALITY_NORMAL) - plr[myplr].HoldItem._iIdentified = FALSE; + plr[myplr].HoldItem._iIdentified = false; StoreAutoPlace(); idx = stextvhold + ((stextlhold - stextup) >> 2); @@ -1393,7 +1393,7 @@ bool StoreGoldFit(int idx) SetCursor_(CURSOR_HAND); if (numsqrs >= sz) - return TRUE; + return true; for (i = 0; i < NUM_INV_GRID_ELEM; i++) { if (plr[myplr].InvGrid[i] == 0) @@ -1425,7 +1425,7 @@ void PlaceStoreGold(int v) bool done; int ii, xx, yy, i; - done = FALSE; + done = false; for (i = 0; i < NUM_INV_GRID_ELEM && !done; i++) { yy = 10 * (i / 10); @@ -1438,7 +1438,7 @@ void PlaceStoreGold(int v) plr[myplr].InvGrid[xx + yy] = plr[myplr]._pNumInv; plr[myplr].InvList[ii]._ivalue = v; SetGoldCurs(myplr, ii); - done = TRUE; + done = true; } } } @@ -1607,7 +1607,7 @@ void WitchBuyItem() } } - CalcPlrInv(myplr, TRUE); + CalcPlrInv(myplr, true); } void S_WBuyEnter() @@ -1629,9 +1629,9 @@ void S_WBuyEnter() } else { plr[myplr].HoldItem = witchitem[idx]; SetCursor_(plr[myplr].HoldItem._iCurs + CURSOR_FIRSTITEM); - done = FALSE; + done = false; if (AutoEquipEnabled(plr[myplr], plr[myplr].HoldItem) && AutoEquip(myplr, plr[myplr].HoldItem, false)) { - done = TRUE; + done = true; } if (done || AutoPlaceItemInInventory(myplr, plr[myplr].HoldItem, false) || AutoPlaceItemInBelt(myplr, plr[myplr].HoldItem, false)) @@ -1682,7 +1682,7 @@ void WitchRechargeItem() else plr[myplr].InvList[i]._iCharges = plr[myplr].InvList[i]._iMaxCharges; - CalcPlrInv(myplr, TRUE); + CalcPlrInv(myplr, true); } void S_WRechargeEnter() @@ -1735,7 +1735,7 @@ void BoyBuyItem() StoreAutoPlace(); boyitem._itype = ITYPE_NONE; stextshold = STORE_BOY; - CalcPlrInv(myplr, TRUE); + CalcPlrInv(myplr, true); stextlhold = 12; } @@ -1757,7 +1757,7 @@ void HealerBuyItem() TakePlrsMoney(plr[myplr].HoldItem._iIvalue); if (plr[myplr].HoldItem._iMagical == ITEM_QUALITY_NORMAL) - plr[myplr].HoldItem._iIdentified = FALSE; + plr[myplr].HoldItem._iIdentified = false; StoreAutoPlace(); if (!gbIsMultiplayer) { @@ -1776,7 +1776,7 @@ void HealerBuyItem() } healitem[idx]._itype = ITYPE_NONE; } - CalcPlrInv(myplr, TRUE); + CalcPlrInv(myplr, true); } void S_BBuyEnter() @@ -1825,25 +1825,25 @@ void StoryIdItem() idx = storehidx[((stextlhold - stextup) >> 2) + stextvhold]; if (idx < 0) { if (idx == -1) - plr[myplr].InvBody[INVLOC_HEAD]._iIdentified = TRUE; + plr[myplr].InvBody[INVLOC_HEAD]._iIdentified = true; if (idx == -2) - plr[myplr].InvBody[INVLOC_CHEST]._iIdentified = TRUE; + plr[myplr].InvBody[INVLOC_CHEST]._iIdentified = true; if (idx == -3) - plr[myplr].InvBody[INVLOC_HAND_LEFT]._iIdentified = TRUE; + plr[myplr].InvBody[INVLOC_HAND_LEFT]._iIdentified = true; if (idx == -4) - plr[myplr].InvBody[INVLOC_HAND_RIGHT]._iIdentified = TRUE; + plr[myplr].InvBody[INVLOC_HAND_RIGHT]._iIdentified = true; if (idx == -5) - plr[myplr].InvBody[INVLOC_RING_LEFT]._iIdentified = TRUE; + plr[myplr].InvBody[INVLOC_RING_LEFT]._iIdentified = true; if (idx == -6) - plr[myplr].InvBody[INVLOC_RING_RIGHT]._iIdentified = TRUE; + plr[myplr].InvBody[INVLOC_RING_RIGHT]._iIdentified = true; if (idx == -7) - plr[myplr].InvBody[INVLOC_AMULET]._iIdentified = TRUE; + plr[myplr].InvBody[INVLOC_AMULET]._iIdentified = true; } else { - plr[myplr].InvList[idx]._iIdentified = TRUE; + plr[myplr].InvList[idx]._iIdentified = true; } - plr[myplr].HoldItem._iIdentified = TRUE; + plr[myplr].HoldItem._iIdentified = true; TakePlrsMoney(plr[myplr].HoldItem._iIvalue); - CalcPlrInv(myplr, TRUE); + CalcPlrInv(myplr, true); } void S_ConfirmEnter() @@ -1936,9 +1936,9 @@ void S_HBuyEnter() } else { plr[myplr].HoldItem = healitem[idx]; SetCursor_(plr[myplr].HoldItem._iCurs + CURSOR_FIRSTITEM); - done = FALSE; + done = false; if (AutoEquipEnabled(plr[myplr], plr[myplr].HoldItem) && AutoEquip(myplr, plr[myplr].HoldItem, false)) { - done = TRUE; + done = true; } if (done || AutoPlaceItemInInventory(myplr, plr[myplr].HoldItem, false) || AutoPlaceItemInBelt(myplr, plr[myplr].HoldItem, false)) @@ -2281,18 +2281,18 @@ void ClearSText(int s, int e) stext[i]._sjust = false; stext[i]._sclr = COL_WHITE; stext[i]._sline = 0; - stext[i]._ssel = FALSE; + stext[i]._ssel = false; stext[i]._sval = -1; } } void StartStore(talk_id s) { - sbookflag = FALSE; - invflag = FALSE; - chrflag = FALSE; - questlog = FALSE; - dropGoldFlag = FALSE; + sbookflag = false; + invflag = false; + chrflag = false; + questlog = false; + dropGoldFlag = false; ClearSText(0, STORE_LINES); ReleaseStoreBtn(); switch (s) { @@ -2435,7 +2435,7 @@ void DrawSText(CelOutputBuffer out) void STextESC() { if (qtextflag) { - qtextflag = FALSE; + qtextflag = false; if (leveltype == DTYPE_TOWN) stream_stop(); } else { @@ -2691,7 +2691,7 @@ void TakePlrsMoney(int cost) void STextEnter() { if (qtextflag) { - qtextflag = FALSE; + qtextflag = false; if (leveltype == DTYPE_TOWN) stream_stop(); @@ -2779,7 +2779,7 @@ void CheckStoreBtn() int y; if (qtextflag) { - qtextflag = FALSE; + qtextflag = false; if (leveltype == DTYPE_TOWN) stream_stop(); } else if (stextsel != -1 && MouseY >= (32 + UI_OFFSET_Y) && MouseY <= (320 + UI_OFFSET_Y)) { diff --git a/Source/themes.cpp b/Source/themes.cpp index 8beb7c09..11724140 100644 --- a/Source/themes.cpp +++ b/Source/themes.cpp @@ -90,14 +90,14 @@ bool TFit_Shrine(int i) xp = 0; yp++; if (yp == MAXDUNY) - return FALSE; + return false; } } } themex = xp; themey = yp; themeVar1 = found; - return TRUE; + return true; } bool TFit_Obj5(int t) @@ -111,15 +111,15 @@ bool TFit_Obj5(int t) r = random_(0, 5) + 1; rs = r; while (r > 0) { - found = FALSE; + found = false; if (dTransVal[xp][yp] == themes[t].ttval && !nSolidTable[dPiece[xp][yp]]) { - found = TRUE; + found = true; for (i = 0; found && i < 25; i++) { if (nSolidTable[dPiece[xp + trm5x[i]][yp + trm5y[i]]]) { - found = FALSE; + found = false; } if (dTransVal[xp + trm5x[i]][yp + trm5y[i]] != themes[t].ttval) { - found = FALSE; + found = false; } } } @@ -131,7 +131,7 @@ bool TFit_Obj5(int t) yp++; if (yp == MAXDUNY) { if (r == rs) { - return FALSE; + return false; } yp = 0; } @@ -145,7 +145,7 @@ bool TFit_Obj5(int t) themex = xp; themey = yp; - return TRUE; + return true; } bool TFit_SkelRoom(int t) @@ -153,7 +153,7 @@ bool TFit_SkelRoom(int t) int i; if (leveltype != DTYPE_CATHEDRAL && leveltype != DTYPE_CATACOMBS) { - return FALSE; + return false; } for (i = 0; i < nummtypes; i++) { @@ -163,7 +163,7 @@ bool TFit_SkelRoom(int t) } } - return FALSE; + return false; } bool TFit_GoatShrine(int t) @@ -177,7 +177,7 @@ bool TFit_GoatShrine(int t) } } - return FALSE; + return false; } bool CheckThemeObj3(int xp, int yp, int t, int f) @@ -186,18 +186,18 @@ bool CheckThemeObj3(int xp, int yp, int t, int f) for (i = 0; i < 9; i++) { if (xp + trm3x[i] < 0 || yp + trm3y[i] < 0) - return FALSE; + return false; if (nSolidTable[dPiece[xp + trm3x[i]][yp + trm3y[i]]]) - return FALSE; + return false; if (dTransVal[xp + trm3x[i]][yp + trm3y[i]] != themes[t].ttval) - return FALSE; + return false; if (dObject[xp + trm3x[i]][yp + trm3y[i]]) - return FALSE; + return false; if (f != -1 && random_(0, f) == 0) - return FALSE; + return false; } - return TRUE; + return true; } bool TFit_Obj3(int t) @@ -210,60 +210,60 @@ bool TFit_Obj3(int t) if (CheckThemeObj3(xp, yp, t, objrnd[leveltype - 1])) { themex = xp; themey = yp; - return TRUE; + return true; } } } - return FALSE; + return false; } bool CheckThemeReqs(theme_id t) { bool rv; - rv = TRUE; + rv = true; switch (t) { case THEME_SHRINE: case THEME_SKELROOM: case THEME_LIBRARY: if (leveltype == DTYPE_CAVES || leveltype == DTYPE_HELL) { - rv = FALSE; + rv = false; } break; case THEME_BLOODFOUNTAIN: if (!bFountainFlag) { - rv = FALSE; + rv = false; } break; case THEME_PURIFYINGFOUNTAIN: if (!pFountainFlag) { - rv = FALSE; + rv = false; } break; case THEME_ARMORSTAND: if (leveltype == DTYPE_CATHEDRAL) { - rv = FALSE; + rv = false; } break; case THEME_CAULDRON: if (leveltype != DTYPE_HELL || !cauldronFlag) { - rv = FALSE; + rv = false; } break; case THEME_MURKYFOUNTAIN: if (!mFountainFlag) { - rv = FALSE; + rv = false; } break; case THEME_TEARFOUNTAIN: if (!tFountainFlag) { - rv = FALSE; + rv = false; } break; case THEME_WEAPONRACK: if (leveltype == DTYPE_CATHEDRAL) { - rv = FALSE; + rv = false; } break; } @@ -293,7 +293,7 @@ static bool SpecialThemeFit(int i, theme_id t) rv = TFit_Obj5(i); } if (rv) { - bFountainFlag = FALSE; + bFountainFlag = false; } break; case THEME_PURIFYINGFOUNTAIN: @@ -301,7 +301,7 @@ static bool SpecialThemeFit(int i, theme_id t) rv = TFit_Obj5(i); } if (rv) { - pFountainFlag = FALSE; + pFountainFlag = false; } break; case THEME_MURKYFOUNTAIN: @@ -309,7 +309,7 @@ static bool SpecialThemeFit(int i, theme_id t) rv = TFit_Obj5(i); } if (rv) { - mFountainFlag = FALSE; + mFountainFlag = false; } break; case THEME_TEARFOUNTAIN: @@ -317,7 +317,7 @@ static bool SpecialThemeFit(int i, theme_id t) rv = TFit_Obj5(i); } if (rv) { - tFountainFlag = FALSE; + tFountainFlag = false; } break; case THEME_CAULDRON: @@ -325,7 +325,7 @@ static bool SpecialThemeFit(int i, theme_id t) rv = TFit_Obj5(i); } if (rv) { - cauldronFlag = FALSE; + cauldronFlag = false; } break; case THEME_GOATSHRINE: @@ -345,7 +345,7 @@ static bool SpecialThemeFit(int i, theme_id t) case THEME_TREASURE: rv = treasureFlag; if (rv) { - treasureFlag = FALSE; + treasureFlag = false; } break; } @@ -359,7 +359,7 @@ bool CheckThemeRoom(int tv) for (i = 0; i < numtrigs; i++) { if (dTransVal[trigs[i]._tx][trigs[i]._ty] == tv) - return FALSE; + return false; } tarea = 0; @@ -368,31 +368,31 @@ bool CheckThemeRoom(int tv) if (dTransVal[i][j] != tv) continue; if (dFlags[i][j] & BFLAG_POPULATED) - return FALSE; + return false; tarea++; } } if (leveltype == DTYPE_CATHEDRAL && (tarea < 9 || tarea > 100)) - return FALSE; + return false; for (j = 0; j < MAXDUNY; j++) { for (i = 0; i < MAXDUNX; i++) { if (dTransVal[i][j] != tv || nSolidTable[dPiece[i][j]]) continue; if (dTransVal[i - 1][j] != tv && !nSolidTable[dPiece[i - 1][j]]) - return FALSE; + return false; if (dTransVal[i + 1][j] != tv && !nSolidTable[dPiece[i + 1][j]]) - return FALSE; + return false; if (dTransVal[i][j - 1] != tv && !nSolidTable[dPiece[i][j - 1]]) - return FALSE; + return false; if (dTransVal[i][j + 1] != tv && !nSolidTable[dPiece[i][j + 1]]) - return FALSE; + return false; } } - return TRUE; + return true; } void InitThemes() @@ -401,22 +401,22 @@ void InitThemes() zharlib = -1; numthemes = 0; - armorFlag = TRUE; - bFountainFlag = TRUE; - cauldronFlag = TRUE; - mFountainFlag = TRUE; - pFountainFlag = TRUE; - tFountainFlag = TRUE; - treasureFlag = TRUE; - bCrossFlag = FALSE; - weaponFlag = TRUE; + armorFlag = true; + bFountainFlag = true; + cauldronFlag = true; + mFountainFlag = true; + pFountainFlag = true; + tFountainFlag = true; + treasureFlag = true; + bCrossFlag = false; + weaponFlag = true; if (currlevel == 16) return; if (leveltype == DTYPE_CATHEDRAL) { for (i = 0; i < sizeof(ThemeGoodIn) / sizeof(ThemeGoodIn[0]); i++) - ThemeGoodIn[i] = FALSE; + ThemeGoodIn[i] = false; for (i = 0; i < 256 && numthemes < MAXTHEMES; i++) { if (CheckThemeRoom(i)) { @@ -507,7 +507,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, TRUE); + AddMonster(xp, yp, random_(0, 8), mtype, true); } } } @@ -592,7 +592,7 @@ void Theme_MonstPit(int t) } } } - CreateRndItem(ixp, iyp, TRUE, FALSE, TRUE); + CreateRndItem(ixp, iyp, true, false, true); ItemNoFlippy(); PlaceThemeMonsts(t, monstrnd[leveltype - 1]); } @@ -686,11 +686,11 @@ void Theme_Treasure(int t) int rv = random_(0, treasrnd[leveltype - 1]); // BUGFIX: the `2*` in `2*random_(0, treasrnd...) == 0` has no effect, should probably be `random_(0, 2*treasrnd...) == 0` if ((2 * random_(0, treasrnd[leveltype - 1])) == 0) { - CreateTypeItem(xp, yp, FALSE, ITYPE_GOLD, IMISC_NONE, FALSE, TRUE); + CreateTypeItem(xp, yp, false, ITYPE_GOLD, IMISC_NONE, false, true); ItemNoFlippy(); } if (rv == 0) { - CreateRndItem(xp, yp, FALSE, FALSE, TRUE); + CreateRndItem(xp, yp, false, false, true); ItemNoFlippy(); } if (rv == 0 || rv >= treasrnd[leveltype - 1] - 2) { @@ -855,7 +855,7 @@ void Theme_ArmorStand(int t) } } PlaceThemeMonsts(t, monstrnd[leveltype - 1]); - armorFlag = FALSE; + armorFlag = false; } /** @@ -872,7 +872,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, TRUE); + AddMonster(xx, yy, DIR_SW, themeVar1, true); } } } @@ -943,7 +943,7 @@ void Theme_BrnCross(int t) } } PlaceThemeMonsts(t, monstrnd[leveltype - 1]); - bCrossFlag = TRUE; + bCrossFlag = true; } /** @@ -973,7 +973,7 @@ void Theme_WeaponRack(int t) } } PlaceThemeMonsts(t, monstrnd[leveltype - 1]); - weaponFlag = FALSE; + weaponFlag = false; } /** @@ -1002,7 +1002,7 @@ void CreateThemeRooms() if (currlevel == 16) { return; } - InitObjFlag = TRUE; + InitObjFlag = true; for (i = 0; i < numthemes; i++) { themex = 0; themey = 0; @@ -1060,7 +1060,7 @@ void CreateThemeRooms() break; } } - InitObjFlag = FALSE; + InitObjFlag = false; if (leveltype == DTYPE_HELL && themeCount > 0) { UpdateL4Trans(); } diff --git a/Source/towners.cpp b/Source/towners.cpp index 9cb02097..bdf8aeeb 100644 --- a/Source/towners.cpp +++ b/Source/towners.cpp @@ -230,7 +230,7 @@ void InitSmith() { int i; - InitTownerInfo(numtowners, 96, TRUE, TOWN_SMITH, 62, 63, 0); + InitTownerInfo(numtowners, 96, true, TOWN_SMITH, 62, 63, 0); InitQstSnds(numtowners, TOWN_SMITH); towner[numtowners]._tNData = LoadFileInMem("Towners\\Smith\\SmithN.CEL", NULL); for (i = 0; i < 8; i++) { @@ -244,7 +244,7 @@ void InitSmith() void InitBarOwner() { - InitTownerInfo(numtowners, 96, TRUE, TOWN_TAVERN, 55, 62, 3); + InitTownerInfo(numtowners, 96, true, TOWN_TAVERN, 55, 62, 3); InitQstSnds(numtowners, TOWN_TAVERN); towner[numtowners]._tNData = LoadFileInMem("Towners\\TwnF\\TwnFN.CEL", NULL); for (int i = 0; i < 8; i++) { @@ -260,7 +260,7 @@ void InitTownDead() { int i; - InitTownerInfo(numtowners, 96, TRUE, TOWN_DEADGUY, 24, 32, -1); + InitTownerInfo(numtowners, 96, true, TOWN_DEADGUY, 24, 32, -1); InitQstSnds(numtowners, TOWN_DEADGUY); towner[numtowners]._tNData = LoadFileInMem("Towners\\Butch\\Deadguy.CEL", NULL); for (i = 0; i < 8; i++) { @@ -276,7 +276,7 @@ void InitWitch() { int i; - InitTownerInfo(numtowners, 96, TRUE, TOWN_WITCH, 80, 20, 5); + InitTownerInfo(numtowners, 96, true, TOWN_WITCH, 80, 20, 5); InitQstSnds(numtowners, TOWN_WITCH); towner[numtowners]._tNData = LoadFileInMem("Towners\\TownWmn1\\Witch.CEL", NULL); for (i = 0; i < 8; i++) { @@ -292,7 +292,7 @@ void InitBarmaid() { int i; - InitTownerInfo(numtowners, 96, TRUE, TOWN_BMAID, 43, 66, -1); + InitTownerInfo(numtowners, 96, true, TOWN_BMAID, 43, 66, -1); InitQstSnds(numtowners, TOWN_BMAID); towner[numtowners]._tNData = LoadFileInMem("Towners\\TownWmn1\\WmnN.CEL", NULL); for (i = 0; i < 8; i++) { @@ -308,7 +308,7 @@ void InitBoy() { int i; - InitTownerInfo(numtowners, 96, TRUE, TOWN_PEGBOY, 11, 53, -1); + InitTownerInfo(numtowners, 96, true, TOWN_PEGBOY, 11, 53, -1); InitQstSnds(numtowners, TOWN_PEGBOY); towner[numtowners]._tNData = LoadFileInMem("Towners\\TownBoy\\PegKid1.CEL", NULL); for (i = 0; i < 8; i++) { @@ -324,7 +324,7 @@ void InitHealer() { int i; - InitTownerInfo(numtowners, 96, TRUE, TOWN_HEALER, 55, 79, 1); + InitTownerInfo(numtowners, 96, true, TOWN_HEALER, 55, 79, 1); InitQstSnds(numtowners, TOWN_HEALER); towner[numtowners]._tNData = LoadFileInMem("Towners\\Healer\\Healer.CEL", NULL); for (i = 0; i < 8; i++) { @@ -340,7 +340,7 @@ void InitTeller() { int i; - InitTownerInfo(numtowners, 96, TRUE, TOWN_STORY, 62, 71, 2); + InitTownerInfo(numtowners, 96, true, TOWN_STORY, 62, 71, 2); InitQstSnds(numtowners, TOWN_STORY); towner[numtowners]._tNData = LoadFileInMem("Towners\\Strytell\\Strytell.CEL", NULL); for (i = 0; i < 8; i++) { @@ -356,7 +356,7 @@ void InitDrunk() { int i; - InitTownerInfo(numtowners, 96, TRUE, TOWN_DRUNK, 71, 84, 4); + InitTownerInfo(numtowners, 96, true, TOWN_DRUNK, 71, 84, 4); InitQstSnds(numtowners, TOWN_DRUNK); towner[numtowners]._tNData = LoadFileInMem("Towners\\Drunk\\TwnDrunk.CEL", NULL); for (i = 0; i < 8; i++) { @@ -380,7 +380,7 @@ void InitCows() x = TownCowX[i]; y = TownCowY[i]; dir = TownCowDir[i]; - InitTownerInfo(numtowners, 128, FALSE, TOWN_COW, x, y, -1); + InitTownerInfo(numtowners, 128, false, TOWN_COW, x, y, -1); towner[numtowners]._tNData = pCowCels; SetTownerGPtrs(towner[numtowners]._tNData, towner[numtowners]._tNAnim); towner[numtowners]._tNFrames = 12; @@ -515,7 +515,7 @@ void TownCtrlMsg(int i) dy = abs(towner[i]._ty - plr[p]._py); if (dx >= 2 || dy >= 2) { towner[i]._tbtcnt = false; - qtextflag = FALSE; + qtextflag = false; stream_stop(); } } @@ -718,7 +718,7 @@ void TownerTalk(int first, int t) { sgdwCowClicks = 0; sgnCowMsg = 0; - storeflag = TRUE; + storeflag = true; InitQTextMsg(first); } @@ -757,7 +757,7 @@ void TalkToTowner(int p, int t) if (quests[Q_SKELKING]._qactive != QUEST_NOTAVAIL) { if (quests[Q_SKELKING]._qvar2 == 0 && !towner[t]._tMsgSaid) { quests[Q_SKELKING]._qvar2 = 1; - quests[Q_SKELKING]._qlog = TRUE; + quests[Q_SKELKING]._qlog = true; if (quests[Q_SKELKING]._qactive == QUEST_INIT) { quests[Q_SKELKING]._qactive = QUEST_ACTIVE; quests[Q_SKELKING]._qvar1 = 1; @@ -766,7 +766,7 @@ void TalkToTowner(int p, int t) towner[t]._tTalkingToPlayer = p; InitQTextMsg(TEXT_KING2); towner[t]._tMsgSaid = true; - NetSendCmdQuest(TRUE, Q_SKELKING); + NetSendCmdQuest(true, Q_SKELKING); } } if (quests[Q_SKELKING]._qactive == QUEST_DONE && quests[Q_SKELKING]._qvar2 == 1 && !towner[t]._tMsgSaid) { @@ -776,7 +776,7 @@ void TalkToTowner(int p, int t) towner[t]._tTalkingToPlayer = p; InitQTextMsg(TEXT_KING4); towner[t]._tMsgSaid = true; - NetSendCmdQuest(TRUE, Q_SKELKING); + NetSendCmdQuest(true, Q_SKELKING); } } if (!gbIsMultiplayer) { @@ -787,7 +787,7 @@ void TalkToTowner(int p, int t) quests[Q_LTBANNER]._qvar1 = 1; quests[Q_LTBANNER]._qactive = QUEST_ACTIVE; } - quests[Q_LTBANNER]._qlog = TRUE; + quests[Q_LTBANNER]._qlog = true; towner[t]._tbtcnt = true; towner[t]._tTalkingToPlayer = p; InitQTextMsg(TEXT_BANNER2); @@ -837,21 +837,21 @@ void TalkToTowner(int p, int t) towner[t]._tMsgSaid = true; } else if (quests[Q_BUTCHER]._qactive == QUEST_INIT || (quests[Q_BUTCHER]._qactive == QUEST_ACTIVE && quests[Q_BUTCHER]._qvar1 == 0)) { quests[Q_BUTCHER]._qactive = QUEST_ACTIVE; - quests[Q_BUTCHER]._qlog = TRUE; + quests[Q_BUTCHER]._qlog = true; quests[Q_BUTCHER]._qmsg = TEXT_BUTCH9; quests[Q_BUTCHER]._qvar1 = 1; towner[t]._tbtcnt = true; towner[t]._tTalkingToPlayer = p; InitQTextMsg(TEXT_BUTCH9); towner[t]._tMsgSaid = true; - NetSendCmdQuest(TRUE, Q_BUTCHER); + NetSendCmdQuest(true, Q_BUTCHER); } } else if (t == GetActiveTowner(TOWN_SMITH)) { if (!gbIsMultiplayer) { if (plr[p]._pLvlVisited[4] && quests[Q_ROCK]._qactive != QUEST_NOTAVAIL) { if (quests[Q_ROCK]._qvar2 == 0) { quests[Q_ROCK]._qvar2 = 1; - quests[Q_ROCK]._qlog = TRUE; + quests[Q_ROCK]._qlog = true; if (quests[Q_ROCK]._qactive == QUEST_INIT) { quests[Q_ROCK]._qactive = QUEST_ACTIVE; quests[Q_ROCK]._qvar1 = 1; @@ -877,7 +877,7 @@ void TalkToTowner(int p, int t) if ((quests[Q_ANVIL]._qactive == QUEST_INIT || quests[Q_ANVIL]._qactive == QUEST_ACTIVE) && quests[Q_ANVIL]._qvar2 == 0 && !towner[t]._tMsgSaid) { if (quests[Q_ROCK]._qvar2 == 2 || (quests[Q_ROCK]._qactive == QUEST_ACTIVE && quests[Q_ROCK]._qvar2 == 1)) { quests[Q_ANVIL]._qvar2 = 1; - quests[Q_ANVIL]._qlog = TRUE; + quests[Q_ANVIL]._qlog = true; if (quests[Q_ANVIL]._qactive == QUEST_INIT) { quests[Q_ANVIL]._qactive = QUEST_ACTIVE; quests[Q_ANVIL]._qvar1 = 1; @@ -913,7 +913,7 @@ void TalkToTowner(int p, int t) if (quests[Q_MUSHROOM]._qactive == QUEST_INIT && PlrHasItem(p, IDI_FUNGALTM, &i) != NULL) { RemoveInvItem(p, i); quests[Q_MUSHROOM]._qactive = QUEST_ACTIVE; - quests[Q_MUSHROOM]._qlog = TRUE; + quests[Q_MUSHROOM]._qlog = true; quests[Q_MUSHROOM]._qvar1 = QS_TOMEGIVEN; towner[t]._tbtcnt = true; towner[t]._tTalkingToPlayer = p; @@ -946,7 +946,7 @@ void TalkToTowner(int p, int t) InitQTextMsg(TEXT_MUSH12); quests[Q_MUSHROOM]._qactive = QUEST_DONE; towner[t]._tMsgSaid = true; - AllItemsList[Item->IDidx].iUsable = TRUE; + AllItemsList[Item->IDidx].iUsable = true; } else if (PlrHasItem(p, IDI_BRAIN, &i) != NULL && quests[Q_MUSHROOM]._qvar2 != TEXT_MUSH11) { towner[t]._tbtcnt = true; towner[t]._tTalkingToPlayer = p; @@ -989,7 +989,7 @@ void TalkToTowner(int p, int t) if (!towner[t]._tMsgSaid) { if (quests[Q_PWATER]._qactive == QUEST_INIT) { quests[Q_PWATER]._qactive = QUEST_ACTIVE; - quests[Q_PWATER]._qlog = TRUE; + quests[Q_PWATER]._qlog = true; quests[Q_PWATER]._qmsg = TEXT_POISON3; quests[Q_PWATER]._qvar1 = 1; towner[t]._tbtcnt = true; @@ -1037,14 +1037,14 @@ void TalkToTowner(int p, int t) InitQTextMsg(TEXT_VILE1); towner[t]._tMsgSaid = true; quests[Q_BETRAYER]._qactive = QUEST_ACTIVE; - quests[Q_BETRAYER]._qlog = TRUE; + quests[Q_BETRAYER]._qlog = true; } else if (quests[Q_BETRAYER]._qactive == QUEST_DONE && quests[Q_BETRAYER]._qvar1 == 7) { quests[Q_BETRAYER]._qvar1 = 8; towner[t]._tbtcnt = true; towner[t]._tTalkingToPlayer = p; InitQTextMsg(TEXT_VILE3); towner[t]._tMsgSaid = true; - quests[Q_DIABLO]._qlog = TRUE; + quests[Q_DIABLO]._qlog = true; } } if (gbIsMultiplayer) { @@ -1053,17 +1053,17 @@ void TalkToTowner(int p, int t) towner[t]._tTalkingToPlayer = p; InitQTextMsg(TEXT_VILE1); towner[t]._tMsgSaid = true; - quests[Q_BETRAYER]._qlog = TRUE; - NetSendCmdQuest(TRUE, Q_BETRAYER); + quests[Q_BETRAYER]._qlog = true; + NetSendCmdQuest(true, Q_BETRAYER); } else if (quests[Q_BETRAYER]._qactive == QUEST_DONE && quests[Q_BETRAYER]._qvar1 == 7) { quests[Q_BETRAYER]._qvar1 = 8; towner[t]._tbtcnt = true; towner[t]._tTalkingToPlayer = p; InitQTextMsg(TEXT_VILE3); towner[t]._tMsgSaid = true; - NetSendCmdQuest(TRUE, Q_BETRAYER); - quests[Q_DIABLO]._qlog = TRUE; - NetSendCmdQuest(TRUE, Q_DIABLO); + NetSendCmdQuest(true, Q_BETRAYER); + quests[Q_DIABLO]._qlog = true; + NetSendCmdQuest(true, Q_DIABLO); } } if (!qtextflag) { @@ -1162,7 +1162,7 @@ void TalkToTowner(int p, int t) PlaySFX(alltext[qt].sfxnr); } if (gbIsMultiplayer) { - NetSendCmdQuest(TRUE, Q_FARMER); + NetSendCmdQuest(true, Q_FARMER); } } } else if (towner[t]._ttype == TOWN_COWFARM) { @@ -1246,7 +1246,7 @@ void TalkToTowner(int p, int t) PlaySFX(alltext[qt].sfxnr); } if (gbIsMultiplayer) { - NetSendCmdQuest(TRUE, Q_JERSEY); + NetSendCmdQuest(true, Q_JERSEY); } } } else if (towner[t]._ttype == TOWN_GIRL) { @@ -1299,7 +1299,7 @@ void TalkToTowner(int p, int t) } } if (gbIsMultiplayer) { - NetSendCmdQuest(TRUE, Q_GIRL); + NetSendCmdQuest(true, Q_GIRL); } } } diff --git a/Source/trigs.cpp b/Source/trigs.cpp index 6f561db8..741822a2 100644 --- a/Source/trigs.cpp +++ b/Source/trigs.cpp @@ -53,7 +53,7 @@ int L6DownList[] = { 57, 58, 59, 60, 61, 62, 63, 64, -1 }; void InitNoTriggers() { numtrigs = 0; - trigflag = FALSE; + trigflag = false; } void InitTownTriggers() @@ -72,7 +72,7 @@ void InitTownTriggers() } if (!gbIsSpawn) { if (gbIsMultiplayer || plr[myplr].pTownWarps & 1 || (gbIsHellfire && plr[myplr]._pLevel >= 10)) { - townwarps[0] = TRUE; + townwarps[0] = true; trigs[numtrigs]._tx = 49; trigs[numtrigs]._ty = 21; trigs[numtrigs]._tmsg = WM_DIABTOWNWARP; @@ -84,7 +84,7 @@ void InitTownTriggers() numtrigs++; } if (gbIsMultiplayer || plr[myplr].pTownWarps & 2 || (gbIsHellfire && plr[myplr]._pLevel >= 15)) { - townwarps[1] = TRUE; + townwarps[1] = true; trigs[numtrigs]._tx = 17; trigs[numtrigs]._ty = 69; trigs[numtrigs]._tmsg = WM_DIABTOWNWARP; @@ -92,7 +92,7 @@ void InitTownTriggers() numtrigs++; } if (gbIsMultiplayer || plr[myplr].pTownWarps & 4 || (gbIsHellfire && plr[myplr]._pLevel >= 20)) { - townwarps[2] = TRUE; + townwarps[2] = true; trigs[numtrigs]._tx = 41; trigs[numtrigs]._ty = 80; trigs[numtrigs]._tmsg = WM_DIABTOWNWARP; @@ -115,7 +115,7 @@ void InitTownTriggers() } } - trigflag = FALSE; + trigflag = false; } void InitL1Triggers() @@ -165,7 +165,7 @@ void InitL1Triggers() } } } - trigflag = FALSE; + trigflag = false; } void InitL2Triggers() @@ -198,7 +198,7 @@ void InitL2Triggers() } } } - trigflag = FALSE; + trigflag = false; } void InitL3Triggers() @@ -258,7 +258,7 @@ void InitL3Triggers() } } } - trigflag = FALSE; + trigflag = false; } void InitL4Triggers() @@ -302,12 +302,12 @@ void InitL4Triggers() } } } - trigflag = FALSE; + trigflag = false; } void InitSKingTriggers() { - trigflag = FALSE; + trigflag = false; numtrigs = 1; trigs[0]._tx = 82; trigs[0]._ty = 42; @@ -316,7 +316,7 @@ void InitSKingTriggers() void InitSChambTriggers() { - trigflag = FALSE; + trigflag = false; numtrigs = 1; trigs[0]._tx = 70; trigs[0]._ty = 39; @@ -325,7 +325,7 @@ void InitSChambTriggers() void InitPWaterTriggers() { - trigflag = FALSE; + trigflag = false; numtrigs = 1; trigs[0]._tx = 30; trigs[0]._ty = 83; @@ -334,7 +334,7 @@ void InitPWaterTriggers() void InitVPTriggers() { - trigflag = FALSE; + trigflag = false; numtrigs = 1; trigs[0]._tx = 35; trigs[0]._ty = 32; @@ -350,7 +350,7 @@ bool ForceTownTrig() strcpy(infostr, "Down to dungeon"); cursmx = 25; cursmy = 29; - return TRUE; + return true; } } @@ -360,7 +360,7 @@ bool ForceTownTrig() strcpy(infostr, "Down to catacombs"); cursmx = 49; cursmy = 21; - return TRUE; + return true; } } } @@ -371,7 +371,7 @@ bool ForceTownTrig() strcpy(infostr, "Down to caves"); cursmx = 17; cursmy = 69; - return TRUE; + return true; } } } @@ -382,7 +382,7 @@ bool ForceTownTrig() strcpy(infostr, "Down to hell"); cursmx = 41; cursmy = 80; - return TRUE; + return true; } } } @@ -393,7 +393,7 @@ bool ForceTownTrig() strcpy(infostr, "Down to Crypt"); cursmx = 36; cursmy = 24; - return TRUE; + return true; } } for (i = 0; TownHiveList[i] != -1; i++) { @@ -401,12 +401,12 @@ bool ForceTownTrig() strcpy(infostr, "Down to Hive"); cursmx = 80; cursmy = 62; - return TRUE; + return true; } } } - return FALSE; + return false; } bool ForceL1Trig() @@ -425,7 +425,7 @@ bool ForceL1Trig() if (trigs[j]._tmsg == WM_DIABPREVLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -437,7 +437,7 @@ bool ForceL1Trig() if (trigs[j]._tmsg == WM_DIABNEXTLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -450,14 +450,14 @@ bool ForceL1Trig() if (trigs[j]._tmsg == WM_DIABPREVLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } } if (dPiece[cursmx][cursmy] == 317) { strcpy(infostr, "Cornerstone of the World"); - return TRUE; + return true; } for (i = 0; L5DownList[i] != -1; i++) { if (dPiece[cursmx][cursmy] == L5DownList[i]) { @@ -466,7 +466,7 @@ bool ForceL1Trig() if (trigs[j]._tmsg == WM_DIABNEXTLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -482,7 +482,7 @@ bool ForceL1Trig() strcpy(infostr, "Up to town"); cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -491,7 +491,7 @@ bool ForceL1Trig() } } - return FALSE; + return false; } bool ForceL2Trig() @@ -508,7 +508,7 @@ bool ForceL2Trig() sprintf(infostr, "Up to level %i", currlevel - 1); cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -522,7 +522,7 @@ bool ForceL2Trig() if (trigs[j]._tmsg == WM_DIABNEXTLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -539,7 +539,7 @@ bool ForceL2Trig() strcpy(infostr, "Up to town"); cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -547,7 +547,7 @@ bool ForceL2Trig() } } - return FALSE; + return false; } bool ForceL3Trig() @@ -562,7 +562,7 @@ bool ForceL3Trig() if (trigs[j]._tmsg == WM_DIABPREVLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -576,7 +576,7 @@ bool ForceL3Trig() if (trigs[j]._tmsg == WM_DIABNEXTLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -589,7 +589,7 @@ bool ForceL3Trig() if (trigs[j]._tmsg == WM_DIABPREVLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -603,7 +603,7 @@ bool ForceL3Trig() if (trigs[j]._tmsg == WM_DIABNEXTLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -621,7 +621,7 @@ bool ForceL3Trig() strcpy(infostr, "Up to town"); cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -639,7 +639,7 @@ bool ForceL3Trig() strcpy(infostr, "Up to town"); cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -647,7 +647,7 @@ bool ForceL3Trig() } } - return FALSE; + return false; } bool ForceL4Trig() @@ -661,7 +661,7 @@ bool ForceL4Trig() if (trigs[j]._tmsg == WM_DIABPREVLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -674,7 +674,7 @@ bool ForceL4Trig() if (trigs[j]._tmsg == WM_DIABNEXTLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -691,7 +691,7 @@ bool ForceL4Trig() strcpy(infostr, "Up to town"); cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } @@ -707,14 +707,14 @@ bool ForceL4Trig() if (trigs[j]._tmsg == WM_DIABNEXTLVL) { cursmx = trigs[j]._tx; cursmy = trigs[j]._ty; - return TRUE; + return true; } } } } } - return FALSE; + return false; } void Freeupstairs() @@ -743,11 +743,11 @@ bool ForceSKingTrig() cursmx = trigs[0]._tx; cursmy = trigs[0]._ty; - return TRUE; + return true; } } - return FALSE; + return false; } bool ForceSChambTrig() @@ -760,11 +760,11 @@ bool ForceSChambTrig() cursmx = trigs[0]._tx; cursmy = trigs[0]._ty; - return TRUE; + return true; } } - return FALSE; + return false; } bool ForcePWaterTrig() @@ -777,16 +777,16 @@ bool ForcePWaterTrig() cursmx = trigs[0]._tx; cursmy = trigs[0]._ty; - return TRUE; + return true; } } - return FALSE; + return false; } void CheckTrigForce() { - trigflag = FALSE; + trigflag = false; if (!sgbControllerActive && MouseY > PANEL_TOP - 1) { return; @@ -847,7 +847,7 @@ void CheckTriggers() switch (trigs[i]._tmsg) { case WM_DIABNEXTLVL: if (gbIsSpawn && currlevel >= 2) { - NetSendCmdLoc(TRUE, CMD_WALKXY, plr[myplr]._px, plr[myplr]._py + 1); + NetSendCmdLoc(true, CMD_WALKXY, plr[myplr]._px, plr[myplr]._py + 1); PlaySFX(PS_WARR18); InitDiabloMsg(EMSG_NOT_IN_SHAREWARE); } else { @@ -903,7 +903,7 @@ void CheckTriggers() } InitDiabloMsg(abortflag); - NetSendCmdLoc(TRUE, CMD_WALKXY, x, y); + NetSendCmdLoc(true, CMD_WALKXY, x, y); return; } } diff --git a/SourceS/miniwin/misc.h b/SourceS/miniwin/misc.h index a99bf836..18fdb01d 100644 --- a/SourceS/miniwin/misc.h +++ b/SourceS/miniwin/misc.h @@ -54,7 +54,7 @@ bool PostMessage(UINT Msg, WPARAM wParam, LPARAM lParam); #ifndef TRUE #define TRUE true #endif -#ifndef FALSE +#ifndef false #define FALSE false #endif diff --git a/SourceT/lighting_test.cpp b/SourceT/lighting_test.cpp index 176ac6fe..5b61e681 100644 --- a/SourceT/lighting_test.cpp +++ b/SourceT/lighting_test.cpp @@ -18,8 +18,8 @@ TEST(Lighting, CrawlTables) int dx = x + CrawlTable[cr]; int dy = y + CrawlTable[cr + 1]; sprintf(tempstr, "location %d:%d added twice.", dx - 20, dy - 20); - EXPECT_EQ(added[dx][dy], FALSE) << tempstr; - added[dx][dy] = TRUE; + EXPECT_EQ(added[dx][dy], false) << tempstr; + added[dx][dy] = true; } } @@ -30,7 +30,7 @@ TEST(Lighting, CrawlTables) if ((i == -18 && j == -18) || (i == -18 && j == 18) || (i == 18 && j == -18) || (i == 18 && j == 18)) continue; // Limit of the crawl table rage sprintf(tempstr, "while checking location %d:%d.", i, j); - EXPECT_EQ(FALSE, TRUE) << tempstr; + EXPECT_EQ(false, true) << tempstr; } } } diff --git a/SourceT/writehero_test.cpp b/SourceT/writehero_test.cpp index 4bd391fb..ecf444c5 100644 --- a/SourceT/writehero_test.cpp +++ b/SourceT/writehero_test.cpp @@ -375,7 +375,7 @@ TEST(Writehero, pfile_write_hero) pfile_ui_save_create(&info); PkPlayerStruct pks; PackPlayerTest(&pks); - UnPackPlayer(&pks, myplr, TRUE); + UnPackPlayer(&pks, myplr, true); AssertPlayer(&plr[0]); pfile_write_hero(); diff --git a/SourceX/qol.cpp b/SourceX/qol.cpp index 2444526b..1eb4c492 100644 --- a/SourceX/qol.cpp +++ b/SourceX/qol.cpp @@ -229,8 +229,8 @@ void AutoGoldPickup(int pnum) if (dItem[x][y] != 0) { int itemIndex = dItem[x][y] - 1; if (items[itemIndex]._itype == ITYPE_GOLD) { - NetSendCmdGItem(TRUE, CMD_REQUESTAGITEM, pnum, pnum, itemIndex); - items[itemIndex]._iRequest = TRUE; + NetSendCmdGItem(true, CMD_REQUESTAGITEM, pnum, pnum, itemIndex); + items[itemIndex]._iRequest = true; PlaySFX(IS_IGRAB); } }