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

🚨 Handle a bunch of warnings from CLang

pull/1294/head
Anders Jenbo 5 years ago
parent
f64e297d60
commit
ca2c2ba5e7
11 changed files with 20 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Source/diablo.cpp
  2. 4
      Source/inv.cpp
  3. 2
      Source/msg.cpp
  4. 2
      Source/nthread.cpp
  5. 2
      Source/objects.cpp
  6. 2
      Source/path.cpp
  7. 2
      Source/scrollrt.cpp
  8. 6
      Source/stores.cpp
  9. 6
      Source/town.cpp
  10. 4
      Source/towners.cpp
  11. 2
      Source/trigs.cpp

2
Source/diablo.cpp
Unescape View File

@ -654,7 +654,7 @@ static BOOL LeftMouseCmd(BOOL bShift)
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);
} else if (pcursobj != -1 && (!bShift || bNear && object[pcursobj]._oBreak == 1)) {
} else if (pcursobj != -1 && (!bShift || (bNear && object[pcursobj]._oBreak == 1))) {
NetSendCmdLocParam1(TRUE, pcurs == CURSOR_DISARM ? CMD_DISARMXY : CMD_OPOBJXY, cursmx, cursmy, pcursobj);
} else if (plr[myplr]._pwtype == WT_RANGED) {
if (bShift) {

4
Source/inv.cpp
Unescape View File

@ -354,8 +354,8 @@ void DrawInv(CelOutputBuffer out)
if (plr[myplr].InvBody[INVLOC_HAND_LEFT]._iLoc == ILOC_TWOHAND) {
if (plr[myplr]._pClass != PC_BARBARIAN
|| plr[myplr].InvBody[INVLOC_HAND_LEFT]._itype != ITYPE_SWORD
&& plr[myplr].InvBody[INVLOC_HAND_LEFT]._itype != ITYPE_MACE) {
|| (plr[myplr].InvBody[INVLOC_HAND_LEFT]._itype != ITYPE_SWORD
&& 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;

2
Source/msg.cpp
Unescape View File

@ -712,7 +712,7 @@ void DeltaLoadLevel()
M_UpdateLeader(i);
} else {
decode_enemy(i, sgLevels[currlevel].monster[i]._menemy);
if (monster[i]._mx && monster[i]._mx != 1 || monster[i]._my)
if ((monster[i]._mx && monster[i]._mx != 1) || monster[i]._my)
dMonster[monster[i]._mx][monster[i]._my] = i + 1;
if (i < MAX_PLRS) {
MAI_Golum(i);

2
Source/nthread.cpp
Unescape View File

@ -57,7 +57,7 @@ DWORD nthread_send_and_recv_turn(DWORD cur_turn, int turn_delta)
}
while (curTurnsInTransit++ < gdwTurnsInTransit) {
turn_tmp = turn_upper_bit | new_cur_turn & 0x7FFFFFFF;
turn_tmp = turn_upper_bit | (new_cur_turn & 0x7FFFFFFF);
turn_upper_bit = 0;
turn = turn_tmp;

2
Source/objects.cpp
Unescape View File

@ -3506,6 +3506,8 @@ void OperateShrine(int pnum, int i, int sType)
case ITYPE_STAFF:
plr[pnum].InvList[j]._iMaxDam++;
break;
default:
break;
}
}
InitDiabloMsg(EMSG_SHRINE_WEIRD);

2
Source/path.cpp
Unescape View File

@ -183,7 +183,7 @@ BOOL path_get_path(BOOL (*PosOk)(int, int, int), int PosOkArg, PATHNODE *pPath,
dx = pPath->x + pathxdir[i];
dy = pPath->y + pathydir[i];
ok = PosOk(PosOkArg, dx, dy);
if (ok && path_solid_pieces(pPath, dx, dy) || !ok && dx == x && dy == y) {
if ((ok && path_solid_pieces(pPath, dx, dy)) || (!ok && dx == x && dy == y)) {
if (!path_parent_path(pPath, dx, dy, x, y))
return FALSE;
}

2
Source/scrollrt.cpp
Unescape View File

@ -415,7 +415,7 @@ static void DrawPlayer(CelOutputBuffer out, int pnum, int x, int y, int px, int
return;
}
if (!(dFlags[x][y] & BFLAG_LIT) || plr[myplr]._pInfraFlag && light_table_index > 8) {
if (!(dFlags[x][y] & BFLAG_LIT) || (plr[myplr]._pInfraFlag && light_table_index > 8)) {
Cl2DrawLightTbl(out, px, py, pCelBuff, nCel, nWidth, 1);
DrawManaShield(out, pnum, px, py, true);
return;

6
Source/stores.cpp
Unescape View File

@ -961,6 +961,8 @@ void S_StartConfirm()
case STORE_SREPAIR:
strcpy(tempstr, "Are you sure you want to repair this item?");
break;
default:
app_fatal("Unknown store dialog %d", stextshold);
}
AddSText(0, 15, TRUE, tempstr, COL_WHITE, FALSE);
AddSText(0, 18, TRUE, "Yes", COL_WHITE, TRUE);
@ -1789,7 +1791,7 @@ void S_BoyEnter()
TakePlrsMoney(50);
StartStore(STORE_BBOY);
}
} else if (stextsel == 8 && !boyitem.isEmpty() || stextsel == 12 && boyitem.isEmpty()) {
} else if ((stextsel == 8 && !boyitem.isEmpty()) || (stextsel == 12 && boyitem.isEmpty())) {
talker = TOWN_PEGBOY;
stextshold = STORE_BOY;
stextlhold = stextsel;
@ -2894,7 +2896,7 @@ void CheckStoreBtn()
y--;
}
}
if (stext[y]._ssel || stextscrl && y == 22) {
if (stext[y]._ssel || (stextscrl && y == 22)) {
stextsel = y;
STextEnter();
}

6
Source/town.cpp
Unescape View File

@ -185,14 +185,14 @@ void T_Pass3()
mem_free_dbg(pSector);
if (gbIsSpawn || !gbIsMultiplayer) {
if (gbIsSpawn || !(plr[myplr].pTownWarps & 1) && (!gbIsHellfire || plr[myplr]._pLevel < 10)) {
if (gbIsSpawn || (!(plr[myplr].pTownWarps & 1) && (!gbIsHellfire || plr[myplr]._pLevel < 10))) {
T_FillTile(P3Tiles, 48, 20, 320);
}
if (gbIsSpawn || !(plr[myplr].pTownWarps & 2) && (!gbIsHellfire || plr[myplr]._pLevel < 15)) {
if (gbIsSpawn || (!(plr[myplr].pTownWarps & 2) && (!gbIsHellfire || plr[myplr]._pLevel < 15))) {
T_FillTile(P3Tiles, 16, 68, 332);
T_FillTile(P3Tiles, 16, 70, 331);
}
if (gbIsSpawn || !(plr[myplr].pTownWarps & 4) && (!gbIsHellfire || plr[myplr]._pLevel < 20)) {
if (gbIsSpawn || (!(plr[myplr].pTownWarps & 4) && (!gbIsHellfire || plr[myplr]._pLevel < 20))) {
for (x = 36; x < 46; x++) {
T_FillTile(P3Tiles, x, 78, random_(0, 4) + 1);
}

4
Source/towners.cpp
Unescape View File

@ -831,7 +831,7 @@ void TalkToTowner(int p, int t)
towner[t]._tbtcnt = 150;
towner[t]._tVar1 = p;
towner[t]._tMsgSaid = TRUE;
} else if (quests[Q_BUTCHER]._qactive == QUEST_INIT || quests[Q_BUTCHER]._qactive == QUEST_ACTIVE && quests[Q_BUTCHER]._qvar1 == 0) {
} 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]._qmsg = TEXT_BUTCH9;
@ -872,7 +872,7 @@ void TalkToTowner(int p, int t)
}
if (plr[p]._pLvlVisited[9] && quests[Q_ANVIL]._qactive != QUEST_NOTAVAIL) {
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) {
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;
if (quests[Q_ANVIL]._qactive == QUEST_INIT) {

2
Source/trigs.cpp
Unescape View File

@ -809,6 +809,8 @@ void CheckTrigForce()
case DTYPE_HELL:
trigflag = ForceL4Trig();
break;
default:
break;
}
if (leveltype != DTYPE_TOWN && !trigflag) {
trigflag = ForceQuests();

Write Preview
Loading…
Cancel
Save