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

Remove unused arguments from Graphics::Hitest()

Browse source 
The two arguments 'col' and 'col2', both the only integer arguments of
the function, do absolutely nothing. Remove those and update callers.
This commit is contained in:
Misa 2020-04-01 15:35:27 -07:00 committed by Ethan Lee
parent 7abf40881a
commit af8d7345c9
3 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

@ -5274,7 +5274,7 @@ void entityclass::entitycollisioncheck()
if (graphics.flipmode) if (graphics.flipmode)
{ {
if (graphics.Hitest(graphics.flipsprites[entities[i].drawframe], if (graphics.Hitest(graphics.flipsprites[entities[i].drawframe],
colpoint1, 1, graphics.flipsprites[entities[j].drawframe], colpoint2, 1)) colpoint1, graphics.flipsprites[entities[j].drawframe], colpoint2))
{ {
//Do the collision stuff //Do the collision stuff
game.deathseq = 30; game.deathseq = 30;
@ -5283,7 +5283,7 @@ void entityclass::entitycollisioncheck()
else else
{ {
if (graphics.Hitest(graphics.sprites[entities[i].drawframe], if (graphics.Hitest(graphics.sprites[entities[i].drawframe],
colpoint1, 1, graphics.sprites[entities[j].drawframe], colpoint2, 1) ) colpoint1, graphics.sprites[entities[j].drawframe], colpoint2) )
{ {
//Do the collision stuff //Do the collision stuff
game.deathseq = 30; game.deathseq = 30;
@ -5402,7 +5402,7 @@ void entityclass::entitycollisioncheck()
if (graphics.flipmode) if (graphics.flipmode)
{ {
if (graphics.Hitest(graphics.flipsprites[entities[i].drawframe], if (graphics.Hitest(graphics.flipsprites[entities[i].drawframe],
colpoint1, 1, graphics.flipsprites[entities[j].drawframe], colpoint2, 1)) colpoint1, graphics.flipsprites[entities[j].drawframe], colpoint2))
{ {
//Do the collision stuff //Do the collision stuff
game.deathseq = 30; game.deathseq = 30;
@ -5412,7 +5412,7 @@ void entityclass::entitycollisioncheck()
else else
{ {
if (graphics.Hitest(graphics.sprites[entities[i].drawframe], if (graphics.Hitest(graphics.sprites[entities[i].drawframe],
colpoint1, 1, graphics.sprites[entities[j].drawframe], colpoint2, 1)) colpoint1, graphics.sprites[entities[j].drawframe], colpoint2))
{ {
//Do the collision stuff //Do the collision stuff
game.deathseq = 30; game.deathseq = 30;

2
desktop_version/src/Graphics.cpp
View file

@ -1253,7 +1253,7 @@ void Graphics::drawcoloredtile( int x, int y, int t, int r, int g, int b )
} }
bool Graphics::Hitest(SDL_Surface* surface1, point p1, int col, SDL_Surface* surface2, point p2, int col2) bool Graphics::Hitest(SDL_Surface* surface1, point p1, SDL_Surface* surface2, point p2)
{ {
//find rectangle where they intersect: //find rectangle where they intersect:

2
desktop_version/src/Graphics.h
View file

@ -132,7 +132,7 @@ public:
void render(); void render();
bool Hitest(SDL_Surface* surface1, point p1, int col, SDL_Surface* surface2, point p2, int col2); bool Hitest(SDL_Surface* surface1, point p1, SDL_Surface* surface2, point p2);
void drawentities(); void drawentities();