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

Turn fadebars into an array

Browse source 
There's always 15 of them, it doesn't need to be a vector.
This commit is contained in:
Misa 2020-07-03 02:40:57 -07:00 • committed by Ethan Lee
parent 78181bc676
commit 067fbc75f0
2 changed files with 6 additions and 6 deletions
desktop_version/src
Graphics.cppGraphics.h

10
desktop_version/src/Graphics.cpp
View file

@ -90,7 +90,7 @@ void Graphics::init()
resumegamemode = false; resumegamemode = false;
//Fading stuff //Fading stuff
fadebars.resize(15); SDL_memset(fadebars, 0, sizeof(fadebars));
fadeamount = 0; fadeamount = 0;
oldfadeamount = 0; oldfadeamount = 0;
@ -1231,14 +1231,14 @@ void Graphics::drawfade()
} }
else if(fademode==3) else if(fademode==3)
{ {
for (int i = 0; i < 15; i++) for (size_t i = 0; i < SDL_arraysize(fadebars); i++)
{ {
FillRect(backBuffer, fadebars[i], i * 16, usethisamount, 16, 0x000000 ); FillRect(backBuffer, fadebars[i], i * 16, usethisamount, 16, 0x000000 );
} }
} }
else if(fademode==5 ) else if(fademode==5 )
{ {
for (int i = 0; i < 15; i++) for (size_t i = 0; i < SDL_arraysize(fadebars); i++)
{ {
FillRect(backBuffer, fadebars[i]-usethisamount, i * 16, 500, 16, 0x000000 ); FillRect(backBuffer, fadebars[i]-usethisamount, i * 16, 500, 16, 0x000000 );
} }
@ -1254,7 +1254,7 @@ void Graphics::processfade()
if (fademode == 2) if (fademode == 2)
{ {
//prepare fade out //prepare fade out
for (int i = 0; i < 15; i++) for (size_t i = 0; i < SDL_arraysize(fadebars); i++)
{ {
fadebars[i] = -int(fRandom() * 12) * 8; fadebars[i] = -int(fRandom() * 12) * 8;
} }
@ -1272,7 +1272,7 @@ void Graphics::processfade()
else if (fademode == 4) else if (fademode == 4)
{ {
//prepare fade in //prepare fade in
for (int i = 0; i < 15; 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;
} }

2
desktop_version/src/Graphics.h
View file

@ -269,7 +269,7 @@ public:
int fademode; int fademode;
int fadeamount; int fadeamount;
int oldfadeamount; int oldfadeamount;
std::vector <int> fadebars; int fadebars[15];
bool trinketcolset; bool trinketcolset;
int trinketr, trinketg, trinketb; int trinketr, trinketg, trinketb;