[Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.14,1.15 gui.h,1.8,1.9 sound.cpp,1.28,1.29
James Brown
ender at users.sourceforge.net
Thu Mar 14 09:56:49 CET 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv25699
Modified Files:
gui.cpp gui.h sound.cpp
Log Message:
Add "options" menu to F5 key. Can set music volumes and stuff :)
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gui.cpp 14 Mar 2002 16:49:58 -0000 1.14
--- gui.cpp 14 Mar 2002 17:36:12 -0000 1.15
***************
*** 154,157 ****
--- 154,159 ----
case GUI_RESTEXT: {
char text[500];
+ text[0] = '\0';
+
switch(w->_type) {
case GUI_CUSTOMTEXT:
***************
*** 162,167 ****
if (s)
strcpy(text, s);
- else
- text[0] = '\0';
break;
case GUI_VARTEXT:
--- 164,167 ----
***************
*** 315,319 ****
}
! if (_dialog == OPTIONS_DIALOG || _dialog == PAUSE_DIALOG)
close();
}
--- 315,319 ----
}
! if (_dialog == PAUSE_DIALOG)
close();
}
***************
*** 392,396 ****
const GuiWidget save_load_dialog[] = {
! {GUI_STAT,0xFF,GWF_DEFAULT|GWF_PARENT,30,20,260,120,0,0},
{GUI_RESTEXT,0x01,0,40,5,128,16,0,1}, /* How may I serve you? */
{GUI_RESTEXT,0x02,0,40,5,128,16,0,2}, /* Select a game to LOAD */
--- 392,396 ----
const GuiWidget save_load_dialog[] = {
! {GUI_STAT,0xFF,GWF_DEFAULT|GWF_PARENT,30,20,260,150,0,0},
{GUI_RESTEXT,0x01,0,40,5,128,16,0,1}, /* How may I serve you? */
{GUI_RESTEXT,0x02,0,40,5,128,16,0,2}, /* Select a game to LOAD */
***************
*** 416,421 ****
{GUI_RESTEXT,0x01,GWF_BUTTON,200,45,54,16,4,5}, /* Load */
{GUI_RESTEXT,0x01,GWF_BUTTON,200,65,54,16,5,6}, /* Play */
! {GUI_RESTEXT,0x01,GWF_BUTTON,200,85,54,16,6,8}, /* Quit */
!
{GUI_RESTEXT,0x02,GWF_BUTTON,200,50,54,16,7,7}, /* Cancel */
--- 416,422 ----
{GUI_RESTEXT,0x01,GWF_BUTTON,200,45,54,16,4,5}, /* Load */
{GUI_RESTEXT,0x01,GWF_BUTTON,200,65,54,16,5,6}, /* Play */
! {GUI_CUSTOMTEXT,0x01,GWF_BUTTON,200,85,54,16,9,17}, /* Options */
! {GUI_RESTEXT,0x01,GWF_BUTTON,200,105,54,16,6,8}, /* Quit */
!
{GUI_RESTEXT,0x02,GWF_BUTTON,200,50,54,16,7,7}, /* Cancel */
***************
*** 509,512 ****
--- 510,515 ----
close();
}
+ #else
+ close();
#endif
}
***************
*** 516,520 ****
int lastEdit = _editString;
showCaret(false);
-
if (_dialog == SOUND_DIALOG) {
--- 519,522 ----
***************
*** 523,527 ****
}
! if (_dialog == OPTIONS_DIALOG) {
handleOptionsDialogCommand(cmd);
return;
--- 525,529 ----
}
! if (_dialog == OPTIONS_DIALOG) {
handleOptionsDialogCommand(cmd);
return;
***************
*** 579,582 ****
--- 581,588 ----
memcpy(_s->_saveLoadName, game_names[lastEdit], sizeof(_s->_saveLoadName));
close();
+ return;
+ case 9: /* options button */
+ options();
+ draw(0, 100);
return;
default:
Index: gui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gui.h 14 Mar 2002 16:49:59 -0000 1.8
--- gui.h 14 Mar 2002 17:36:12 -0000 1.9
***************
*** 40,44 ****
"Save",
"Skip",
! "Hide"
};
--- 40,45 ----
"Save",
"Skip",
! "Hide",
! "Options"
};
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** sound.cpp 14 Mar 2002 16:49:59 -0000 1.28
--- sound.cpp 14 Mar 2002 17:36:12 -0000 1.29
***************
*** 334,337 ****
--- 334,340 ----
se->set_master_volume(125);
+ _sound_volume_sfx = 100;
+ _sound_volume_music = se->get_music_volume();
+ _sound_volume_master = (se->get_master_volume() / 127);
driver->midiSetDriver(se->midiGetDriver());
}
More information about the Scummvm-git-logs
mailing list