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/util.cpp | |
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/util.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/games/sfcave-sdl/util.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/noncore/games/sfcave-sdl/util.cpp b/noncore/games/sfcave-sdl/util.cpp index 86738ad..f73e256 100644 --- a/noncore/games/sfcave-sdl/util.cpp +++ b/noncore/games/sfcave-sdl/util.cpp | |||
@@ -35,7 +35,7 @@ Uint32 getpixel(SDL_Surface *surface, int x, int y) | |||
35 | } | 35 | } |
36 | } | 36 | } |
37 | 37 | ||
38 | const char *chooseRandomFile( string path, string fileType ) | 38 | string chooseRandomFile( string path, string fileType ) |
39 | { | 39 | { |
40 | vector<string> files; | 40 | vector<string> files; |
41 | DIR *d = opendir( path.c_str() ); | 41 | DIR *d = opendir( path.c_str() ); |
@@ -50,15 +50,26 @@ const char *chooseRandomFile( string path, string fileType ) | |||
50 | // Rip extension from file | 50 | // Rip extension from file |
51 | int pos = file.find( ".", 1 ) + 1; | 51 | int pos = file.find( ".", 1 ) + 1; |
52 | string tmp = file.substr( pos ); | 52 | string tmp = file.substr( pos ); |
53 | printf( "pos = %d, tmp =%s\n", pos, tmp.c_str() ); | ||
54 | if ( tmp.size() > 0 && fileType.find( tmp ) != -1 ) | 53 | if ( tmp.size() > 0 && fileType.find( tmp ) != -1 ) |
55 | { | 54 | { |
56 | printf( "Matching <%s> - %s with <%s>\n", file.substr( pos ).c_str(), file.c_str(), fileType.c_str() ); | ||
57 | files.push_back( file ); | 55 | files.push_back( file ); |
58 | } | 56 | } |
59 | item = readdir( d ); | 57 | item = readdir( d ); |
60 | } | 58 | } |
61 | 59 | ||
62 | closedir( d ); | 60 | closedir( d ); |
63 | return files[nextInt( files.size() )].c_str(); | 61 | return files[nextInt( files.size() )]; |
62 | } | ||
63 | |||
64 | |||
65 | string getHomeDir() | ||
66 | { | ||
67 | string home; | ||
68 | #ifdef QWS | ||
69 | home = getenv( "HOME" ); | ||
70 | #else | ||
71 | home = "."; | ||
72 | #endif | ||
73 | |||
74 | return home; | ||
64 | } | 75 | } |