? apps/plugins/doom/NEW2i_video.c
? apps/plugins/doom/NEWi_video.c
? apps/plugins/doom/nohup.out
Index: apps/plugins/doom/g_game.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/doom/g_game.c,v
retrieving revision 1.3
diff -u -r1.3 g_game.c
--- apps/plugins/doom/g_game.c	16 Apr 2006 23:14:04 -0000	1.3
+++ apps/plugins/doom/g_game.c	17 Apr 2006 16:48:27 -0000
@@ -338,6 +338,10 @@
          cmd->angleturn -= angleturn[tspeed];
       if (joyxmove < 0)
          cmd->angleturn += angleturn[tspeed];
+      if (mousex > 0)
+         cmd->angleturn -= angleturn[tspeed];
+      if (mousex < 0)
+         cmd->angleturn += angleturn[tspeed];
    }
 
    if (gamekeydown[key_up])
@@ -511,7 +515,7 @@
          dclicks2 = 0;
          dclickstate2 = 0;
       }
-   forward += mousey;
+   //forward += mousey;
    if (strafe)
       side += mousex / 4;       /* mead  Don't want to strafe as fast as turns.*/
    else
Index: apps/plugins/doom/i_video.c
===================================================================
RCS file: /cvsroot/rockbox/apps/plugins/doom/i_video.c,v
retrieving revision 1.15
diff -u -r1.15 i_video.c
--- apps/plugins/doom/i_video.c	16 Apr 2006 23:14:04 -0000	1.15
+++ apps/plugins/doom/i_video.c	17 Apr 2006 16:48:27 -0000
@@ -112,11 +112,13 @@
 //
 
 #if CONFIG_KEYPAD == IPOD_4G_PAD
-//#define DOOMBUTTON_SCROLLWHEEL
+#define DOOMBUTTON_SCROLLWHEEL
+#define DOOMBUTTON_LEFT       BUTTON_SCROLL_BACK
+#define DOOMBUTTON_RIGHT      BUTTON_SCROLL_FWD
 #define DOOMBUTTON_UP         BUTTON_MENU
 #define DOOMBUTTON_WEAPON     BUTTON_SELECT
-#define DOOMBUTTON_LEFT       BUTTON_LEFT
-#define DOOMBUTTON_RIGHT      BUTTON_RIGHT
+#define DOOMBUTTON_S_LEFT     BUTTON_LEFT
+#define DOOMBUTTON_S_RIGHT    BUTTON_RIGHT
 #define DOOMBUTTON_SHOOT      BUTTON_PLAY
 #define DOOMBUTTON_ENTER      BUTTON_SELECT
 #define DOOMBUTTON_OPEN       BUTTON_MENU
@@ -176,7 +178,22 @@
    }
    holdbutton=rb->button_hold();
 #endif
-
+   /* use button_get(false) for clickwheel checks */
+   int button; /* move me */
+   button = rb->button_get(false);
+   if(button == DOOMBUTTON_LEFT) {
+         event.type = ev_mouse;
+         //event.data1=KEY_LEFTARROW;
+         event.data2=40;
+         D_PostEvent(&event);
+   }
+   if(button == DOOMBUTTON_RIGHT) {
+         event.type = ev_mouse;
+         //event.data1=KEY_LEFTARROW;
+         event.data2=-40;
+         D_PostEvent(&event);
+   }
+   
    newbuttonstate = rb->button_status();
    released = ~newbuttonstate & oldbuttonstate;
    pressed = newbuttonstate & ~oldbuttonstate;
@@ -241,12 +258,14 @@
    if(pressed)
    {
       event.type = ev_keydown;
-      if(pressed & DOOMBUTTON_LEFT)
+      if(pressed & DOOMBUTTON_S_LEFT)
       {
-         event.data1=KEY_LEFTARROW;
+         event.type = ev_mouse;
+         //event.data1=KEY_LEFTARROW;
+         event.data2=20;
          D_PostEvent(&event);
       }
-      if(pressed & DOOMBUTTON_RIGHT)
+      if(pressed & DOOMBUTTON_S_RIGHT)
       {
          event.data1=KEY_RIGHTARROW;
          D_PostEvent(&event);