1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-08 18:09:45 +01:00

Some formatting fixes

This commit is contained in:
AllyTally 2023-05-22 16:06:50 -03:00 committed by Misa Elizabeth Kai
parent d93d773a8a
commit d1b9f4f410

View file

@ -1607,7 +1607,7 @@ void Graphics::processfade(void)
case FADE_START_FADEOUT: case FADE_START_FADEOUT:
for (size_t i = 0; i < SDL_arraysize(fadebars); i++) for (size_t i = 0; i < SDL_arraysize(fadebars); i++)
{ {
fadebars[i] = -int(fRandom() * 12) * 8; fadebars[i] = -(int)(fRandom() * 12) * 8;
} }
setfade(0); setfade(0);
fademode = FADE_FADING_OUT; fademode = FADE_FADING_OUT;
@ -1622,7 +1622,7 @@ void Graphics::processfade(void)
case FADE_START_FADEIN: case FADE_START_FADEIN:
for (size_t i = 0; i < SDL_arraysize(fadebars); i++) for (size_t i = 0; i < SDL_arraysize(fadebars); i++)
{ {
fadebars[i] = 320 + int(fRandom() * 12) * 8; fadebars[i] = 320 + (int)(fRandom() * 12) * 8;
} }
setfade(416); setfade(416);
fademode = FADE_FADING_IN; fademode = FADE_FADING_IN;
@ -2191,7 +2191,7 @@ void Graphics::drawentity(const int i, const int yoff)
tpoint.x = xp + 32; tpoint.x = xp + 32;
tpoint.y = yp - yoff; tpoint.y = yp - yoff;
//
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
@ -2200,7 +2200,7 @@ void Graphics::drawentity(const int i, const int yoff)
tpoint.x = xp; tpoint.x = xp;
tpoint.y = yp + 32 - yoff; tpoint.y = yp + 32 - yoff;
//
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
@ -2209,7 +2209,7 @@ void Graphics::drawentity(const int i, const int yoff)
tpoint.x = xp + 32; tpoint.x = xp + 32;
tpoint.y = yp + 32 - yoff; tpoint.y = yp + 32 - yoff;
//
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
@ -2223,7 +2223,7 @@ void Graphics::drawentity(const int i, const int yoff)
tpoint.x = xp; tpoint.x = xp;
tpoint.y = yp - yoff; tpoint.y = yp - yoff;
//
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
@ -2232,7 +2232,7 @@ void Graphics::drawentity(const int i, const int yoff)
tpoint.x = xp + 32; tpoint.x = xp + 32;
tpoint.y = yp - yoff; tpoint.y = yp - yoff;
//
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
@ -2248,7 +2248,7 @@ void Graphics::drawentity(const int i, const int yoff)
tpoint.x = xp; tpoint.x = xp;
tpoint.y = yp - yoff; tpoint.y = yp - yoff;
const SDL_Color ct = obj.entities[i].realcol; const SDL_Color ct = obj.entities[i].realcol;
//
drawRect = sprites_rect; drawRect = sprites_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
drawRect.y += tpoint.y; drawRect.y += tpoint.y;
@ -2261,7 +2261,7 @@ void Graphics::drawentity(const int i, const int yoff)
{ {
if (obj.entities[i].xp < -100) if (obj.entities[i].xp < -100)
{ {
tpoint.x = -5 + (int(( -xp) / 10)); tpoint.x = -5 + (int) (-xp / 10);
} }
else else
{ {
@ -2282,7 +2282,7 @@ void Graphics::drawentity(const int i, const int yoff)
{ {
if (obj.entities[i].xp > 420) if (obj.entities[i].xp > 420)
{ {
tpoint.x = 320 - (int(( xp-320) / 10)); tpoint.x = 320 - (int) ((xp - 320) / 10);
} }
else else
{ {
@ -2290,7 +2290,6 @@ void Graphics::drawentity(const int i, const int yoff)
} }
tpoint.y = tpoint.y+4; tpoint.y = tpoint.y+4;
//
drawRect = tiles_rect; drawRect = tiles_rect;
drawRect.x += tpoint.x; drawRect.x += tpoint.x;
@ -2476,8 +2475,8 @@ void Graphics::drawbackground( int t )
backboxrect.y = lerp(backboxes[i].y - backboxvy[i], backboxes[i].y); backboxrect.y = lerp(backboxes[i].y - backboxvy[i], backboxes[i].y);
fill_rect(&backboxrect, bcol); fill_rect(&backboxrect, bcol);
backboxrect.x += 1; backboxrect.x++;
backboxrect.y += 1; backboxrect.y++;
backboxrect.w -= 2; backboxrect.w -= 2;
backboxrect.h -= 2; backboxrect.h -= 2;
fill_rect(&backboxrect, bcol2); fill_rect(&backboxrect, bcol2);
@ -2610,7 +2609,6 @@ void Graphics::drawbackground( int t )
break; break;
default: default:
fill_rect(0, 0, 0); fill_rect(0, 0, 0);
break; break;
} }
} }
@ -2760,7 +2758,7 @@ void Graphics::updatebackground(int t)
case 5: case 5:
// Warp zone, central // Warp zone, central
backoffset += 1; backoffset++;
if (backoffset >= 16) if (backoffset >= 16)
{ {
backoffset -= 16; backoffset -= 16;