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

Remove unused arguments from Graphics::drawtile()

Browse source 
The 'r', 'g', and 'b' arguments do absolutely nothing, even though
they're used in the version of Graphics::drawtile() that's more used. So
delete the other version without those extra arguments, and then remove
the extra arguments from the remaining version. And then update callers.
This commit is contained in:
Misa 2020-04-01 15:42:22 -07:00 committed by Ethan Lee
parent af8d7345c9
commit 5c60b8df5f
3 changed files with 25 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
desktop_version/src/Graphics.cpp
View file

@ -556,7 +556,7 @@ void Graphics::drawsprite( int x, int y, int t, int r, int g, int b )
BlitSurfaceColoured(sprites[t], NULL, backBuffer, &rect, ct); BlitSurfaceColoured(sprites[t], NULL, backBuffer, &rect, ct);
} }
void Graphics::drawtile( int x, int y, int t, int r, int g, int b ) void Graphics::drawtile( int x, int y, int t )
{ {
SDL_Rect rect = { Sint16(x), Sint16(y), tiles_rect.w, tiles_rect.h }; SDL_Rect rect = { Sint16(x), Sint16(y), tiles_rect.w, tiles_rect.h };
BlitSurfaceStandard(tiles[t], NULL, backBuffer, &rect); BlitSurfaceStandard(tiles[t], NULL, backBuffer, &rect);
@ -3198,13 +3198,6 @@ void Graphics::setcolreal(Uint32 t)
ct.colour = t; ct.colour = t;
} }
void Graphics::drawtile(int x, int y, int t)
{
SDL_Rect drawRect;
setRect(drawRect,x,y, tiles_rect.w, tiles_rect.h );
BlitSurfaceStandard(tiles[t] ,NULL, backBuffer,&drawRect);
}
void Graphics::drawforetile(int x, int y, int t) void Graphics::drawforetile(int x, int y, int t)
{ {
//frontbuffer.copyPixels(tiles[t], tiles_rect, tpoint); //frontbuffer.copyPixels(tiles[t], tiles_rect, tpoint);

4
desktop_version/src/Graphics.h
View file

@ -162,12 +162,10 @@ public:
void drawtile3( int x, int y, int t, int off ); void drawtile3( int x, int y, int t, int off );
void drawentcolours( int x, int y, int t); void drawentcolours( int x, int y, int t);
void drawtile2( int x, int y, int t, int r, int g, int b ); void drawtile2( int x, int y, int t, int r, int g, int b );
void drawtile( int x, int y, int t, int r, int g, int b ); void drawtile( int x, int y, int t );
void drawtowertile( int x, int y, int t ); void drawtowertile( int x, int y, int t );
void drawtowertile3( int x, int y, int t, int off ); void drawtowertile3( int x, int y, int t, int off );
void drawtile(int x, int y, int t);
void drawmap(); void drawmap();
void drawforetile(int x, int y, int t); void drawforetile(int x, int y, int t);

46
desktop_version/src/editor.cpp
View file

@ -2301,7 +2301,7 @@ void editorrender()
for (int i = 0; i < 40; i++) for (int i = 0; i < 40; i++)
{ {
temp=ed.contents[i + (ed.levx*40) + ed.vmult[j+(ed.levy*30)]]; temp=ed.contents[i + (ed.levx*40) + ed.vmult[j+(ed.levy*30)]];
if(temp>0) graphics.drawtile(i*8,j*8,temp,0,0,0); if(temp>0) graphics.drawtile(i*8,j*8,temp);
} }
} }
} }
@ -2740,11 +2740,11 @@ void editorrender()
{ {
for(int i=0; i<40; i++) for(int i=0; i<40; i++)
{ {
graphics.drawtile(i*8,0-t2,(temp+1200+i)%1200,0,0,0); graphics.drawtile(i*8,0-t2,(temp+1200+i)%1200);
graphics.drawtile(i*8,8-t2,(temp+1200+40+i)%1200,0,0,0); graphics.drawtile(i*8,8-t2,(temp+1200+40+i)%1200);
graphics.drawtile(i*8,16-t2,(temp+1200+80+i)%1200,0,0,0); graphics.drawtile(i*8,16-t2,(temp+1200+80+i)%1200);
graphics.drawtile(i*8,24-t2,(temp+1200+120+i)%1200,0,0,0); graphics.drawtile(i*8,24-t2,(temp+1200+120+i)%1200);
graphics.drawtile(i*8,32-t2,(temp+1200+160+i)%1200,0,0,0); graphics.drawtile(i*8,32-t2,(temp+1200+160+i)%1200);
} }
} }
else else
@ -2772,7 +2772,7 @@ void editorrender()
if(ed.level[ed.levx+(ed.levy*ed.maxwidth)].tileset==0) if(ed.level[ed.levx+(ed.levy*ed.maxwidth)].tileset==0)
{ {
graphics.drawtile(45,45-t2,ed.dmtile,0,0,0); graphics.drawtile(45,45-t2,ed.dmtile);
} }
else else
{ {
@ -2788,7 +2788,7 @@ void editorrender()
if(ed.level[ed.levx+(ed.levy*ed.maxwidth)].tileset==0) if(ed.level[ed.levx+(ed.levy*ed.maxwidth)].tileset==0)
{ {
graphics.drawtile(45,12,ed.dmtile,0,0,0); graphics.drawtile(45,12,ed.dmtile);
} }
else else
{ {
@ -3179,19 +3179,19 @@ void editorrender()
} }
FillRect(graphics.backBuffer, 4+(ed.drawmode*tg), 209,20,20,graphics.getRGB(64,64,64)); FillRect(graphics.backBuffer, 4+(ed.drawmode*tg), 209,20,20,graphics.getRGB(64,64,64));
//0: //0:
graphics.drawtile(tx,ty,83,0,0,0); graphics.drawtile(tx,ty,83);
graphics.drawtile(tx+8,ty,83,0,0,0); graphics.drawtile(tx+8,ty,83);
graphics.drawtile(tx,ty+8,83,0,0,0); graphics.drawtile(tx,ty+8,83);
graphics.drawtile(tx+8,ty+8,83,0,0,0); graphics.drawtile(tx+8,ty+8,83);
//1: //1:
tx+=tg; tx+=tg;
graphics.drawtile(tx,ty,680,0,0,0); graphics.drawtile(tx,ty,680);
graphics.drawtile(tx+8,ty,680,0,0,0); graphics.drawtile(tx+8,ty,680);
graphics.drawtile(tx,ty+8,680,0,0,0); graphics.drawtile(tx,ty+8,680);
graphics.drawtile(tx+8,ty+8,680,0,0,0); graphics.drawtile(tx+8,ty+8,680);
//2: //2:
tx+=tg; tx+=tg;
graphics.drawtile(tx+4,ty+4,8,0,0,0); graphics.drawtile(tx+4,ty+4,8);
//3: //3:
tx+=tg; tx+=tg;
graphics.drawsprite(tx,ty,22,196,196,196); graphics.drawsprite(tx,ty,22,196,196,196);
@ -3200,16 +3200,16 @@ void editorrender()
graphics.drawsprite(tx,ty,21,196,196,196); graphics.drawsprite(tx,ty,21,196,196,196);
//5: //5:
tx+=tg; tx+=tg;
graphics.drawtile(tx,ty+4,3,0,0,0); graphics.drawtile(tx,ty+4,3);
graphics.drawtile(tx+8,ty+4,4,0,0,0); graphics.drawtile(tx+8,ty+4,4);
//6: //6:
tx+=tg; tx+=tg;
graphics.drawtile(tx,ty+4,24,0,0,0); graphics.drawtile(tx,ty+4,24);
graphics.drawtile(tx+8,ty+4,24,0,0,0); graphics.drawtile(tx+8,ty+4,24);
//7: //7:
tx+=tg; tx+=tg;
graphics.drawtile(tx,ty+4,1,0,0,0); graphics.drawtile(tx,ty+4,1);
graphics.drawtile(tx+8,ty+4,1,0,0,0); graphics.drawtile(tx+8,ty+4,1);
//8: //8:
tx+=tg; tx+=tg;
graphics.drawsprite(tx,ty,78+ed.entframe,196,196,196); graphics.drawsprite(tx,ty,78+ed.entframe,196,196,196);