Skip to content

Commit

Permalink
Apply a more conventional indent style.
Browse files Browse the repository at this point in the history
  • Loading branch information
lipk committed Jun 8, 2014
1 parent eea2f2d commit 91f00a4
Showing 1 changed file with 39 additions and 39 deletions.
78 changes: 39 additions & 39 deletions src/loadscreen.hpp
Expand Up @@ -22,16 +22,16 @@ class CVideo;
#include "sdl/utils.hpp"

class loadscreen {
public:
// Preferred constructor
explicit loadscreen(CVideo &screen, const int percent = 0);
// Keep default copy constructor
// Keep default copy assignment
// Destructor, dumps the counter values to stderr
~loadscreen()
{
dump_counters();
}
public:
// Preferred constructor
explicit loadscreen(CVideo &screen, const int percent = 0);
// Keep default copy constructor
// Keep default copy assignment
// Destructor, dumps the counter values to stderr
~loadscreen()
{
dump_counters();
}

/**
* Starts the stage with identifier @a id.
Expand All @@ -43,43 +43,43 @@ class loadscreen {
*/
static void increment_progress();

/** Function to draw a blank screen. */
void clear_screen();

/**
* A global loadscreen instance that can be used to avoid
* passing it on to functions that are many levels deep.
*/
static loadscreen *global_loadscreen;

struct global_loadscreen_manager {
explicit global_loadscreen_manager(CVideo& screen);
~global_loadscreen_manager();
static global_loadscreen_manager* get()
{ return manager; }
void reset();
private:
static global_loadscreen_manager* manager;
bool owns;
};
/** Function to draw a blank screen. */
void clear_screen();

/**
* A global loadscreen instance that can be used to avoid
* passing it on to functions that are many levels deep.
*/
static loadscreen *global_loadscreen;

struct global_loadscreen_manager {
explicit global_loadscreen_manager(CVideo& screen);
~global_loadscreen_manager();
static global_loadscreen_manager* get()
{ return manager; }
void reset();
private:
static global_loadscreen_manager* manager;
bool owns;
};
private:
/**
* Displays a load progress bar.
*/
void draw_screen(const std::string &text);

// Prohibit default constructor
loadscreen();
// Prohibit default constructor
loadscreen();

// Data members
CVideo &screen_;
SDL_Rect textarea_;
surface logo_surface_;
bool logo_drawn_;
int pby_offset_;
int prcnt_;
// Data members
CVideo &screen_;
SDL_Rect textarea_;
surface logo_surface_;
bool logo_drawn_;
int pby_offset_;
int prcnt_;

void dump_counters() const;
void dump_counters() const;
};

#endif

0 comments on commit 91f00a4

Please sign in to comment.