mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-03 15:39:46 +01:00
Code Issues Releases Wiki Activity

Retype dr to be int instead of float

Browse source 
This variable passes along the rule of the entity, which is an int. No
idea why it was converted to a float. Thankfully this is only used for
an unused block type, so it doesn't really matter.
This commit is contained in:
Misa 2022-12-11 10:55:25 -08:00
parent babcadc99f
commit 12820473db
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop_version/src/Entity.cpp
View file

@ -4114,7 +4114,7 @@ bool entityclass::checkplatform(const SDL_Rect& temprect, int* px, int* py)
return false; return false;
} }
bool entityclass::checkblocks(const SDL_Rect& temprect, const float dx, const float dy, const float dr, const bool skipdirblocks) bool entityclass::checkblocks(const SDL_Rect& temprect, const float dx, const float dy, const int dr, const bool skipdirblocks)
{ {
for (size_t i = 0; i < blocks.size(); i++) for (size_t i = 0; i < blocks.size(); i++)
{ {
@ -4137,7 +4137,7 @@ bool entityclass::checkblocks(const SDL_Rect& temprect, const float dx, const fl
return false; return false;
} }
bool entityclass::checkwall(const bool invincible, const SDL_Rect& temprect, const float dx, const float dy, const float dr, const bool skipblocks, const bool skipdirblocks) bool entityclass::checkwall(const bool invincible, const SDL_Rect& temprect, const float dx, const float dy, const int dr, const bool skipblocks, const bool skipdirblocks)
{ {
//Returns true if entity setup in temprect collides with a wall //Returns true if entity setup in temprect collides with a wall
if(skipblocks) if(skipblocks)
@ -4445,7 +4445,7 @@ bool entityclass::testwallsx( int t, int tx, int ty, const bool skipdirblocks )
float dx = 0; float dx = 0;
float dy = 0; float dy = 0;
if (entities[t].rule == 0) dx = entities[t].vx; if (entities[t].rule == 0) dx = entities[t].vx;
float dr = entities[t].rule; int dr = entities[t].rule;
const bool invincible = map.invincibility && entities[t].ishumanoid(); const bool invincible = map.invincibility && entities[t].ishumanoid();
@ -4492,7 +4492,7 @@ bool entityclass::testwallsy( int t, float tx, float ty )
float dx = 0; float dx = 0;
float dy = 0; float dy = 0;
if (entities[t].rule == 0) dy = entities[t].vy; if (entities[t].rule == 0) dy = entities[t].vy;
float dr = entities[t].rule; int dr = entities[t].rule;
const bool invincible = map.invincibility && entities[t].ishumanoid(); const bool invincible = map.invincibility && entities[t].ishumanoid();

4
desktop_version/src/Entity.h
View file

@ -125,11 +125,11 @@ public:
bool checkplatform(const SDL_Rect& temprect, int* px, int* py); bool checkplatform(const SDL_Rect& temprect, int* px, int* py);
bool checkblocks(const SDL_Rect& temprect, float dx, float dy, float dr, bool skipdirblocks); bool checkblocks(const SDL_Rect& temprect, float dx, float dy, int dr, bool skipdirblocks);
bool checktowerspikes(int t); bool checktowerspikes(int t);
bool checkwall(bool invincible, const SDL_Rect& temprect, float dx, float dy, float dr, bool skipblocks, bool skipdirblocks); bool checkwall(bool invincible, const SDL_Rect& temprect, float dx, float dy, int dr, bool skipblocks, bool skipdirblocks);
bool checkwall(bool invincible, const SDL_Rect& temprect); bool checkwall(bool invincible, const SDL_Rect& temprect);
float hplatformat(int px, int py); float hplatformat(int px, int py);