diff options
author | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-23 16:00:41 -0400 |
---|---|---|
committer | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-24 11:41:02 -0400 |
commit | a22caea21579cd15007a2c2167d233789a1e01fa (patch) | |
tree | 96a415826979769b7a00a75966df91b785b98b02 /crawl-ref/source/windowmanager-sdl.h | |
parent | 0f928518b4f7497c0108c1fcab0096c6c369cffb (diff) | |
download | crawl-ref-a22caea21579cd15007a2c2167d233789a1e01fa.tar.gz crawl-ref-a22caea21579cd15007a2c2167d233789a1e01fa.zip |
General coding standards update.
No spaces on parens. Line up function params. Sort includes more
rationally. Put curly braces on their own line. Don't C-style typedef
enum and structs. Put if-clauses on their own line.
Diffstat (limited to 'crawl-ref/source/windowmanager-sdl.h')
-rw-r--r-- | crawl-ref/source/windowmanager-sdl.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/crawl-ref/source/windowmanager-sdl.h b/crawl-ref/source/windowmanager-sdl.h index 5cb9508df7..b6ff045500 100644 --- a/crawl-ref/source/windowmanager-sdl.h +++ b/crawl-ref/source/windowmanager-sdl.h @@ -2,9 +2,10 @@ #define SDL_WINDOWMANAGER_H #ifdef USE_TILE +#ifdef USE_SDL + #include "windowmanager.h" -#ifdef USE_SDL struct SDL_Surface; struct SDL_VideoInfo; @@ -25,8 +26,8 @@ public: virtual int byte_order(); // System time functions - virtual void set_timer( unsigned int interval, - wm_timer_callback callback); + virtual void set_timer(unsigned int interval, + wm_timer_callback callback); virtual unsigned int get_ticks() const; virtual void delay(unsigned int ms); @@ -42,16 +43,16 @@ public: virtual int screen_height() const; // Texture loading - virtual bool load_texture( GenericTexture *tex, const char *filename, - MipMapOptions mip_opt, unsigned int &orig_width, - unsigned int &orig_height, - tex_proc_func proc = NULL, - bool force_power_of_two = true); + virtual bool load_texture(GenericTexture *tex, const char *filename, + MipMapOptions mip_opt, unsigned int &orig_width, + unsigned int &orig_height, + tex_proc_func proc = NULL, + bool force_power_of_two = true); protected: // Helper functions - SDL_Surface *load_image( const char *file ) const; - + SDL_Surface *load_image(const char *file) const; + SDL_Surface *m_context; const SDL_VideoInfo* video_info; }; |