duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix NPC 295

Browse source
This commit is contained in:
Clownacy 2019-02-09 23:28:36 +00:00
parent 7d788dd759
commit 8bb6791769
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/NpcAct280.cpp
View file

@ -1507,10 +1507,10 @@ void ActNpc295(NPCHAR *npc)
npc->view.back = 0x2800; npc->view.back = 0x2800;
npc->view.front = 0x2800; npc->view.front = 0x2800;
break; break;
default:
break;
} }
//Fallthrough
break;
case 1: case 1:
npc->x += npc->xm; npc->x += npc->xm;
npc->y += npc->ym; npc->y += npc->ym;
@ -1530,7 +1530,7 @@ void ActNpc296(NPCHAR *npc)
if (++npc->act_wait > 16) if (++npc->act_wait > 16)
{ {
npc->act_wait = Random(0, 16); npc->act_wait = Random(0, 16);
int dir = Random(0, 100) % 4; int dir = Random(0, 100) & 3;
int pri; int pri;
if (npc->direct) if (npc->direct)
@ -1551,7 +1551,7 @@ void ActNpc296(NPCHAR *npc)
break; break;
} }
SetNpChar(295, npc->x, npc->y + (Random(-7, 7) << 13), 0, 0, dir + 4, 0, pri); SetNpChar(295, npc->x, npc->y + (Random(-7, 7) * 0x2000), 0, 0, dir + 4, 0, pri);
} }
else else
{ {
@ -1571,7 +1571,7 @@ void ActNpc296(NPCHAR *npc)
break; break;
} }
SetNpChar(295, npc->x + (Random(-10, 10) << 13), npc->y, 0, 0, dir, 0, pri); SetNpChar(295, npc->x + (Random(-10, 10) * 0x2000), npc->y, 0, 0, dir, 0, pri);
} }
} }
} }