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

fix uninitialized member vars everywhere

Browse source 
also fix a spelling error of 'forground' in the graphics class buffer
This commit is contained in:
viri 2020-01-10 18:37:23 -06:00 committed by Ethan Lee
parent fb41d93835
commit 5829007bed
7 changed files with 58 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
desktop_version/src/BinaryBlob.cpp
View file

@ -19,6 +19,7 @@ binaryBlob::binaryBlob()
m_headers[i].name[j] = '\0';
}
}
::memset(m_headers, 0, 128 * sizeof(resourceheader));
}
#ifdef VVV_COMPILEMUSIC

42
desktop_version/src/Graphics.cpp
View file

@ -103,8 +103,30 @@ Graphics::Graphics()
fadeamount = 0;
fademode = 0;
// initialize everything else to zero
backBuffer = nullptr;
backboxrect = SDL_Rect{ 0, 0, 0, 0 };
bcol = 0;
bcol2 = 0;
ct = colourTransform{ 0 };
foot_rect = SDL_Rect{ 0, 0, 0, 0 };
foregrounddrawn = false;
foregroundBuffer = nullptr;
backgrounddrawn = false;
images_rect = SDL_Rect{ 0, 0, 0, 0 };
j = 0;
k = 0;
m = 0;
linedelay = 0;
menubuffer = nullptr;
screenbuffer = nullptr;
tempBuffer = nullptr;
tl = point{ 0, 0 };
towerbuffer = nullptr;
trinketr = 0;
trinketg = 0;
trinketb = 0;
warprect = SDL_Rect{ 0, 0, 0, 0 };
}
Graphics::~Graphics()
@ -2322,7 +2344,7 @@ void Graphics::drawmap( mapclass& map )
///TODO forground once;
if (!foregrounddrawn)
{
FillRect(forgroundBuffer, 0xDEADBEEF);
FillRect(foregroundBuffer, 0xDEADBEEF);
if(map.tileset==0)
{
for (j = 0; j < 29+map.extrarow; j++)
@ -2355,8 +2377,8 @@ void Graphics::drawmap( mapclass& map )
}
foregrounddrawn = true;
}
OverlaySurfaceKeyed(forgroundBuffer, backBuffer, 0xDEADBEEF);
//SDL_BlitSurface(forgroundBuffer, NULL, backBuffer, NULL);
OverlaySurfaceKeyed(foregroundBuffer, backBuffer, 0xDEADBEEF);
//SDL_BlitSurface(foregroundBuffer, NULL, backBuffer, NULL);
}
@ -2378,7 +2400,7 @@ void Graphics::drawfinalmap(mapclass & map)
}
if (!foregrounddrawn) {
FillRect(forgroundBuffer, 0xDEADBEEF);
FillRect(foregroundBuffer, 0xDEADBEEF);
if(map.tileset==0){
for (int j = 0; j < 29+map.extrarow; j++) {
for (int i = 0; i < 40; i++) {
@ -2397,7 +2419,7 @@ void Graphics::drawfinalmap(mapclass & map)
foregrounddrawn=true;
}
OverlaySurfaceKeyed(forgroundBuffer, backBuffer, 0xDEADBEEF);
OverlaySurfaceKeyed(foregroundBuffer, backBuffer, 0xDEADBEEF);
}
void Graphics::drawtowermap( mapclass& map )
@ -3156,7 +3178,7 @@ void Graphics::drawforetile(int x, int y, int t)
//frontbuffer.copyPixels(tiles[t], tiles_rect, tpoint);
SDL_Rect rect;
setRect(rect, x,y,tiles_rect.w, tiles_rect.h);
BlitSurfaceStandard(tiles[t],NULL, forgroundBuffer, &rect );
BlitSurfaceStandard(tiles[t],NULL, foregroundBuffer, &rect );
}
void Graphics::drawforetile2(int x, int y, int t)
@ -3164,14 +3186,14 @@ void Graphics::drawforetile2(int x, int y, int t)
//frontbuffer.copyPixels(tiles2[t], tiles_rect, tpoint);
SDL_Rect rect;
setRect(rect, x,y,tiles_rect.w, tiles_rect.h);
BlitSurfaceStandard(tiles2[t],NULL, forgroundBuffer, &rect );
BlitSurfaceStandard(tiles2[t],NULL, foregroundBuffer, &rect );
}
void Graphics::drawforetile3(int x, int y, int t, int off)
{
SDL_Rect rect;
setRect(rect, x,y,tiles_rect.w, tiles_rect.h);
BlitSurfaceStandard(tiles3[t+(off*30)],NULL, forgroundBuffer, &rect );
BlitSurfaceStandard(tiles3[t+(off*30)],NULL, foregroundBuffer, &rect );
//frontbuffer.copyPixels(tiles3[t+(off*30)], tiles_rect, tpoint);
}

2
desktop_version/src/Graphics.h
View file

@ -222,7 +222,7 @@ public:
Screen* screenbuffer;
SDL_Surface* menubuffer;
SDL_Surface* towerbuffer;
SDL_Surface* forgroundBuffer;
SDL_Surface* foregroundBuffer;
SDL_Surface* tempBuffer;
SDL_Rect bfont_rect;

10
desktop_version/src/Music.cpp
View file

@ -206,8 +206,14 @@ musicclass::musicclass()
FadeVolAmountPerFrame = 0;
custompd = false;
// currentsong = -1;
// nicefade = 0;
currentsong = 0;
musicfade = 0;
musicfadein = 0;
nicechange = 0;
nicefade = 0;
resumesong = 0;
volume = 0.0f;
}
void musicclass::play(int t)

12
desktop_version/src/Script.cpp
View file

@ -25,7 +25,17 @@ scriptclass::scriptclass()
scriptdelay = 0;
running = false;
b = 0;
g = 0;
i = 0;
j = 0;
k = 0;
loopcount = 0;
looppoint = 0;
r = 0;
textx = 0;
texty = 0;
txtnumlines = 0;
}
void scriptclass::clearcustom(){

3
desktop_version/src/UtilityClass.cpp
View file

@ -90,6 +90,9 @@ glow(0),
}
slowsine = 0;
globaltemp = 0;
temp = 0;
temp2 = 0;
}
std::string UtilityClass::String( int _v )

4
desktop_version/src/main.cpp
View file

@ -129,8 +129,8 @@ int main(int argc, char *argv[])
graphics.Makebfont();
graphics.forgroundBuffer = SDL_CreateRGBSurface(SDL_SWSURFACE ,320 ,240 ,fmt->BitsPerPixel,fmt->Rmask,fmt->Gmask,fmt->Bmask,fmt->Amask );
SDL_SetSurfaceBlendMode(graphics.forgroundBuffer, SDL_BLENDMODE_NONE);
graphics.foregroundBuffer = SDL_CreateRGBSurface(SDL_SWSURFACE ,320 ,240 ,fmt->BitsPerPixel,fmt->Rmask,fmt->Gmask,fmt->Bmask,fmt->Amask );
SDL_SetSurfaceBlendMode(graphics.foregroundBuffer, SDL_BLENDMODE_NONE);
graphics.screenbuffer = &gameScreen;