1
0
mirror of git://projects.qi-hardware.com/openwrt-packages.git synced 2024-11-22 22:12:49 +02:00
openwrt-packages/freedroid/patches/001-screen-cursor-tab.patch
2010-08-01 20:37:27 +12:00

87 lines
3.0 KiB
Diff

diff -u /tmp/freedroid-1.0.2/src/defs.h ./src/defs.h
--- /tmp/freedroid-1.0.2/src/defs.h 2003-08-09 22:42:08.000000000 +1200
+++ ./src/defs.h 2010-07-28 22:57:36.000000000 +1200
@@ -43,6 +43,9 @@
#define DROID_ROTATION_TIME 3.0
#define NUM_DECAL_PICS 2
+// Don't want the mouse cursor at all on the NanoNote
+#define SDL_ShowCursor( visible) 1
+
#define UserCenter_x (User_Rect.x + User_Rect.w/2)
#define UserCenter_y (User_Rect.y + User_Rect.h/2)
@@ -72,11 +75,11 @@
#define RightPressed() (KeyIsPressed(SDLK_RIGHT)||KeyIsPressed('d'))
#define EscapePressed() KeyIsPressed(SDLK_ESCAPE)
-#define SpacePressed() KeyIsPressed(SDLK_SPACE)
+#define SpacePressed() KeyIsPressed(SDLK_TAB)
#define FirePressed() (SpacePressed()||MouseLeftPressed())
#define EscapePressedR() KeyIsPressedR (SDLK_ESCAPE)
-#define SpacePressedR() KeyIsPressedR (SDLK_SPACE)
+#define SpacePressedR() KeyIsPressedR (SDLK_TAB)
#define FirePressedR() (SpacePressedR()||MouseLeftPressedR())
#define UpPressedR() (KeyIsPressedR(SDLK_UP)||KeyIsPressedR('w'))
Only in ./src/: .deps
diff -u /tmp/freedroid-1.0.2/src/init.c ./src/init.c
--- /tmp/freedroid-1.0.2/src/init.c 2003-08-10 00:19:32.000000000 +1200
+++ ./src/init.c 2010-07-28 22:13:15.000000000 +1200
@@ -912,7 +912,7 @@
GameConfig.TakeoverActivates = TRUE;
GameConfig.ShowDecals = TRUE;
GameConfig.AllMapVisible = TRUE; // classic setting: map always visible
- GameConfig.scale = 1.0; // overall scaling of _all_ graphics (e.g. for 320x200 displays)
+ GameConfig.scale = 0.5; // overall scaling of _all_ graphics (e.g. for 320x200 displays)
// now load saved options from the config-file
LoadGameConfig ();
diff -u /tmp/freedroid-1.0.2/src/main.c ./src/main.c
--- /tmp/freedroid-1.0.2/src/main.c 2003-08-09 22:30:43.000000000 +1200
+++ ./src/main.c 2010-07-28 22:55:08.000000000 +1200
@@ -47,6 +47,7 @@
extern bool show_cursor;
void UpdateCountersForThisFrame (void);
+void turn_off_cursor();
/*-----------------------------------------------------------------
* @Desc: the heart of the Game
@@ -72,6 +73,8 @@
now = SDL_GetTicks();
InitFreedroid (argc, argv); // Initialisation of global variables and arrays
+ turn_off_cursor();
+
SDL_ShowCursor (SDL_DISABLE);
#ifdef __WIN32__
@@ -246,4 +249,11 @@
} /* UpdateCountersForThisFrame() */
+void turn_off_cursor()
+{
+ #undef SDL_ShowCursor
+ SDL_ShowCursor( SDL_DISABLE);
+}
+
+
#undef _main_c
Only in ./src/: Makefile
diff -u /tmp/freedroid-1.0.2/src/sound.c ./src/sound.c
--- /tmp/freedroid-1.0.2/src/sound.c 2003-08-09 03:09:20.000000000 +1200
+++ ./src/sound.c 2010-07-29 00:16:45.000000000 +1200
@@ -347,8 +347,7 @@
if ( Tmp_MOD_File == NULL )
{
DebugPrintf (0, "\nError loading sound-file: %s\n", filename_raw);
- DebugPrintf (0, "SDL Mixer Error: %s\n Continuing with sound disabled\n", Mix_GetError());
- sound_on = FALSE;
+ DebugPrintf (0, "SDL Mixer Error: %s\n", Mix_GetError());
return;
} // if ( !Loaded_WAV...
Mix_PlayMusic (Tmp_MOD_File, -1);