summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2006-04-03 20:03:02 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2006-04-03 20:03:02 +0000
commit1123ab64cdcb9933916b3892cf01513b198561d8 (patch)
tree41575cbf3f04eb7af7dfc3553f89a97fcb678d8e
parentc48660005bc5e318ff5672afdf2728bda313a574 (diff)
downloadrockbox-1123ab64cdcb9933916b3892cf01513b198561d8.tar.gz
rockbox-1123ab64cdcb9933916b3892cf01513b198561d8.tar.bz2
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
-rw-r--r--apps/plugins/doom/i_video.c6
-rw-r--r--apps/plugins/doom/m_menu.c13
-rw-r--r--apps/plugins/doom/rockdoom.c5
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 @@
* GNU General Public License for more details.
*
* $Log$
- * Revision 1.8 2006/04/03 17:11:42 kkurbjun
+ * Revision 1.9 2006/04/03 20:03:02 kkurbjun
+ * Updates doom menu w/ new graphics, now requires rockdoom.wad: http://alamode.mines.edu/~kkurbjun/rockdoom.wad
+ *
+ * Revision 1.8 2006-04-03 17:11:42 kkurbjun
* Finishing touches
*
* Revision 1.7 2006-04-03 16:30:12 kkurbjun
@@ -83,6 +86,7 @@ void I_ShutdownGraphics(void)
#ifndef HAVE_LCD_COLOR
gray_release();
#endif
+ noprintf=0;
}
//
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 @@
// GNU General Public License for more details.
//
// $Log$
-// Revision 1.2 2006/04/03 00:28:13 kkurbjun
+// Revision 1.3 2006/04/03 20:03:02 kkurbjun
+// Updates doom menu w/ new graphics, now requires rockdoom.wad: http://alamode.mines.edu/~kkurbjun/rockdoom.wad
+//
+// Revision 1.2 2006-04-03 00:28:13 kkurbjun
// 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.
//
// Revision 1.1 2006-03-28 15:44:01 dave
@@ -187,7 +190,7 @@ void M_ReadThis2(int choice);
void M_QuitDOOM(int choice);
void M_ChangeMessages(int choice);
-void M_ChangeSensitivity(int choice);
+void M_ChangeGamma(int choice);
void M_SfxVol(int choice);
void M_MusicVol(int choice);
void M_SystemVol(int choice);
@@ -349,7 +352,7 @@ menuitem_t OptionsMenu[]=
{1,"M_MESSG", M_ChangeMessages,'m'},
{2,"M_SCRNSZ", M_SizeDisplay,'s'},
{-1,"",0,0},
- {2,"M_MSENS", M_ChangeSensitivity,'m'},
+ {2,"M_GAMMA", M_ChangeGamma,'m'},
{-1,"",0,0},
{1,"M_SVOL", M_Sound,'s'}
};
@@ -429,7 +432,7 @@ menuitem_t SoundMenu[]=
{-1,"",0,0}, //ROCKBOX
{2,"M_MUSVOL",M_MusicVol,'m'},
{-1,"",0,0}, //ROCKBOX
- {2,"M_MUSVOL",M_SystemVol,'z'},
+ {2,"M_SYSVOL",M_SystemVol,'z'},
{-1,"",0,0} //ROCKBOX
};
@@ -1147,7 +1150,7 @@ void M_QuitDOOM(int choice)
-void M_ChangeSensitivity(int choice)
+void M_ChangeGamma(int choice)
{
switch(choice)
{
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)
// This function builds up the basegame list for use in the options selection
// it also sets the defaults for the argvlist
+// Now checking for rcokdoom.wad based on prboom.wad
int Dbuild_base (struct opt_items *names)
{
- if ( fileexists(GAMEBASE"prboom.wad") )
+ if ( fileexists(GAMEBASE"rockdoom.wad") )
return 0;
- D_AddFile (GAMEBASE"prboom.wad", source_pwad);
+ D_AddFile (GAMEBASE"rockdoom.wad", source_pwad);
int i=0;
/* Doom Shareware */