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

Merge branch 'master' of https://github.com/cuckydev/Cave-Story-Engine-2

Browse source
This commit is contained in:
Clownacy 2019-02-07 22:48:45 +00:00
commit 461c28a0a8
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
build/Profile - Copy.dat Normal file
View file

Binary file not shown.

16
src/Back.cpp
View file

@ -167,12 +167,18 @@ void PutFront(int fx, int fy)
{ {
const bool fromFocus = (gStageNo == 31); //Get if we should only draw around a 320x240 area of the focus point const bool fromFocus = (gStageNo == 31); //Get if we should only draw around a 320x240 area of the focus point
//Get borders //Get focus rect
const int barLeft = fromFocus ? (*gFrame.tgt_x - (320 << 8)) : -0x1000; int focusX = gFrame.x + (WINDOW_WIDTH << 8) - (320 << 8);
const int barTop = fromFocus ? (*gFrame.tgt_y - (240 << 8)) : -0x1000; int focusY = gFrame.y + (WINDOW_HEIGHT << 8) - (240 << 8);
int focusR = focusX + (320 << 9);
int focusB = focusY + (240 << 9);
const int barRight = fromFocus ? (*gFrame.tgt_x + (320 << 8)) : (gMap.width << 13) - 0x1000; //Get borders
const int barBottom = fromFocus ? (*gFrame.tgt_y + (240 << 8)) : (gMap.length << 13) - 0x1000; const int barLeft = fromFocus ? focusX : -0x1000;
const int barTop = fromFocus ? focusY : -0x1000;
const int barRight = fromFocus ? focusR : (gMap.width << 13) - 0x1000;
const int barBottom = fromFocus ? focusB : (gMap.length << 13) - 0x1000;
//Draw bars //Draw bars
RECT barRect; RECT barRect;

1
src/Frame.cpp
View file

@ -43,7 +43,6 @@ void MoveFrame3()
} }
else else
{ {
gFrame.y = (((map_l - 1) << 4) - WINDOW_HEIGHT) << 8; gFrame.y = (((map_l - 1) << 4) - WINDOW_HEIGHT) << 8;
} }