shithub: cstory

Download patch

ref: 87f74bcb6b593a022e57dbfc1ea5dbab22273906
parent: dabf04f8ab22b467432eeb010594ef5933fedc91
author: Clownacy <Clownacy@users.noreply.github.com>
date: Sun Nov 17 12:53:58 EST 2019 

Clean-up ActNpc169


--- a/src/NpcAct160.cpp
+++ b/src/NpcAct160.cpp
@@ -609,7 +609,7 @@
 				npc->direct = 2;
 			// Fallthrough
 		case 1:
-			if (--npc->act_wait)
+			if (--npc->act_wait != 0)
 				break;
 
 			npc->act_no = 2;
@@ -623,7 +623,9 @@
 			npc->ani_wait = 0;
 			// Fallthrough
 		case 3:
-			if (++npc->ani_wait > 3)
+			++npc->ani_wait;
+
+			if (npc->ani_wait > 3)
 			{
 				npc->ani_wait = 0;
 				++npc->ani_no;
@@ -648,48 +650,44 @@
 				DamageMyChar(5);
 				break;
 			}
-			else
+
+			++npc->act_wait;
+
+			if (npc->act_wait > 75)
 			{
-				if (++npc->act_wait > 75)
+				npc->act_no = 9;
+				npc->ani_no = 0;
+				break;
+			}
+
+			if (npc->flag & 5)
+			{
+				if (npc->count2 < 5)
 				{
-					npc->act_no = 9;
-					npc->ani_no = 0;
-					break;
+					++npc->count2;
 				}
 				else
 				{
-					if (npc->flag & 5)
-					{
-						if (npc->count2 < 5)
-						{
-							++npc->count2;
-						}
-						else
-						{
-							npc->act_no = 4;
-							npc->act_wait = 0;
-							npc->ani_no = 7;
-							npc->ym = -0x5FF;
-						}
-					}
-					else
-					{
-						npc->count2 = 0;
-					}
-
-					if (npc->count1 % 2 == 0 && npc->act_wait > 25)
-					{
-						npc->act_no = 4;
-						npc->act_wait = 0;
-						npc->ani_no = 7;
-						npc->ym = -0x5FF;
-						break;
-					}
-
-					break;
+					npc->act_no = 4;
+					npc->act_wait = 0;
+					npc->ani_no = 7;
+					npc->ym = -0x5FF;
 				}
 			}
+			else
+			{
+				npc->count2 = 0;
+			}
 
+			if (npc->count1 % 2 == 0 && npc->act_wait > 25)
+			{
+				npc->act_no = 4;
+				npc->act_wait = 0;
+				npc->ani_no = 7;
+				npc->ym = -0x5FF;
+				break;
+			}
+
 			break;
 
 		case 4:
@@ -752,7 +750,9 @@
 			gMC.x = npc->x;
 			gMC.y = npc->y;
 
-			if (++npc->ani_wait > 2)
+			++npc->ani_wait;
+
+			if (npc->ani_wait > 2)
 			{
 				npc->ani_wait = 0;
 				++npc->ani_no;
@@ -761,7 +761,9 @@
 			if (npc->ani_no > 6)
 				npc->ani_no = 5;
 
-			if (++npc->act_wait > 100)
+			++npc->act_wait;
+
+			if (npc->act_wait > 100)
 				npc->act_no = 20;
 
 			break;
@@ -794,7 +796,9 @@
 			npc->ani_no = 7;
 			// Fallthrough
 		case 21:
-			if (++npc->act_wait < 50)
+			++npc->act_wait;
+
+			if (npc->act_wait < 50)
 				break;
 
 			npc->act_no = 0;
-- 
⑨