author | andyq <andyq> | 2003-01-21 20:37:00 (UTC) |
---|---|---|
committer | andyq <andyq> | 2003-01-21 20:37:00 (UTC) |
commit | 0a6563fcc2f49857c581d9def24407a3a4ef526c (patch) (unidiff) | |
tree | f1b82a4bd7582ef2cb722cffb87eecff1e1f96e6 /noncore/games/sfcave-sdl/sfcave.h | |
parent | 50b5915b48fc5cbacf23e4d2b75d7a266f141a4a (diff) | |
download | opie-0a6563fcc2f49857c581d9def24407a3a4ef526c.zip opie-0a6563fcc2f49857c581d9def24407a3a4ef526c.tar.gz opie-0a6563fcc2f49857c581d9def24407a3a4ef526c.tar.bz2 |
Clean up of code - fixed memory leaks (most of them) and added new custom config menu
Diffstat (limited to 'noncore/games/sfcave-sdl/sfcave.h') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/games/sfcave-sdl/sfcave.h | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/noncore/games/sfcave-sdl/sfcave.h b/noncore/games/sfcave-sdl/sfcave.h index 96c2334..c707919 100644 --- a/noncore/games/sfcave-sdl/sfcave.h +++ b/noncore/games/sfcave-sdl/sfcave.h | |||
@@ -12,13 +12,12 @@ class Help; | |||
12 | class SFCave | 12 | class SFCave |
13 | { | 13 | { |
14 | public: | 14 | public: |
15 | SFCave( int argc, char *argv[] ); | 15 | SFCave( int argc, char *argv[] ); |
16 | ~SFCave(); | 16 | ~SFCave(); |
17 | 17 | ||
18 | void drawGameScreen(); | ||
19 | void initSDL( int argc, char *argv[] ); | 18 | void initSDL( int argc, char *argv[] ); |
20 | void mainEventLoop(); | 19 | void mainEventLoop(); |
21 | 20 | ||
22 | void setCrashed( bool val ); | 21 | void setCrashed( bool val ); |
23 | void changeState( int s ); | 22 | void changeState( int s ); |
24 | int getState() { return state; } | 23 | int getState() { return state; } |
@@ -27,24 +26,47 @@ public: | |||
27 | bool showFPS() { return showFps; } | 26 | bool showFPS() { return showFps; } |
28 | 27 | ||
29 | void setMenuStatusText( string statusText ); | 28 | void setMenuStatusText( string statusText ); |
30 | 29 | ||
31 | void saveSetting( string key, string val ); | 30 | void saveSetting( string key, string val ); |
32 | void saveSetting( string key, int val ); | 31 | void saveSetting( string key, int val ); |
32 | void saveSetting( string key, long val ); | ||
33 | void saveSetting( string key, double val ); | ||
33 | string loadSetting( string key, string defaultVal = "" ); | 34 | string loadSetting( string key, string defaultVal = "" ); |
35 | bool loadBoolSetting( string key, bool defaultVal); | ||
36 | int loadIntSetting( string key, int defaultVal ); | ||
37 | double loadDoubleSetting( string key, double defaultVal ); | ||
38 | |||
34 | private: | 39 | private: |
35 | SDL_Surface *screen; | 40 | SDL_Surface *screen; |
41 | bool setupOK; | ||
36 | 42 | ||
37 | Game *currentGame; | 43 | Game *currentGame; |
38 | Menu *menu; | 44 | Menu *menu; |
39 | Help *help; | 45 | Help *help; |
40 | int state; | 46 | int state; |
41 | int maxFPS; | ||
42 | int actualFPS; | ||
43 | bool showFps; | 47 | bool showFps; |
44 | string musicPath; | 48 | string musicPath; |
45 | string musicType; | 49 | string musicType; |
50 | bool finish; | ||
51 | |||
52 | bool limitFPS; | ||
53 | int maxFPS; | ||
54 | int actualFPS; | ||
55 | int FPS; | ||
56 | long time1; | ||
57 | long start; | ||
58 | long end; | ||
59 | |||
60 | // This is used when the user is setting the custom | ||
61 | // values in the menu | ||
62 | int customPlayerMenuVal; | ||
63 | double origValue; | ||
46 | 64 | ||
47 | void handleMenuSelect( int menuId ); | 65 | void handleMenuSelect( int menuId ); |
66 | void handleGameState(); | ||
67 | void handleEvents(); | ||
68 | void calcFPS(); | ||
69 | void FPSDelay(); | ||
48 | }; | 70 | }; |
49 | 71 | ||
50 | #endif | 72 | #endif |