mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-07-01 08:58:31 +02:00
Code Issues Releases Wiki Activity

Remove temporary indents from the last commit

Browse Source 
In the last commit, I removed having the flip mode conditional directly
inside the sprite-drawing code for each size type, which would reduce
the indentation one level. However, I opted to hold off un-indenting
until this commit, otherwise it would've produced too much noise.
This commit is contained in:
Misa 2020-04-25 19:50:09 -07:00 committed by Ethan Lee
parent 8536185661
commit 3f46a0a2e9
1 changed files with 138 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

281
desktop_version/src/Graphics.cpp
View File

@ -1427,54 +1427,53 @@ void Graphics::drawentities()
if (obj.entities[i].size == 0) if (obj.entities[i].size == 0)
{ {
// Sprites // Sprites
// FIXME: Remove temporary indent here tpoint.x = obj.entities[i].xp;
tpoint.x = obj.entities[i].xp; tpoint.y = obj.entities[i].yp;
tpoint.y = obj.entities[i].yp; setcol(obj.entities[i].colour);
setcol(obj.entities[i].colour);
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct); BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
if (map.warpx) if (map.warpx)
{
//screenwrapping!
if (tpoint.x < 0)
{ {
//screenwrapping! tpoint.x += 320;
if (tpoint.x < 0) drawRect = sprites_rect;
{ drawRect.x += tpoint.x;
tpoint.x += 320; drawRect.y += tpoint.y;
drawRect = sprites_rect; BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
}
if (tpoint.x > 300)
{
tpoint.x -= 320;
drawRect = sprites_rect;
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
}
} }
else if (map.warpy) if (tpoint.x > 300)
{ {
if (tpoint.y < 0) tpoint.x -= 320;
{ drawRect = sprites_rect;
tpoint.y += 230; drawRect.x += tpoint.x;
drawRect = sprites_rect; drawRect.y += tpoint.y;
drawRect.x += tpoint.x; BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
}
if (tpoint.y > 210)
{
tpoint.y -= 230;
drawRect = sprites_rect;
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
}
} }
}
else if (map.warpy)
{
if (tpoint.y < 0)
{
tpoint.y += 230;
drawRect = sprites_rect;
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
}
if (tpoint.y > 210)
{
tpoint.y -= 230;
drawRect = sprites_rect;
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
}
}
} }
else if (obj.entities[i].size == 1) else if (obj.entities[i].size == 1)
{ {
@ -1549,61 +1548,59 @@ void Graphics::drawentities()
} }
else if (obj.entities[i].size == 9) // Really Big Sprite! (2x2) else if (obj.entities[i].size == 9) // Really Big Sprite! (2x2)
{ {
// FIXME: Remove temporary indent here setcol(obj.entities[i].colour);
setcol(obj.entities[i].colour);
tpoint.x = obj.entities[i].xp; tpoint.x = obj.entities[i].xp;
tpoint.y = obj.entities[i].yp; tpoint.y = obj.entities[i].yp;
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct); BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
tpoint.x = obj.entities[i].xp+32; tpoint.x = obj.entities[i].xp+32;
tpoint.y = obj.entities[i].yp; tpoint.y = obj.entities[i].yp;
// //
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe+1],NULL, backBuffer, &drawRect, ct); BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe+1],NULL, backBuffer, &drawRect, ct);
tpoint.x = obj.entities[i].xp; tpoint.x = obj.entities[i].xp;
tpoint.y = obj.entities[i].yp+32; tpoint.y = obj.entities[i].yp+32;
// //
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe+12],NULL, backBuffer, &drawRect, ct); BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe+12],NULL, backBuffer, &drawRect, ct);
tpoint.x = obj.entities[i].xp+32; tpoint.x = obj.entities[i].xp+32;
tpoint.y = obj.entities[i].yp+32; tpoint.y = obj.entities[i].yp+32;
// //
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe + 13],NULL, backBuffer, &drawRect, ct); BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe + 13],NULL, backBuffer, &drawRect, ct);
} }
else if (obj.entities[i].size == 10) // 2x1 Sprite else if (obj.entities[i].size == 10) // 2x1 Sprite
{ {
// FIXME: Remove temporary indent here setcol(obj.entities[i].colour);
setcol(obj.entities[i].colour);
tpoint.x = obj.entities[i].xp; tpoint.x = obj.entities[i].xp;
tpoint.y = obj.entities[i].yp; tpoint.y = obj.entities[i].yp;
// //
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct); BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
tpoint.x = obj.entities[i].xp+32; tpoint.x = obj.entities[i].xp+32;
tpoint.y = obj.entities[i].yp; tpoint.y = obj.entities[i].yp;
// //
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe+1],NULL, backBuffer, &drawRect, ct); BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe+1],NULL, backBuffer, &drawRect, ct);
} }
else if (obj.entities[i].size == 11) //The fucking elephant else if (obj.entities[i].size == 11) //The fucking elephant
{ {
@ -1612,72 +1609,70 @@ void Graphics::drawentities()
} }
else if (obj.entities[i].size == 12) // Regular sprites that don't wrap else if (obj.entities[i].size == 12) // Regular sprites that don't wrap
{ {
// FIXME: Remove temporary indent here tpoint.x = obj.entities[i].xp;
tpoint.x = obj.entities[i].xp; tpoint.y = obj.entities[i].yp;
tpoint.y = obj.entities[i].yp; setcol(obj.entities[i].colour);
setcol(obj.entities[i].colour); //
// drawRect = sprites_rect;
drawRect = sprites_rect; drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct);
//if we're outside the screen, we need to draw indicators
if (obj.entities[i].xp < -20 && obj.entities[i].vx > 0)
{
if (obj.entities[i].xp < -100)
{
tpoint.x = -5 + (int(( -obj.entities[i].xp) / 10));
}
else
{
tpoint.x = 5;
}
tpoint.y = tpoint.y+4;
setcol(23);
drawRect = tiles_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
BlitSurfaceColoured((*spritesvec)[obj.entities[i].drawframe],NULL, backBuffer, &drawRect, ct); BlitSurfaceColoured(tiles[1167],NULL, backBuffer, &drawRect, ct);
}
//if we're outside the screen, we need to draw indicators else if (obj.entities[i].xp > 340 && obj.entities[i].vx < 0)
{
if (obj.entities[i].xp < -20 && obj.entities[i].vx > 0) if (obj.entities[i].xp > 420)
{ {
if (obj.entities[i].xp < -100) tpoint.x = 320 - (int(( obj.entities[i].xp-320) / 10));
{
tpoint.x = -5 + (int(( -obj.entities[i].xp) / 10));
}
else
{
tpoint.x = 5;
}
tpoint.y = tpoint.y+4;
setcol(23);
drawRect = tiles_rect;
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
BlitSurfaceColoured(tiles[1167],NULL, backBuffer, &drawRect, ct);
} }
else if (obj.entities[i].xp > 340 && obj.entities[i].vx < 0) else
{ {
if (obj.entities[i].xp > 420) tpoint.x = 310;
{
tpoint.x = 320 - (int(( obj.entities[i].xp-320) / 10));
}
else
{
tpoint.x = 310;
}
tpoint.y = tpoint.y+4;
setcol(23);
//
drawRect = tiles_rect;
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
BlitSurfaceColoured(tiles[1166],NULL, backBuffer, &drawRect, ct);
} }
tpoint.y = tpoint.y+4;
setcol(23);
//
drawRect = tiles_rect;
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
BlitSurfaceColoured(tiles[1166],NULL, backBuffer, &drawRect, ct);
}
} }
else if (obj.entities[i].size == 13) else if (obj.entities[i].size == 13)
{ {
//Special for epilogue: huge hero! //Special for epilogue: huge hero!
// FIXME: Remove temporary indent here tpoint.x = obj.entities[i].xp; tpoint.y = obj.entities[i].yp;
tpoint.x = obj.entities[i].xp; tpoint.y = obj.entities[i].yp; setcol(obj.entities[i].colour);
setcol(obj.entities[i].colour); SDL_Rect drawRect = {Sint16(obj.entities[i].xp ), Sint16(obj.entities[i].yp), Sint16(sprites_rect.x * 6), Sint16(sprites_rect.y * 6 ) };
SDL_Rect drawRect = {Sint16(obj.entities[i].xp ), Sint16(obj.entities[i].yp), Sint16(sprites_rect.x * 6), Sint16(sprites_rect.y * 6 ) }; SDL_Surface* TempSurface = ScaleSurface( (*spritesvec)[obj.entities[i].drawframe], 6 * sprites_rect.w,6* sprites_rect.h );
SDL_Surface* TempSurface = ScaleSurface( (*spritesvec)[obj.entities[i].drawframe], 6 * sprites_rect.w,6* sprites_rect.h ); BlitSurfaceColoured(TempSurface, NULL , backBuffer, &drawRect, ct );
BlitSurfaceColoured(TempSurface, NULL , backBuffer, &drawRect, ct ); SDL_FreeSurface(TempSurface);
SDL_FreeSurface(TempSurface);