shithub: cstory

Download patch

ref: db4a56510450dd9308ef4af540be4126c4c14dbf
parent: eee18d71a39e4f91b419b6ed4fe4fbeaa783a332
author: cuckydev <cuckydev@users.noreply.github.com>
date: Wed Jan 30 13:53:48 EST 2019 

Fixed some issues


--- a/src/Caret.cpp
+++ b/src/Caret.cpp
@@ -182,6 +182,38 @@
 		crt->rect = {0, 80, 16, 96};
 }
 
+void ActCaret10(CARET *crt)
+{
+	RECT rcLeft[2];
+	RECT rcRight[2];
+	rcLeft[0] = {0, 0, 56, 16};
+	rcLeft[1] = {0, 16, 56, 32};
+	rcRight[0] = {0, 96, 56, 112};
+	rcRight[1] = {0, 112, 56, 128};
+	
+	++crt->ani_wait;
+	
+	if (crt->direct)
+	{
+		if (crt->ani_wait < 20)
+			crt->y -= 0x200;
+		if (crt->ani_wait == 80)
+		crt->cond = 0;
+	}
+	else
+	{
+		if (crt->ani_wait < 20)
+			crt->y -= 0x400;
+		if (crt->ani_wait == 80)
+			crt->cond = 0;
+	}
+	
+	if (crt->direct)
+		crt->rect = rcRight[crt->ani_wait / 2 % 2];
+	else
+		crt->rect = rcLeft[crt->ani_wait / 2 % 2];
+}
+
 void ActCaret11(CARET *crt)
 {
 	if (!crt->act_no)
@@ -291,7 +323,7 @@
 	nullptr, //ActCaret07,
 	ActCaret08,
 	ActCaret09,
-	nullptr, //ActCaret10,
+	ActCaret10,
 	ActCaret11,
 	nullptr, //ActCaret12,
 	ActCaret13,
--- a/src/NpcHit.cpp
+++ b/src/NpcHit.cpp
@@ -505,6 +505,9 @@
 									PlaySoundObject(gNPC[n].hit_voice, 1);
 									gNPC[n].shock = 16;
 								}
+								
+								if (gNPC[n].bits & npc_showDamage)
+									gNPC[n].damage_view -= gBul[b].damage;
 							}
 							else
 							{
-- 
⑨