Rev 8664 | Rev 9124 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 8664 | Rev 9097 | ||
---|---|---|---|
Line 25... | Line 25... | ||
25 | 25 | ||
26 | extern byte signon[]; |
26 | extern byte signon[]; |
27 | extern void kolibri_set_win_center(); |
27 | extern void kolibri_set_win_center(); |
28 | extern char* dirname(char* path); |
28 | extern char* dirname(char* path); |
- | 29 | extern void setcwd(char* path); |
|
- | 30 | extern "C"{ |
|
- | 31 | extern void uSDL_StartTicks(void); |
|
29 | extern void setcwd(char* path); |
32 | } |
30 | /* |
33 | /* |
Line 31... | Line 34... | ||
31 | ============================================================================= |
34 | ============================================================================= |
Line 1124... | Line 1127... | ||
1124 | 1127 | ||
Line 1125... | Line 1128... | ||
1125 | MenuFadeOut(); |
1128 | MenuFadeOut(); |
1126 | 1129 | ||
1127 | #ifndef SPEAR |
1130 | #ifndef SPEAR |
1128 | #ifndef UPLOAD |
1131 | #ifndef UPLOAD |
1129 | start = ((SDL_GetTicks()/10)%3)*6; |
1132 | start = (( uSDL_GetTicks()/10)%3)*6; |
1130 | #else |
1133 | #else |
1131 | start = 0; |
1134 | start = 0; |
1132 | #endif |
1135 | #endif |
Line 1215... | Line 1218... | ||
1215 | if(SDL_Init(SDL_INIT_VIDEO) < 0) |
1218 | if(SDL_Init(SDL_INIT_VIDEO) < 0) |
1216 | { |
1219 | { |
1217 | printf("Unable to init SDL: %s\n", SDL_GetError()); |
1220 | printf("Unable to init SDL: %s\n", SDL_GetError()); |
1218 | exit(1); |
1221 | exit(1); |
1219 | } |
1222 | } |
- | 1223 | #ifdef _KOLIBRI |
|
- | 1224 | uSDL_StartTicks(); |
|
- | 1225 | #endif |
|
1220 | SDL_AudioInit(NULL); |
1226 | SDL_AudioInit(NULL); |
1221 | atexit(SDL_Quit); |
1227 | atexit(SDL_Quit); |
Line 1222... | Line 1228... | ||
1222 | 1228 | ||
1223 | int numJoysticks = SDL_NumJoysticks(); |
1229 | int numJoysticks = SDL_NumJoysticks(); |
Line 1904... | Line 1910... | ||
1904 | " --normal Sets the difficulty to normal for tedlevel\n" |
1910 | " --normal Sets the difficulty to normal for tedlevel\n" |
1905 | " --hard Sets the difficulty to hard for tedlevel\n" |
1911 | " --hard Sets the difficulty to hard for tedlevel\n" |
1906 | " --nowait Skips intro screens\n" |
1912 | " --nowait Skips intro screens\n" |
1907 | #ifndef _KOLIBRI |
1913 | #ifndef _KOLIBRI |
1908 | " --windowed[-mouse] Starts the game in a window [and grabs mouse]\n" |
1914 | " --windowed[-mouse] Starts the game in a window [and grabs mouse]\n" |
1909 | " --res |
- | |
1910 | #endif |
1915 | #endif |
- | 1916 | " --res |
|
1911 | " (must be multiple of 320x200 or 320x240)\n" |
1917 | " (must be multiple of 320x200 or 320x240)\n" |
1912 | " --resf |
1918 | " --resf |
1913 | " (which may result in graphic errors)\n" |
1919 | " (which may result in graphic errors)\n" |
1914 | " --bits Sets the screen color depth\n" |
1920 | " --bits Sets the screen color depth\n" |
1915 | " (use this when you have palette/fading problems\n" |
1921 | " (use this when you have palette/fading problems\n" |
1916 | " allowed: 8, 16, 24, 32, default: \"best\" depth)\n" |
1922 | " allowed: 8, 16, 24, 32, default: \"best\" depth)\n" |
1917 | " --nodblbuf Don't use SDL's double buffering\n" |
1923 | " --nodblbuf Don't use SDL's double buffering\n" |
1918 | " --extravbls |
1924 | " --extravbls |
1919 | " reduce flickering (unit is currently 8 ms, default: 0)\n" |
1925 | " reduce flickering (unit is currently 8 ms, default: 2)\n" |
1920 | #ifndef _KOLIBRI |
1926 | #ifndef _KOLIBRI |
1921 | " --joystick |
1927 | " --joystick |
1922 | " (-1 to disable joystick, default: 0)\n" |
1928 | " (-1 to disable joystick, default: 0)\n" |
1923 | " --joystickhat |
1929 | " --joystickhat |
1924 | #endif |
1930 | #endif |