commit 8ff26872

sago007 · 2016-03-25 09:46
8ff26872c5f85c7142a7ccc77af12b8163ce2552 patch · browse files
parent c98e567ed37e9e1e0349eead32295706b8f78161

Added a lot of initializers. Makes surprises less likely.

Changed files

M	source/code/MenuSystem.h before
M	source/code/ReadKeyboard.h before
M	source/code/common.h before

diff --git a/source/code/MenuSystem.h b/source/code/MenuSystem.h index 767069b..5da18c9 100644 --- a/source/code/MenuSystem.h +++ b/source/code/MenuSystem.h

@@ -36,14 +36,14 @@ http://blockattack.net

struct ButtonGfx

{

//Holds the graphic for a button that is selected

- sago::SagoSprite* marked;

+ sago::SagoSprite* marked = nullptr;

//Holds the graphic for a button that is not selected

- sago::SagoSprite* unmarked;

+ sago::SagoSprite* unmarked = nullptr;

//The size of the buttons, so we don't have to ask w and h from the SDL Surfaces each time

- int xsize;

- int ysize;

+ int xsize = 0;

+ int ysize = 0;

//A TTFont used for writing the label on the buttons

- NFont* thefont;

+ NFont* thefont = nullptr;

void setSurfaces(sago::SagoSprite* marked, sago::SagoSprite* unmarked);

};

@@ -59,9 +59,9 @@ private:

void (*action)(Button *b);

//If true the menu should also be closed then the button is clicked

- bool popOnRun;

+ bool popOnRun = false;

- ButtonGfx *gfx;

+ ButtonGfx *gfx = nullptr;

public:

//Is the button marked?

@@ -98,13 +98,11 @@ class Menu

private:

std::vector<Button*> buttons; //Vector holder the buttons

Button exit; //The exit button is special since it does not have a callback function

- bool isSubmenu; //True if the menu is a submenu

- int marked; //The index of the marked button (for keyboard up/down)

+ bool isSubmenu = false; //True if the menu is a submenu

+ int marked = 0; //The index of the marked button (for keyboard up/down)

bool running = true; //The menu is running. The menu will terminate then this is false

- SDL_Renderer *screen; //Pointer to the screen to draw to

+ SDL_Renderer *screen = nullptr; //Pointer to the screen to draw to

std::string title;

-// SDL_Surface *background; //Pointer to the background image

void drawSelf(); //Private function to draw the screen

void placeButtons(); //Rearanges the buttons to the correct place.

public:

@@ -126,7 +124,7 @@ class FileMenu

private:

std::string pm_path;

std::string pm_fileending;

- bool pm_hidden_files;

+ bool pm_hidden_files = false;

public:

FileMenu(const std::string& path, const std::string& fileending, bool hidden_files = false);

diff --git a/source/code/ReadKeyboard.h b/source/code/ReadKeyboard.h index e9f44d5..ac4510b 100644 --- a/source/code/ReadKeyboard.h +++ b/source/code/ReadKeyboard.h

@@ -34,7 +34,7 @@ Added to project 5/11-2004

class ReadKeyboard

{

private:

- int maxLength;

+ int maxLength = 0;

std::string::iterator position;

std::string text_string;

void putchar(const std::string& );

diff --git a/source/code/common.h b/source/code/common.h index cd5d48b..330d858 100644 --- a/source/code/common.h +++ b/source/code/common.h

@@ -42,10 +42,10 @@ http://www.blockattack.net

struct commonTime

{

- unsigned int days;

- unsigned int hours;

- unsigned int minutes;

- unsigned int seconds;

+ unsigned int days = 0;

+ unsigned int hours = 0;

+ unsigned int minutes = 0;

+ unsigned int seconds = 0;

};

std::string itoa(int num) __attribute__((const));

@@ -119,7 +119,7 @@ private:

void load();

/* tells if the user has requested a shutdown */

- long shuttingDown;

+ long shuttingDown = 0;

protected:

Config();