From 295c226ed507603a485e3524723f20741b9bdd7e Mon Sep 17 00:00:00 2001 From: Karl Kurbjun Date: Sun, 16 Apr 2006 23:14:04 +0000 Subject: Fix run so that it stays enabled across level loads. Removed some unused code and added some back in for hopeful future use. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9692 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/doom/g_game.c | 4 ++-- apps/plugins/doom/i_video.c | 7 +++++-- apps/plugins/doom/m_menu.c | 24 +++++++++++------------- 3 files changed, 18 insertions(+), 17 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/doom/g_game.c b/apps/plugins/doom/g_game.c index 1029dad7bb..7410e01bc7 100644 --- a/apps/plugins/doom/g_game.c +++ b/apps/plugins/doom/g_game.c @@ -744,8 +744,8 @@ boolean G_Responder (event_t* ev) mousebuttons[0] = ev->data1 & 1; mousebuttons[1] = ev->data1 & 2; mousebuttons[2] = ev->data1 & 4; -// mousex = ev->data2*(mouseSensitivity+5)/10; -// mousey = ev->data3*(mouseSensitivity+5)/10; + mousex = ev->data2*(mouseSensitivity+5)/10; + mousey = ev->data3*(mouseSensitivity+5)/10; return true; // eat events case ev_joystick: diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 2b00d8c288..a4db5f2672 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -16,7 +16,10 @@ * GNU General Public License for more details. * * $Log$ - * Revision 1.14 2006/04/15 22:08:36 kkurbjun + * Revision 1.15 2006/04/16 23:14:04 kkurbjun + * Fix run so that it stays enabled across level loads. Removed some unused code and added some back in for hopeful future use. + * + * Revision 1.14 2006-04-15 22:08:36 kkurbjun * Slight code cleanups, fixed sound parameter - now it saves. Old configurations will be reset. * * Revision 1.13 2006-04-06 21:31:49 kkurbjun @@ -167,7 +170,7 @@ inline void getkey() event.data1=KEY_ESCAPE; #else /* Enable run */ - event.data1=KEY_RSHIFT; + event.data1=KEY_CAPSLOCK; #endif D_PostEvent(&event); } diff --git a/apps/plugins/doom/m_menu.c b/apps/plugins/doom/m_menu.c index 2e1f8af9bf..415ca0852e 100644 --- a/apps/plugins/doom/m_menu.c +++ b/apps/plugins/doom/m_menu.c @@ -16,7 +16,10 @@ // GNU General Public License for more details. // // $Log$ -// Revision 1.5 2006/04/04 23:58:37 kkurbjun +// Revision 1.6 2006/04/16 23:14:04 kkurbjun +// Fix run so that it stays enabled across level loads. Removed some unused code and added some back in for hopeful future use. +// +// Revision 1.5 2006-04-04 23:58:37 kkurbjun // Make savegame strings more informative // // Revision 1.4 2006-04-04 23:13:50 kkurbjun @@ -1532,21 +1535,15 @@ boolean M_Responder (event_t* ev) */ // F-Keys if (!menuactive) - switch(ch) + { + if (ch == key_autorun) // Autorun // V { - case KEY_MINUS: // Screen size down - if ((automapmode & am_active) || chat_on) - return false; - M_SizeDisplay(0); - S_StartSound(NULL,sfx_stnmov); + autorun = !autorun; return true; + } - case KEY_EQUALS: // Screen size up - if ((automapmode & am_active) || chat_on) - return false; - M_SizeDisplay(1); - S_StartSound(NULL,sfx_stnmov); - return true; + switch(ch) + { /* case KEY_F1: // Help key M_StartControlPanel (); @@ -1571,6 +1568,7 @@ boolean M_Responder (event_t* ev) return true; */ } + } // Pop-up menu? -- cgit v1.2.3