diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2006-04-03 20:03:02 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2006-04-03 20:03:02 +0000 |
commit | 1123ab64cdcb9933916b3892cf01513b198561d8 (patch) | |
tree | 41575cbf3f04eb7af7dfc3553f89a97fcb678d8e /apps/plugins | |
parent | c48660005bc5e318ff5672afdf2728bda313a574 (diff) | |
download | rockbox-1123ab64cdcb9933916b3892cf01513b198561d8.tar.gz rockbox-1123ab64cdcb9933916b3892cf01513b198561d8.zip |
Updates doom menu w/ new graphics, now requires rockdoom.wad: http://alamode.mines.edu/~kkurbjun/rockdoom.wad
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9468 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/doom/i_video.c | 6 | ||||
-rw-r--r-- | apps/plugins/doom/m_menu.c | 13 | ||||
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 5 |
3 files changed, 16 insertions, 8 deletions
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 473f349b0c..b7bc5f99c4 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -16,7 +16,10 @@ | |||
16 | * GNU General Public License for more details. | 16 | * GNU General Public License for more details. |
17 | * | 17 | * |
18 | * $Log$ | 18 | * $Log$ |
19 | * Revision 1.8 2006/04/03 17:11:42 kkurbjun | 19 | * Revision 1.9 2006/04/03 20:03:02 kkurbjun |
20 | * Updates doom menu w/ new graphics, now requires rockdoom.wad: http://alamode.mines.edu/~kkurbjun/rockdoom.wad | ||
21 | * | ||
22 | * Revision 1.8 2006-04-03 17:11:42 kkurbjun | ||
20 | * Finishing touches | 23 | * Finishing touches |
21 | * | 24 | * |
22 | * Revision 1.7 2006-04-03 16:30:12 kkurbjun | 25 | * Revision 1.7 2006-04-03 16:30:12 kkurbjun |
@@ -83,6 +86,7 @@ void I_ShutdownGraphics(void) | |||
83 | #ifndef HAVE_LCD_COLOR | 86 | #ifndef HAVE_LCD_COLOR |
84 | gray_release(); | 87 | gray_release(); |
85 | #endif | 88 | #endif |
89 | noprintf=0; | ||
86 | } | 90 | } |
87 | 91 | ||
88 | // | 92 | // |
diff --git a/apps/plugins/doom/m_menu.c b/apps/plugins/doom/m_menu.c index d84717b642..580503778e 100644 --- a/apps/plugins/doom/m_menu.c +++ b/apps/plugins/doom/m_menu.c | |||
@@ -16,7 +16,10 @@ | |||
16 | // GNU General Public License for more details. | 16 | // GNU General Public License for more details. |
17 | // | 17 | // |
18 | // $Log$ | 18 | // $Log$ |
19 | // Revision 1.2 2006/04/03 00:28:13 kkurbjun | 19 | // Revision 1.3 2006/04/03 20:03:02 kkurbjun |
20 | // Updates doom menu w/ new graphics, now requires rockdoom.wad: http://alamode.mines.edu/~kkurbjun/rockdoom.wad | ||
21 | // | ||
22 | // Revision 1.2 2006-04-03 00:28:13 kkurbjun | ||
20 | // Fixes graphic errors in scaling code, note sure about the fix in hu_lib.c though. I havn't seen any corrupted text but it may still need a proper fix. | 23 | // Fixes graphic errors in scaling code, note sure about the fix in hu_lib.c though. I havn't seen any corrupted text but it may still need a proper fix. |
21 | // | 24 | // |
22 | // Revision 1.1 2006-03-28 15:44:01 dave | 25 | // Revision 1.1 2006-03-28 15:44:01 dave |
@@ -187,7 +190,7 @@ void M_ReadThis2(int choice); | |||
187 | void M_QuitDOOM(int choice); | 190 | void M_QuitDOOM(int choice); |
188 | 191 | ||
189 | void M_ChangeMessages(int choice); | 192 | void M_ChangeMessages(int choice); |
190 | void M_ChangeSensitivity(int choice); | 193 | void M_ChangeGamma(int choice); |
191 | void M_SfxVol(int choice); | 194 | void M_SfxVol(int choice); |
192 | void M_MusicVol(int choice); | 195 | void M_MusicVol(int choice); |
193 | void M_SystemVol(int choice); | 196 | void M_SystemVol(int choice); |
@@ -349,7 +352,7 @@ menuitem_t OptionsMenu[]= | |||
349 | {1,"M_MESSG", M_ChangeMessages,'m'}, | 352 | {1,"M_MESSG", M_ChangeMessages,'m'}, |
350 | {2,"M_SCRNSZ", M_SizeDisplay,'s'}, | 353 | {2,"M_SCRNSZ", M_SizeDisplay,'s'}, |
351 | {-1,"",0,0}, | 354 | {-1,"",0,0}, |
352 | {2,"M_MSENS", M_ChangeSensitivity,'m'}, | 355 | {2,"M_GAMMA", M_ChangeGamma,'m'}, |
353 | {-1,"",0,0}, | 356 | {-1,"",0,0}, |
354 | {1,"M_SVOL", M_Sound,'s'} | 357 | {1,"M_SVOL", M_Sound,'s'} |
355 | }; | 358 | }; |
@@ -429,7 +432,7 @@ menuitem_t SoundMenu[]= | |||
429 | {-1,"",0,0}, //ROCKBOX | 432 | {-1,"",0,0}, //ROCKBOX |
430 | {2,"M_MUSVOL",M_MusicVol,'m'}, | 433 | {2,"M_MUSVOL",M_MusicVol,'m'}, |
431 | {-1,"",0,0}, //ROCKBOX | 434 | {-1,"",0,0}, //ROCKBOX |
432 | {2,"M_MUSVOL",M_SystemVol,'z'}, | 435 | {2,"M_SYSVOL",M_SystemVol,'z'}, |
433 | {-1,"",0,0} //ROCKBOX | 436 | {-1,"",0,0} //ROCKBOX |
434 | }; | 437 | }; |
435 | 438 | ||
@@ -1147,7 +1150,7 @@ void M_QuitDOOM(int choice) | |||
1147 | 1150 | ||
1148 | 1151 | ||
1149 | 1152 | ||
1150 | void M_ChangeSensitivity(int choice) | 1153 | void M_ChangeGamma(int choice) |
1151 | { | 1154 | { |
1152 | switch(choice) | 1155 | switch(choice) |
1153 | { | 1156 | { |
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index bc433e7f1d..08bbafa932 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -314,12 +314,13 @@ bool Dhandle_ver (int dver) | |||
314 | 314 | ||
315 | // This function builds up the basegame list for use in the options selection | 315 | // This function builds up the basegame list for use in the options selection |
316 | // it also sets the defaults for the argvlist | 316 | // it also sets the defaults for the argvlist |
317 | // Now checking for rcokdoom.wad based on prboom.wad | ||
317 | int Dbuild_base (struct opt_items *names) | 318 | int Dbuild_base (struct opt_items *names) |
318 | { | 319 | { |
319 | if ( fileexists(GAMEBASE"prboom.wad") ) | 320 | if ( fileexists(GAMEBASE"rockdoom.wad") ) |
320 | return 0; | 321 | return 0; |
321 | 322 | ||
322 | D_AddFile (GAMEBASE"prboom.wad", source_pwad); | 323 | D_AddFile (GAMEBASE"rockdoom.wad", source_pwad); |
323 | 324 | ||
324 | int i=0; | 325 | int i=0; |
325 | /* Doom Shareware */ | 326 | /* Doom Shareware */ |