1 files changed, 45 insertions, 28 deletions
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index 6108f26efa..14137b28b7 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -50,7 +50,10 @@ Rockdoom options, you will need to quit your current game and restart the plugin
  \emph{Headsup Display} Show the player status when in fullscreen\\
  \emph{Statusbar Always Red} Disable color response statusbar%\\
-  \item[InGame Main Menu: ]This menu can only be accessed from within a running game, and is displayed by  \opt{h1xx,h300}{pressing \ButtonOff}\opt{IPOD_4G_PAD}{flipping your hold switch a couple of times}
+  \item[InGame Main Menu: ]This menu can only be accessed from within a running game, and is displayed by
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}
+    \opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your hold switch a couple of times}
+    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{pressing \ButtonPower}
  \emph{New Game } Start a new game\\
  \emph{Options } In game options\\
@@ -72,33 +75,47 @@ Rockdoom options, you will need to quit your current game and restart the plugin
 \subsubsection{Keys}
 \begin{table}
 \begin{btnmap}{}{}
-\opt{h1xx,h300}{\ButtonUp}
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
-\opt{ipod4g,ipodcolor,ipodvideo}{\ButtonMenu}
+  \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
-& Move Forward \\
+  \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
-\opt{h1xx,h300}{\ButtonDown}
+    & Move Forward \\
-\opt{ipod4g,ipodcolor,ipodvideo}{na}
+%
-& Down \\
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown & Down\\}
-\opt{h1xx,h300}{\ButtonLeft}
+  \opt{IRIVER_H10_PAD}{\ButtonScrollDown & Down\\}
-\opt{ipod4g,ipodcolor,ipodvideo}{\fixme{tbd}}
+%
-& Turn Left \\
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonLeft}
-\opt{h1xx,h300}{\ButtonRight}
+    & Turn Left \\
-\opt{ipod4g,ipodcolor,ipodvideo}{\fixme{tbd}}
+%
-& Turn Right \\
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonRight}
-\opt{h1xx,h300}{\ButtonRec}
+    & Turn Right \\
-\opt{ipod4g,ipodcolor,ipodvideo}{\ButtonPlay}
+%
-& Shoot \\
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-\opt{h1xx,h300}{\ButtonMode}
+  \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonPlay}
-\opt{ipod4g,ipodcolor,ipodvideo}{\ButtonMenu}
+  \opt{IAUDIO_X5_PAD}{\ButtonSelect}
-& Open \\
+  \opt{IRIVER_H10_PAD}{\ButtonRew}
-\opt{h1xx,h300}{\ButtonOff}
+    & Shoot \\
-\opt{ipod4g,ipodcolor,ipodvideo}{\fixme{Hold switch}}
+%
-& Escape \\
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-\opt{h1xx,h300}{\ButtonSelect}
+  \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
-\opt{ipod4g,ipodcolor,ipodvideo}{\fixme{tbd}}
+  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
-& Enter \\
+    & Open \\
-\opt{h1xx,h300}{\ButtonOn}
+%
-\opt{ipod4g,ipodcolor,ipodvideo}{\ButtonSelect}
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-& Change Weapon \\
+  \opt{IPOD_3G_PAD,IPOD_4G_PAD}{Hold switch}
+  \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPower}
+    & Escape \\
+%
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}
+    {\ButtonSelect}
+  \opt{IRIVER_H10_PAD}{\ButtonRew}
+    & Enter \\
+%
+  \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+  \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonSelect}
+  \opt{IAUDIO_X5_PAD}{\ButtonRec}
+  \opt{IRIVER_H10_PAD}{\ButtonFF}
+    & Change Weapon \\
+%
 \end{btnmap}
 \end{table}

diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex index 6108f26efa..14137b28b7 100644 --- a/manual/plugins/doom.tex +++ b/manual/plugins/doom.tex
@@ -50,7 +50,10 @@ Rockdoom options, you will need to quit your current game and restart the plugin
50	\emph{Headsup Display} Show the player status when in fullscreen\\	50	\emph{Headsup Display} Show the player status when in fullscreen\\
51	\emph{Statusbar Always Red} Disable color response statusbar%\\	51	\emph{Statusbar Always Red} Disable color response statusbar%\\
52		52
53	\item[InGame Main Menu: ]This menu can only be accessed from within a running game, and is displayed by \opt{h1xx,h300}{pressing \ButtonOff}\opt{IPOD_4G_PAD}{flipping your hold switch a couple of times}	53	\item[InGame Main Menu: ]This menu can only be accessed from within a running game, and is displayed by
		54	\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}
		55	\opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your hold switch a couple of times}
		56	\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{pressing \ButtonPower}
54		57
55	\emph{New Game } Start a new game\\	58	\emph{New Game } Start a new game\\
56	\emph{Options } In game options\\	59	\emph{Options } In game options\\
@@ -72,33 +75,47 @@ Rockdoom options, you will need to quit your current game and restart the plugin
72	\subsubsection{Keys}	75	\subsubsection{Keys}
73	\begin{table}	76	\begin{table}
74	\begin{btnmap}{}{}	77	\begin{btnmap}{}{}
75	\opt{h1xx,h300}{\ButtonUp}	78	\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
76	\opt{ipod4g,ipodcolor,ipodvideo}{\ButtonMenu}	79	\opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
77	& Move Forward \\	80	\opt{IRIVER_H10_PAD}{\ButtonScrollUp}
78	\opt{h1xx,h300}{\ButtonDown}	81	& Move Forward \\
79	\opt{ipod4g,ipodcolor,ipodvideo}{na}	82	%
80	& Down \\	83	\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown & Down\\}
81	\opt{h1xx,h300}{\ButtonLeft}	84	\opt{IRIVER_H10_PAD}{\ButtonScrollDown & Down\\}
82	\opt{ipod4g,ipodcolor,ipodvideo}{\fixme{tbd}}	85	%
83	& Turn Left \\	86	\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonLeft}
84	\opt{h1xx,h300}{\ButtonRight}	87	& Turn Left \\
85	\opt{ipod4g,ipodcolor,ipodvideo}{\fixme{tbd}}	88	%
86	& Turn Right \\	89	\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonRight}
87	\opt{h1xx,h300}{\ButtonRec}	90	& Turn Right \\
88	\opt{ipod4g,ipodcolor,ipodvideo}{\ButtonPlay}	91	%
89	& Shoot \\	92	\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
90	\opt{h1xx,h300}{\ButtonMode}	93	\opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonPlay}
91	\opt{ipod4g,ipodcolor,ipodvideo}{\ButtonMenu}	94	\opt{IAUDIO_X5_PAD}{\ButtonSelect}
92	& Open \\	95	\opt{IRIVER_H10_PAD}{\ButtonRew}
93	\opt{h1xx,h300}{\ButtonOff}	96	& Shoot \\
94	\opt{ipod4g,ipodcolor,ipodvideo}{\fixme{Hold switch}}	97	%
95	& Escape \\	98	\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
96	\opt{h1xx,h300}{\ButtonSelect}	99	\opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
97	\opt{ipod4g,ipodcolor,ipodvideo}{\fixme{tbd}}	100	\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
98	& Enter \\	101	& Open \\
99	\opt{h1xx,h300}{\ButtonOn}	102	%
100	\opt{ipod4g,ipodcolor,ipodvideo}{\ButtonSelect}	103	\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
101	& Change Weapon \\	104	\opt{IPOD_3G_PAD,IPOD_4G_PAD}{Hold switch}
		105	\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPower}
		106	& Escape \\
		107	%
		108	\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}
		109	{\ButtonSelect}
		110	\opt{IRIVER_H10_PAD}{\ButtonRew}
		111	& Enter \\
		112	%
		113	\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
		114	\opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonSelect}
		115	\opt{IAUDIO_X5_PAD}{\ButtonRec}
		116	\opt{IRIVER_H10_PAD}{\ButtonFF}
		117	& Change Weapon \\
		118	%
102	\end{btnmap}	119	\end{btnmap}
103	\end{table}	120	\end{table}
104		121