mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Merge pull request #749 from InfoTeddy/general-bug-fixes-2

Browse source 
Fix tower camera invincibility inconsistencies
This commit is contained in:
Terry Cavanagh 2021-05-25 13:05:07 +10:30 committed by GitHub
commit 766782da5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
desktop_version/src/Logic.cpp
View file

@ -892,11 +892,53 @@ void gamelogic(void)
if (above_screen) if (above_screen)
{ {
map.ypos-=10; if (obj.entities[player].yp - map.ypos <= 0)
{
if (graphics.towerbg.scrolldir == 1)
{
/* Descending tower:
* Counteract 10 pixels of terminal velocity
* + 2 pixels of camera movement */
map.ypos -= 12;
}
else
{
/* Ascending tower:
* Move 8 out of 10 pixels of terminal velocity
* Camera movement will move 2 pixels for us */
map.ypos -= 8;
}
}
else
{
/* Counter 2 pixels of camera movement */
map.ypos -= 2;
}
} }
else if (below_screen) else if (below_screen)
{ {
map.ypos+=2; if (obj.entities[player].yp - map.ypos >= 208)
{
if (graphics.towerbg.scrolldir == 0)
{
/* Ascending tower:
* Counteract 10 pixels of terminal velocity
* + 2 pixels of camera movement */
map.ypos += 12;
}
else
{
/* Descending tower:
* Move 8 out of 10 pixels of terminal velocity
* Camera movement will move 2 pixels for us */
map.ypos += 8;
}
}
else
{
/* Counter 2 pixels of camera movement */
map.ypos += 2;
}
} }
if (above_screen || below_screen) if (above_screen || below_screen)