From a9265e8b4553f3aaedf55192b89e2d09ea8d5037 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 17 Oct 2019 00:47:25 +0100 Subject: [PATCH] Fix some errors when compiled with Visual Studio 6 Thanks to Mint for testing VS6. The compiler would complain about the declaration of these variables being skipped by the switch's labels. Pretty sure this is perfectly-legal C++98, but whatever. ... Stupid old compilers. --- src/NpcAct140.cpp | 4 +++- src/NpcAct180.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/NpcAct140.cpp b/src/NpcAct140.cpp index 032a4c35..e9a8575c 100644 --- a/src/NpcAct140.cpp +++ b/src/NpcAct140.cpp @@ -1949,6 +1949,8 @@ void ActNpc158(NPCHAR *npc) // Monster X (defeated) void ActNpc159(NPCHAR *npc) { + int i; + RECT rect = {144, 128, 192, 200}; switch (npc->act_no) @@ -1956,7 +1958,7 @@ void ActNpc159(NPCHAR *npc) case 0: npc->act_no = 1; - for (int i = 0; i < 8; ++i) + for (i = 0; i < 8; ++i) SetNpChar(4, npc->x + (Random(-16, 16) * 0x200), npc->y + (Random(-16, 16) * 0x200), Random(-341, 341), Random(-341, 341), 0, 0, 0x100); // Fallthrough case 1: diff --git a/src/NpcAct180.cpp b/src/NpcAct180.cpp index ba41f9a2..7d781346 100644 --- a/src/NpcAct180.cpp +++ b/src/NpcAct180.cpp @@ -970,6 +970,8 @@ void ActNpc189(NPCHAR *npc) // Broken robot void ActNpc190(NPCHAR *npc) { + int i; + RECT rect[2] = { {192, 32, 208, 48}, {208, 32, 224, 48}, @@ -983,7 +985,7 @@ void ActNpc190(NPCHAR *npc) case 10: PlaySoundObject(72, 1); - for (int i = 0; i < 8; i++) + for (i = 0; i < 8; i++) SetNpChar(4, npc->x, npc->y + (Random(-8, 8) << 9), Random(-8, -2) << 9, Random(-3, 3) << 9, 0, 0, 0x100); npc->cond = 0; break;