Merge pull request #35 from GabrielRavier/feature/improveNpcAct

Improve NpcAct files

src/NpcAct000.cpp

@@ -261,6 +261,7 @@ void ActNpc002(NPCHAR *npc)
 				npc->ani_no = 4;
 			}
 			break;
+
 		case 1: // Shot
 			npc->xm = 7 * npc->xm / 8;
 
@@ -281,6 +282,7 @@ void ActNpc002(NPCHAR *npc)
 				}
 			}
 			break;
+
 		case 2: // Charge
 			if (npc->direct == 0)
 				npc->xm = -0x400;
@@ -430,7 +432,7 @@ void ActNpc005(NPCHAR *npc)
 
 	switch (npc->act_no)
 	{
-		case 0: //Init
+		case 0: // Initialize
 			npc->y += 0x600;
 			npc->act_no = 1;
 			// Fallthrough
@@ -540,7 +542,7 @@ void ActNpc006(NPCHAR *npc)
 
 	switch (npc->act_no)
 	{
-		case 0: //Init
+		case 0: // Initialize
 			npc->act_no = 1;
 
 			if (npc->direct == 0)

src/NpcAct020.cpp

@@ -192,7 +192,7 @@ void ActNpc024(NPCHAR *npc)
 				npc->act_no = 4;
 				npc->ani_no = 3;
 				npc->act_wait = 0;
-				npc->act_wait = 0;	// lol duplicate line
+				npc->act_wait = 0;	// Pixel duplicated this line
 			}
 
 			break;
@@ -625,7 +625,7 @@ void ActNpc028(NPCHAR *npc)
 				npc->act_no = 4;
 				npc->ani_no = 3;
 				npc->act_wait = 0;
-				npc->act_wait = 0;	// lol duplicate line
+				npc->act_wait = 0;	// Pixel duplicated this line
 			}
 
 			break;

src/NpcAct040.cpp

@@ -1261,7 +1261,7 @@ void ActNpc051(NPCHAR *npc)
 		npc->rect = rect_right[npc->ani_no];
 }
 
-//Bliue robot (sitting)
+// Blue robot (sitting)
 void ActNpc052(NPCHAR *npc)
 {
 	RECT rect = {240, 96, 256, 112};

src/NpcAct060.cpp

@@ -277,6 +277,7 @@ void ActNpc061(NPCHAR *npc)
 				npc->act_no = 5;
 
 			break;
+
 		case 8:
 			npc->act_no = 9;
 			npc->ani_no = 4;
@@ -642,7 +643,7 @@ void ActNpc064(NPCHAR *npc)
 
 	switch (npc->act_no)
 	{
-		case 0: //Init
+		case 0: // Initialize
 			npc->y += 0x600;
 			npc->act_no = 1;
 			// Fallthrough
@@ -1766,7 +1767,7 @@ void ActNpc078(NPCHAR *npc)
 		npc->rect = rc[1];
 }
 
-// Mahin the sex god
+// Mahin
 void ActNpc079(NPCHAR *npc)
 {
 	RECT rcLeft[3] = {

src/NpcAct100.cpp

@@ -299,7 +299,7 @@ void ActNpc104(NPCHAR *npc)
 		npc->rect = rcRight[npc->ani_no];
 }
 
-//'HEY!' speech bubble (low)
+// "HEY!" speech bubble (low)
 void ActNpc105(NPCHAR *npc)
 {
 	RECT rect[2] = {
@@ -316,7 +316,7 @@ void ActNpc105(NPCHAR *npc)
 	npc->rect = rect[npc->ani_no];
 }
 
-//'HEY!' speech bubble (high)
+// "HEY!" speech bubble (high)
 void ActNpc106(NPCHAR *npc)
 {
 	switch (npc->act_no)
@@ -1085,6 +1085,7 @@ void ActNpc114(NPCHAR *npc)
 			npc->ani_no = 1;
 
 			break;
+
 		case 10:
 			if (++npc->ani_wait > 2)
 			{

src/NpcAct120.cpp

@@ -292,14 +292,17 @@ void ActNpc123(NPCHAR *npc)
 					npc->xm = -0x1000;
 					npc->ym = Random(-0x80, 0x80);
 					break;
+
 				case 1:
 					npc->ym = -0x1000;
 					npc->xm = Random(-0x80, 0x80);
 					break;
+
 				case 2:
 					npc->xm = 0x1000;
 					npc->ym = Random(-0x80, 0x80);
 					break;
+
 				case 3:
 					npc->ym = 0x1000;
 					npc->xm = Random(-0x80, 0x80);
@@ -315,14 +318,17 @@ void ActNpc123(NPCHAR *npc)
 					if (npc->flag & 1)
 						bBreak = TRUE;
 					break;
+
 				case 1:
 					if (npc->flag & 2)
 						bBreak = TRUE;
 					break;
+
 				case 2:
 					if (npc->flag & 4)
 						bBreak = TRUE;
 					break;
+
 				case 3:
 					if (npc->flag & 8)
 						bBreak = TRUE;
@@ -377,12 +383,15 @@ void ActNpc124(NPCHAR *npc)
 				case 0:
 					npc->x -= 0x80;
 					break;
+
 				case 1:
 					npc->y -= 0x80;
 					break;
+
 				case 2:
 					npc->x += 0x80;
 					break;
+
 				case 3:
 					npc->y += 0x80;
 					break;
@@ -643,12 +652,15 @@ void ActNpc128(NPCHAR *npc)
 		case 0:
 			npc->rect = rcLeft[npc->ani_no];
 			break;
+
 		case 1:
 			npc->rect = rcUp[npc->ani_no];
 			break;
+
 		case 2:
 			npc->rect = rcRight[npc->ani_no];
 			break;
+
 		case 3:
 			npc->rect = rcDown[npc->ani_no];
 			break;

src/NpcAct140.cpp

@@ -1889,12 +1889,15 @@ void ActNpc158(NPCHAR *npc)
 				case 0:
 					npc->count1 = 0xA0;
 					break;
+
 				case 1:
 					npc->count1 = 0xE0;
 					break;
+
 				case 2:
 					npc->count1 = 0x20;
 					break;
+
 				case 3:
 					npc->count1 = 0x60;
 					break;

src/NpcAct160.cpp

@@ -137,18 +137,23 @@ void ActNpc160(NPCHAR *npc)
 		case 1:
 			npc->ani_no = 3;
 			break;
+
 		case 2:
 			npc->ani_no = 3;
 			break;
+
 		case 3:
 			npc->ani_no = 2;
 			break;
+
 		case 4:
 			npc->ani_no = 0;
 			break;
+
 		case 5:
 			npc->ani_no = 3;
 			break;
+
 		case 6:
 			npc->ani_no = 3;
 			break;
@@ -492,6 +497,7 @@ void ActNpc167(NPCHAR *npc)
 			npc->act_no = 1;
 			npc->ani_no = 1;
 			break;
+
 		case 10:
 			npc->ani_no = 0;
 
@@ -501,6 +507,7 @@ void ActNpc167(NPCHAR *npc)
 
 			npc->y += npc->ym;
 			break;
+
 		case 20:
 			npc->act_no = 21;
 			npc->act_wait = 0;

src/NpcAct180.cpp

@@ -594,12 +594,15 @@ void ActNpc184(NPCHAR *npc)
 				case 0:
 					npc->x -= 0x80;
 					break;
+
 				case 1:
 					npc->y -= 0x80;
 					break;
+
 				case 2:
 					npc->x += 0x80;
 					break;
+
 				case 3:
 					npc->y += 0x80;
 					break;
@@ -642,6 +645,7 @@ void ActNpc185(NPCHAR *npc)
 			npc->act_no = 1;
 			npc->y += 0x1000;
 			break;
+
 		case 10:
 			npc->act_no = 11;
 			npc->ani_no = 1;
@@ -654,18 +658,22 @@ void ActNpc185(NPCHAR *npc)
 				case 0:
 					npc->x -= 0x80;
 					break;
+
 				case 1:
 					npc->y -= 0x80;
 					break;
+
 				case 2:
 					npc->x += 0x80;
 					break;
+
 				case 3:
 					npc->y += 0x80;
 					break;
 			}
 			++npc->act_wait;
 			break;
+
 		case 20:
 			npc->y -= 0x3000;
 			npc->act_no = 1;
@@ -692,6 +700,7 @@ void ActNpc186(NPCHAR *npc)
 			// Fallthrough
 		case 1:
 			break;
+
 		case 10:
 			npc->act_no = 11;
 			npc->ani_no = 1;
@@ -704,12 +713,15 @@ void ActNpc186(NPCHAR *npc)
 				case 0:
 					npc->x -= 0x80;
 					break;
+
 				case 1:
 					npc->y -= 0x80;
 					break;
+
 				case 2:
 					npc->x += 0x80;
 					break;
+
 				case 3:
 					npc->y += 0x80;
 					break;
@@ -968,12 +980,14 @@ void ActNpc190(NPCHAR *npc)
 		case 0:
 			npc->ani_no = 0;
 			break;
+
 		case 10:
 			PlaySoundObject(72, 1);
 			for (int 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;
+
 		case 20:
 			if (++npc->ani_wait > 10)
 			{
@@ -1011,6 +1025,7 @@ void ActNpc191(NPCHAR *npc)
 
 			npc->y += npc->ym;
 			break;
+
 		case 20:
 			npc->act_no = 21;
 			npc->act_wait = 0;
@@ -1371,12 +1386,15 @@ void ActNpc199(NPCHAR *npc)
 				case 0:
 					npc->xm = -1;
 					break;
+
 				case 1:
 					npc->ym = -1;
 					break;
+
 				case 2:
 					npc->xm = 1;
 					break;
+
 				case 3:
 					npc->ym = 1;
 					break;

src/NpcAct240.cpp

@@ -1125,15 +1125,18 @@ void ActNpc254(NPCHAR *npc)
 			SetNpChar(255, npc->x + 0x2400, npc->y - 0x7200, 0, 0, 0, npc, 0x100);
 			SetNpChar(255, npc->x - 0x4000, npc->y - 0x6800, 0, 0, 2, npc, 0x100);
 			break;
+
 		case 20:
 			npc->act_wait = 0;
 			npc->count1 = 60;
 			npc->act_no = 21;
 			break;
+
 		case 30:
 			npc->act_no = 21;
 			SetNpChar(223, npc->x - 0x1600, npc->y - 0x1C00, 0, 0, 0, 0, 0x100);
 			break;
+
 		case 40:
 			npc->act_no = 21;
 			SetNpChar(223, npc->x - 0x1200, npc->y - 0x1C00, 0, 0, 0, 0, 0x100);

src/NpcAct260.cpp

@@ -724,18 +724,22 @@ void ActNpc267(NPCHAR *npc)
 					case 8:
 						npc->act_no = 20;
 						break;
+
 					case 2:
 					case 7:
 						npc->act_no = 100;
 						break;
+
 					case 3:
 					case 6:
 						npc->act_no = 30;
 						break;
+
 					case 1:
 					case 9:
 						npc->act_no = 40;
 						break;
+
 					default:
 						npc->act_no = 15;
 						npc->act_wait = 0;
@@ -2165,6 +2169,7 @@ void ActNpc279(NPCHAR *npc)
 					npc->bits |= 4;
 					npc->ani_no = 0;
 					break;
+
 				case 2:
 					npc->act_no = 100;
 					npc->bits |= 4;
@@ -2178,6 +2183,7 @@ void ActNpc279(NPCHAR *npc)
 					npc->hit.top = 0x1000;
 					npc->hit.bottom = 0x1000;
 					break;
+
 				case 1:
 					npc->ani_no = 0;
 					npc->act_no = 10;

src/NpcAct280.cpp

@@ -456,12 +456,15 @@ void ActNpc283(NPCHAR *npc)
 							case 0:
 								direct = 0xD8;
 								break;
+
 							case 1:
 								direct = 0xEC;
 								break;
+
 							case 2:
 								direct = 0x14;
 								break;
+
 							case 3:
 								direct = 0x28;
 								break;
@@ -477,12 +480,15 @@ void ActNpc283(NPCHAR *npc)
 							case 0:
 								direct = 0x58;
 								break;
+
 							case 1:
 								direct = 0x6C;
 								break;
+
 							case 2:
 								direct = 0x94;
 								break;
+
 							case 3:
 								direct = 0xA8;
 								break;
@@ -505,12 +511,15 @@ void ActNpc283(NPCHAR *npc)
 						case 0:
 							direct = 0xD8;
 							break;
+
 						case 1:
 							direct = 0xEC;
 							break;
+
 						case 2:
 							direct = 0x14;
 							break;
+
 						case 3:
 							direct = 0x28;
 							break;
@@ -526,12 +535,15 @@ void ActNpc283(NPCHAR *npc)
 						case 0:
 							direct = 0x58;
 							break;
+
 						case 1:
 							direct = 0x6C;
 							break;
+
 						case 2:
 							direct = 0x94;
 							break;
+
 						case 3:
 							direct = 0xA8;
 							break;
@@ -735,9 +747,11 @@ void ActNpc284(NPCHAR *npc)
 					case 3:
 						npc->act_no = 34;
 						break;
+
 					case 0:
 						npc->act_no = 32;
 						break;
+
 					case 2:
 						npc->act_no = 32;
 						break;
@@ -1488,36 +1502,43 @@ void ActNpc295(NPCHAR *npc)
 					npc->view.back = 0xD000;
 					npc->view.front = 0xD000;
 					break;
+
 				case 1:
 					npc->ym = -0x800;
 					npc->view.back = 0x7000;
 					npc->view.front = 0x7000;
 					break;
+
 				case 2:
 					npc->ym = -0x400;
 					npc->view.back = 0x4000;
 					npc->view.front = 0x4000;
 					break;
+
 				case 3:
 					npc->ym = -0x200;
 					npc->view.back = 0x2800;
 					npc->view.front = 0x2800;
 					break;
+
 				case 4:
 					npc->xm = -0x400;
 					npc->view.back = 0xD000;
 					npc->view.front = 0xD000;
 					break;
+
 				case 5:
 					npc->xm = -0x200;
 					npc->view.back = 0x7000;
 					npc->view.front = 0x7000;
 					break;
+
 				case 6:
 					npc->xm = -0x100;
 					npc->view.back = 0x4000;
 					npc->view.front = 0x4000;
 					break;
+
 				case 7:
 					npc->xm = -0x80;
 					npc->view.back = 0x2800;
@@ -1560,12 +1581,15 @@ void ActNpc296(NPCHAR *npc)
 				case 0:
 					pri = 0x180;
 					break;
+
 				case 1:
 					pri = 0x80;
 					break;
+
 				case 2:
 					pri = 0x40;
 					break;
+
 				case 3:
 					pri = 0x00;
 					break;
@@ -1582,12 +1606,15 @@ void ActNpc296(NPCHAR *npc)
 				case 0:
 					pri = 0x80;
 					break;
+
 				case 1:
 					pri = 0x55;
 					break;
+
 				case 2:
 					pri = 0x40;
 					break;
+
 				case 3:
 					pri = 0x00;
 					break;

src/NpcAct300.cpp

@@ -116,12 +116,15 @@ void ActNpc302(NPCHAR *npc)
 				case 0:
 					npc->x -= 0x400;
 					break;
+
 				case 1:
 					npc->y -= 0x400;
 					break;
+
 				case 2:
 					npc->x += 0x400;
 					break;
+
 				case 3:
 					npc->y += 0x400;
 					break;
@@ -230,9 +233,11 @@ void ActNpc304(NPCHAR *npc)
 		case 1:
 			npc->ani_no = 0;
 			break;
+
 		case 10:
 			npc->ani_no = 1;
 			break;
+
 		case 20:
 			npc->act_no = 21;
 			npc->ani_no = 2;
@@ -247,6 +252,7 @@ void ActNpc304(NPCHAR *npc)
 			if (npc->ani_no > 3)
 				npc->ani_no = 2;
 			break;
+
 		default:
 			break;
 	}
@@ -322,6 +328,7 @@ void ActNpc306(NPCHAR *npc)
 				npc->ani_no = 1;
 			}
 			break;
+
 		case 2:
 			if (++npc->act_wait > 8)
 			{
@@ -367,6 +374,7 @@ void ActNpc307(NPCHAR *npc)
 				npc->ani_no = 1;
 			}
 			break;
+
 		case 2:
 			if (++npc->act_wait > 12)
 			{

src/NpcAct320.cpp

@@ -222,18 +222,23 @@ void ActNpc322(NPCHAR *npc)
 				case 0:
 					SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 0, 0, 0x180);
 					break;
+
 				case 50:
 					SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 1, 0, 0x180);
 					break;
+
 				case 100:
 					SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 2, 0, 0x180);
 					break;
+
 				case 150:
 					SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 3, 0, 0x180);
 					break;
+
 				case 200:
 					SetNpChar(207, npc->x + 0x800, npc->y, 0, 0, 4, 0, 0x180);
 					break;
+
 				case 250:
 					npc->hit.back = 0x6000;
 					npc->hit.front = 0x6000;
@@ -293,12 +298,15 @@ void ActNpc323(NPCHAR *npc)
 				case 0:
 					npc->xm = -0x600;
 					break;
+
 				case 2:
 					npc->xm = 0x600;
 					break;
+
 				case 1:
 					npc->ym = -0x600;
 					break;
+
 				case 3:
 					npc->ym = 0x600;
 					break;
@@ -322,14 +330,17 @@ void ActNpc323(NPCHAR *npc)
 						if (npc->x <= gMC.x + 0x4000)
 							npc->act_no = 10;
 						break;
+
 					case 2:
 						if (npc->x >= gMC.x - 0x4000)
 							npc->act_no = 10;
 						break;
+
 					case 1:
 						if (npc->y <= gMC.y + 0x4000)
 							npc->act_no = 10;
 						break;
+
 					case 3:
 						if (npc->y >= gMC.y - 0x4000)
 							npc->act_no = 10;

src/NpcAct340.cpp

@@ -78,6 +78,7 @@ void ActNpc340(NPCHAR *npc)
 					case 3:
 						npc->act_no = 200;
 						break;
+
 					case 4:
 						npc->act_no = 300;
 						break;
@@ -810,6 +811,7 @@ void ActNpc342(NPCHAR *npc)
 					PlaySoundObject(26, 1);
 				}
 				break;
+
 			case 1:
 				if (npc->count1 == 268)
 				{
@@ -818,6 +820,7 @@ void ActNpc342(NPCHAR *npc)
 					PlaySoundObject(26, 1);
 				}
 				break;
+
 			case 2:
 				if (npc->count1 == 396)
 				{
@@ -827,6 +830,7 @@ void ActNpc342(NPCHAR *npc)
 					PlaySoundObject(26, 1);
 				}
 				break;
+
 			case 3:
 				if (npc->count1 == 12)
 				{
@@ -1500,6 +1504,7 @@ void ActNpc352(NPCHAR *npc)
 				case 13:
 					npc->surf = SURFACE_ID_LEVEL_SPRITESET_1;
 					break;
+
 				default:
 					break;
 			}
@@ -1512,6 +1517,7 @@ void ActNpc352(NPCHAR *npc)
 				case 12:
 					npc->view.top = 0x2000;
 					break;
+
 				default:
 					break;
 			}
@@ -1608,12 +1614,15 @@ void ActNpc353(NPCHAR *npc)
 				case 0:
 					npc->xm = -0x600;
 					break;
+
 				case 2:
 					npc->xm = 0x600;
 					break;
+
 				case 1:
 					npc->ym = -0x600;
 					break;
+
 				case 3:
 					npc->ym = 0x600;
 					break;