shithub: cstory

Info  •  Files  •  Log  •  Branches

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.

--- a/src/NpcAct140.cpp

+++ b/src/NpcAct140.cpp

@@ -1949,6 +1949,8 @@

 // Monster X (defeated)

 void ActNpc159(NPCHAR *npc)

 {

+	int i;

+

 	RECT rect = {144, 128, 192, 200};

 	switch (npc->act_no)

@@ -1956,7 +1958,7 @@

 		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:

--- a/src/NpcAct180.cpp

+++ b/src/NpcAct180.cpp

@@ -970,6 +970,8 @@

 // Broken robot

 void ActNpc190(NPCHAR *npc)

 {

+	int i;

+

 	RECT rect[2] = {

 		{192, 32, 208, 48},

 		{208, 32, 224, 48},

@@ -983,7 +985,7 @@

 		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;