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

Bugfix and a widescreen/tallscreen fix

Browse source
This commit is contained in:
Clownacy 2019-02-06 20:46:18 +00:00
parent e4c520bb7c
commit b461211fb5
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/NpcAct160.cpp
View file

@ -11,6 +11,7 @@
#include "Frame.h"
#include "Caret.h"
#include "MycParam.h"
#include "CommonDefines.h"
//Puu Black
void ActNpc160(NPCHAR *npc)
@ -923,7 +924,7 @@ void ActNpc173(NPCHAR *npc)
rcRight[2] = {48, 152, 72, 176};
rcRight[3] = {72, 152, 96, 176};
if (npc->x <= gMC.x + 0x28000 && npc->x >= gMC.x - 0x28000 && npc->y <= gMC.y + 0x1E000 && npc->y >= gMC.y - 0x1E000)
if (npc->x <= gMC.x + (WINDOW_WIDTH * 0x200) && npc->x >= gMC.x - (WINDOW_WIDTH * 0x200) && npc->y <= gMC.y + (WINDOW_HEIGHT * 0x200) && npc->y >= gMC.y - (WINDOW_HEIGHT * 0x200))
{
switch (npc->act_no)
{

2
src/NpcAct320.cpp
View file

@ -37,7 +37,7 @@ void ActNpc334(NPCHAR *npc)
npc->y = gMC.y - 0x400;
}
// Fallthrough
case 1:
case 10:
if (++npc->act_wait / 8 & 1)
npc->ani_no = 0;
else