[Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.13,1.14 gui.h,1.7,1.8 scumm.h,1.82,1.83 scummvm.cpp,1.80,1.81 sound.cpp,1.27,1.28
James Brown
ender at users.sourceforge.net
Thu Mar 14 08:51:01 CET 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm gapi_keys.h,NONE,1.1 object.cpp,1.41,1.42 saveload.cpp,1.31,1.32 scumm.h,1.81,1.82
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound imuse.cpp,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv12956
Modified Files:
gui.cpp gui.h scumm.h scummvm.cpp sound.cpp
Log Message:
Last part of the WinCE merge - all should compile and work now.
I've made some changes from Arismes code, to intergrate some stuff into ScummVM - that bit is still a WIP.
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** gui.cpp 14 Mar 2002 13:57:28 -0000 1.13
--- gui.cpp 14 Mar 2002 16:49:58 -0000 1.14
***************
*** 22,29 ****
#include "scumm.h"
#include "gui.h"
enum {
SAVELOAD_DIALOG,
! PAUSE_DIALOG
};
--- 22,49 ----
#include "scumm.h"
#include "gui.h"
+ #include "sound.h"
+
+ #ifdef _WIN32_WCE
+ // Additional variables for Win32 specific GUI
+ #include "gapi_keys.h"
+ extern bool toolbar_drawn;
+ extern bool draw_keyboard;
+ extern bool get_key_mapping;
+ extern struct keyops keyMapping;
+ extern void registry_save(void);
+ uint16 _key_mapping_required;
+ #else
+ #define registry_save() ;
+ bool get_key_mapping;
+ uint16 _key_mapping_required;
+ #endif
enum {
SAVELOAD_DIALOG,
! PAUSE_DIALOG,
! SOUND_DIALOG,
! KEYS_DIALOG,
! OPTIONS_DIALOG,
! ABOUT_DIALOG
};
***************
*** 128,138 ****
switch(w->_type) {
! case GUI_TEXT:
! s = queryString(w->_string_number,w->_id);
! if (s)
! drawString(s, x+_parentX, y+_parentY, w->_w,
(_clickWidget && _clickWidget==w->_id) ? _textcolorhi : _textcolor,
false);
break;
case GUI_IMAGE:
;
--- 148,187 ----
switch(w->_type) {
! case GUI_CUSTOMTEXT:
! case GUI_VARTEXT:
! case GUI_KEYTEXT:
! case GUI_ACTIONTEXT:
! case GUI_RESTEXT: {
! char text[500];
! switch(w->_type) {
! case GUI_CUSTOMTEXT:
! strcpy(text, string_map_table_custom[w->_string_number]);
! break;
! case GUI_RESTEXT:
! s = queryString(w->_string_number,w->_id);
! if (s)
! strcpy(text, s);
! else
! text[0] = '\0';
! break;
! case GUI_VARTEXT:
! sprintf(text, "%s %d", string_map_table_custom[w->_string_number], _gui_variables[w->_string_number]);
! break;
! #ifdef _WIN32_WCE
! case GUI_KEYTEXT:
! strcpy(text, getGAPIKeyName(getAction(w->_string_number - 1)->action_key));
! break;
! case GUI_ACTIONTEXT:
! strcpy(text, getActionName(getAction(w->_string_number - 1)->action_type));
! break;
! #endif
! }
!
! if (*text)
! drawString(text, x+_parentX, y+_parentY, w->_w,
(_clickWidget && _clickWidget==w->_id) ? _textcolorhi : _textcolor,
false);
break;
+ }
case GUI_IMAGE:
;
***************
*** 265,309 ****
handleCommand(_clickWidget);
}
}
const GuiWidget save_load_dialog[] = {
{GUI_STAT,0xFF,GWF_DEFAULT|GWF_PARENT,30,20,260,120,0,0},
! {GUI_TEXT,0x01,0,40,5,128,16,0,1}, /* How may I serve you? */
! {GUI_TEXT,0x02,0,40,5,128,16,0,2}, /* Select a game to LOAD */
! {GUI_TEXT,0x04,0,40,5,128,16,0,3}, /* Name your SAVE game */
{GUI_STAT,0xFF,GWF_DEFAULT,6,16,170,96,0,0},
! {GUI_TEXT,0x01,GWF_DEFAULT,180,20,16,40,0,0},
! {GUI_TEXT,0x01,GWF_DEFAULT,180,66,16,40,0,0},
! {GUI_TEXT,0xFE,GWF_DEFAULT,180,20,16,40,1,0},
! {GUI_TEXT,0xFE,GWF_DEFAULT,180,66,16,40,2,0},
! {GUI_TEXT,0x06,GWF_CLEARBG,10,20,160,10,20,0},
! {GUI_TEXT,0x06,GWF_CLEARBG,10,30,160,10,21,0},
! {GUI_TEXT,0x06,GWF_CLEARBG,10,40,160,10,22,0},
! {GUI_TEXT,0x06,GWF_CLEARBG,10,50,160,10,23,0},
! {GUI_TEXT,0x06,GWF_CLEARBG,10,60,160,10,24,0},
! {GUI_TEXT,0x06,GWF_CLEARBG,10,70,160,10,25,0},
! {GUI_TEXT,0x06,GWF_CLEARBG,10,80,160,10,26,0},
! {GUI_TEXT,0x06,GWF_CLEARBG,10,90,160,10,27,0},
! {GUI_TEXT,0x06,GWF_CLEARBG,10,100,160,10,28,0},
! {GUI_TEXT,0x01,GWF_BUTTON,200,25,54,16,3,4}, /* Save */
! {GUI_TEXT,0x01,GWF_BUTTON,200,45,54,16,4,5}, /* Load */
! {GUI_TEXT,0x01,GWF_BUTTON,200,65,54,16,5,6}, /* Play */
! {GUI_TEXT,0x01,GWF_BUTTON,200,85,54,16,6,8}, /* Quit */
! {GUI_TEXT,0x02,GWF_BUTTON,200,50,54,16,7,7}, /* Cancel */
! {GUI_TEXT,0x04,GWF_BUTTON,200,45,54,16,8,9}, /* Ok */
! {GUI_TEXT,0x04,GWF_BUTTON,200,65,54,16,7,7}, /* Cancel */
{0,0,0,0,0,0,0,0,0}
};
const GuiWidget pause_dialog[] = {
! {GUI_TEXT,0x01,GWF_DEFAULT,50,80,220,16,0,10},
{0,0,0,0,0,0,0,0,0}
};
void Gui::handleCommand(int cmd) {
--- 314,515 ----
handleCommand(_clickWidget);
}
+
+ if (_dialog == OPTIONS_DIALOG || _dialog == PAUSE_DIALOG)
+ close();
}
+ const GuiWidget keys_dialog[] = {
+ {GUI_STAT, 0xFF, GWF_DEFAULT, 30, 10, 260, 130, 0, 0 },
+
+ // First action
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 11, 10 + 10, 15, 15, 10, 3}, // CUSTOMTEXT_PLUS
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 33, 10 + 10, 15, 15, 11, 4}, // CUSTOMTEXT_MINUS
+ {GUI_ACTIONTEXT, 0x01, GWF_BUTTON, 30 + 11 + 33 + 10, 10 + 10, 100, 15, 100, 1},
+ {GUI_KEYTEXT, 0x01, 0, 30 + 11 + 33 + 120, 10 + 10 + 3, 100, 15, 1, 1},
+
+ //Second action
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 11, 10 + 10 + 15 + 5, 15, 15, 20, 3}, // CUSTOMTEXT_PLUS
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 33, 10 + 10 + 15 + 5, 15, 15, 21, 4}, // CUSTOMTEXT_MINUS
+ {GUI_ACTIONTEXT, 0x01, GWF_BUTTON, 30 + 10 + 33 + 10, 10 + 10 + 15 + 5, 100, 15, 101, 2},
+ {GUI_KEYTEXT, 0x01, 0, 30 + 11 + 33 + 120, 10 + 10 + 15 + 5 + 3, 100, 15, 2, 2},
+
+ //Third action
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 11, 10 + 10 + 15 + 5 + 15 + 5, 15, 15, 30, 3},// CUSTOMTEXT_PLUS
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 33, 10 + 10 + 15 + 5 + 15 + 5, 15, 15, 31, 4}, // CUSTOMTEXT_MINUS
+ {GUI_ACTIONTEXT, 0x01, GWF_BUTTON, 30 + 10 + 33 + 10, 10 + 10 + 15 + 5 + 15 + 5, 100, 15, 102, 3},
+ {GUI_KEYTEXT, 0x01, 0, 30 + 11 + 33 + 120, 10 + 10 + 15 + 5 + 15 + 5 + 3, 100, 15, 3, 3},
+
+ //Fourth action
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 11, 10 + 10 + 15 + 5 + 15 + 5 + 15 + 5, 15, 15, 40, 3},
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 33, 10 + 10 + 15 + 5 + 15 + 5 + 15 + 5, 15, 15, 41, 4},
+ {GUI_ACTIONTEXT, 0x01, GWF_BUTTON, 30 + 10 + 33 + 10, 10 + 10 + 15 + 5 + 15 + 5 + 15 + 5, 100, 15, 103, 4},
+ {GUI_KEYTEXT, 0x01, 0, 30 + 11 + 33 + 120, 10 + 10 + 15 + 5 + 15 + 5 + 15 + 5 + 3, 100, 15, 4, 4},
+
+ //Fifth action
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 11, 10 + 10 + 15 + 5 + 15 + 5 + 15 + 5 + 15 + 5, 15, 15, 50, 3},
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 33, 10 + 10 + 15 + 5 + 15 + 5 + 15 + 5 + 15 + 5, 15, 15, 51, 4},
+ {GUI_ACTIONTEXT, 0x01, GWF_BUTTON, 30 + 10 + 33 + 10, 10 + 10 + 15 + 5 + 15 + 5 + 15 + 5 + 15 + 5, 100, 15, 104, 5},
+ {GUI_KEYTEXT, 0x01, 0, 30 + 11 + 33 + 120, 10 + 10 + 15 + 5 + 15 + 5 + 15 + 5 + 15 + 5 + 3, 100, 15, 5, 5},
+
+ //OK
+ {GUI_RESTEXT, 0x01, GWF_BUTTON, 30 + 113, 10 + 106, 54, 16, 60, 9 },
+ {0}
+ };
+
+
+ const GuiWidget about_dialog[] = {
+ {GUI_STAT, 0xFF, GWF_DEFAULT, 30, 20, 260, 120, 0, 0 },
+ // {GUI_CUSTOMTEXT, 0x01, 0, 30 + 95, 20 + 10, 100, 15, 0, }, .. pocketscummvm
+ {GUI_CUSTOMTEXT, 0x01, 0, 30 + 68, 20 + 10 + 15 + 5, 160, 15, 0, 9}, // Build
+ {GUI_CUSTOMTEXT, 0x01, 0, 30 + 10, 20 + 10 + 15 + 5 + 15, 230, 15, 0, 10}, // ScummVM Url
+ {GUI_CUSTOMTEXT, 0x01, 0, 30 + 75, 20 + 10 + 15 + 5 + 15 + 15 + 15, 150, 15, 0, 11}, // Lucasarts
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 113, 20 + 96, 54, 16, 40, 9 },
+ {0}
+ };
+
+ const GuiWidget options_dialog[] = {
+ {GUI_STAT, 0xFF, GWF_DEFAULT, 50, 80, 210, 35, 0, 0 },
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 50 + 10 , 80 + 10, 40, 15, 1, 5}, // Sound
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 50 + 10 + 40 + 30 , 80 + 10, 40, 15 , 2, 6}, // Keys
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 50 + 10 + 40 + 30 + 40 + 30, 80 + 10, 40, 15, 3, 7}, // About
+ {0}
+ };
+
+ const GuiWidget sound_dialog[] = {
+ {GUI_STAT, 0xFF, GWF_DEFAULT, 30, 20, 260, 120, 0, 0 },
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 11, 20 + 11, 15, 15, 1, 3}, // Plus
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 33, 20 + 11, 15, 15, 2, 4}, // Minus
+ {GUI_VARTEXT, 0x01, GWF_DEFAULT, 30 + 73, 20 + 11, 128, 15, 3, 0}, // Master
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 11, 20 + 25 + 11, 15, 15, 11, 3}, // Plus
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 33, 20 + 25 + 11, 15, 15, 12, 4}, // Minus
+ {GUI_VARTEXT, 0x01, GWF_BUTTON, 30 + 73, 20 + 25 + 11, 128, 15, 13, 1}, // Music
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 11, 20 + 25 + 25 + 11, 15, 15, 21, 3}, // Plus
+ {GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 33, 20 + 25 + 25 + 11, 15, 15, 22, 4}, // Minus
+ {GUI_VARTEXT, 0x01, GWF_BUTTON, 30 + 73, 20 + 25 + 25 + 11, 128, 15, 23, 2}, // SFX
+ {GUI_RESTEXT,0x01,GWF_BUTTON,30 + (260 / 2) - 80, 20 + 25 + 25 + 11 + 25 ,54,16,40,9}, /* OK */
+ {GUI_RESTEXT,0x01,GWF_BUTTON,30 + (260 / 2), 20 + 25 + 25 + 11 + 25 ,54,16,50,7}, /* Cancel */
+ {0}
+ };
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 */
! {GUI_RESTEXT,0x04,0,40,5,128,16,0,3}, /* Name your SAVE game */
{GUI_STAT,0xFF,GWF_DEFAULT,6,16,170,96,0,0},
! {GUI_RESTEXT,0x01,GWF_DEFAULT,180,20,16,40,0,0},
! {GUI_RESTEXT,0x01,GWF_DEFAULT,180,66,16,40,0,0},
! {GUI_RESTEXT,0xFE,GWF_DEFAULT,180,20,16,40,1,0},
! {GUI_RESTEXT,0xFE,GWF_DEFAULT,180,66,16,40,2,0},
! {GUI_RESTEXT,0x06,GWF_CLEARBG,10,20,160,10,20,0},
! {GUI_RESTEXT,0x06,GWF_CLEARBG,10,30,160,10,21,0},
! {GUI_RESTEXT,0x06,GWF_CLEARBG,10,40,160,10,22,0},
! {GUI_RESTEXT,0x06,GWF_CLEARBG,10,50,160,10,23,0},
! {GUI_RESTEXT,0x06,GWF_CLEARBG,10,60,160,10,24,0},
! {GUI_RESTEXT,0x06,GWF_CLEARBG,10,70,160,10,25,0},
! {GUI_RESTEXT,0x06,GWF_CLEARBG,10,80,160,10,26,0},
! {GUI_RESTEXT,0x06,GWF_CLEARBG,10,90,160,10,27,0},
! {GUI_RESTEXT,0x06,GWF_CLEARBG,10,100,160,10,28,0},
! {GUI_RESTEXT,0x01,GWF_BUTTON,200,25,54,16,3,4}, /* Save */
! {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 */
! {GUI_RESTEXT,0x04,GWF_BUTTON,200,45,54,16,8,9}, /* Ok */
! {GUI_RESTEXT,0x04,GWF_BUTTON,200,65,54,16,7,7}, /* Cancel */
{0,0,0,0,0,0,0,0,0}
};
const GuiWidget pause_dialog[] = {
! {GUI_RESTEXT,0x01,GWF_DEFAULT,50,80,220,16,0,10},
{0,0,0,0,0,0,0,0,0}
};
+ void Gui::handleSoundDialogCommand(int cmd) {
+ if (cmd == 40 || cmd == 50) {
+ if (cmd == 40) {
+ SoundEngine *se = (SoundEngine*)_s->_soundEngine;
+ _s->_sound_volume_master = _gui_variables[0]; // Master
+ _s->_sound_volume_music = _gui_variables[1]; // Music
+ _s->_sound_volume_sfx = _gui_variables[2]; // SFX
+ se->set_music_volume(_s->_sound_volume_music);
+ se->set_master_volume(_s->_sound_volume_master);
+ registry_save();
+ }
+
+ close();
+ return;
+ }
+ if ((cmd % 10) == 1) {
+ if (_gui_variables[cmd / 10] < 100)
+ _gui_variables[cmd / 10]+=5;
+ }
+ else {
+ if (_gui_variables[cmd / 10] > 0)
+ _gui_variables[cmd / 10]-=5;
+ }
+
+ draw((cmd / 10) * 10 + 3, (cmd / 10) * 10 + 3);
+ }
+
+ void Gui::handleOptionsDialogCommand(int cmd) {
+ switch(cmd) {
+ case 1:
+ _widgets[0] = sound_dialog;
+ _gui_variables[0] = _s->_sound_volume_master;
+ _gui_variables[1] = _s->_sound_volume_music;
+ _gui_variables[2] = _s->_sound_volume_sfx;
+ _active = true;
+ _cur_page = 0;
+ _dialog = SOUND_DIALOG;
+ draw(0, 100);
+ return;
+ case 2:
+ _key_mapping_required = 0;
+ get_key_mapping = true;
+ _widgets[0] = keys_dialog;
+ _active = true;
+ _cur_page = 0;
+ _dialog = KEYS_DIALOG;
+ draw(0, 200);
+ return;
+ case 3:
+ _widgets[0] = about_dialog;
+ _active = true;
+ _cur_page = 0;
+ _dialog = ABOUT_DIALOG;
+ draw(0, 100);
+ return;
+ }
+ }
+
+ void Gui::handleKeysDialogCommand(int cmd) {
+ #ifdef _WIN32_WCE
+ if (cmd < 100 && cmd != 60) {
+
+ if ((cmd % 10) == 1)
+ setNextType((cmd / 10) - 1);
+ else
+ setPreviousType((cmd / 10) - 1);
+
+ draw(0, 200);
+
+ return;
+ }
+
+ _key_mapping_required = cmd;
+
+ if (cmd == 60) {
+ get_key_mapping = false;
+ registry_save();
+ close();
+ }
+ #endif
+ }
+
void Gui::handleCommand(int cmd) {
***************
*** 311,314 ****
--- 517,541 ----
showCaret(false);
+
+ if (_dialog == SOUND_DIALOG) {
+ handleSoundDialogCommand(cmd);
+ return;
+ }
+
+ if (_dialog == OPTIONS_DIALOG) {
+ handleOptionsDialogCommand(cmd);
+ return;
+ }
+
+ if (_dialog == KEYS_DIALOG) {
+ handleKeysDialogCommand(cmd);
+ return;
+ }
+
+ if (_dialog == ABOUT_DIALOG) {
+ close();
+ return;
+ }
+
switch(cmd) {
case 1: /* up button */
***************
*** 380,409 ****
}
- const byte string_map_table_v6[] = {
- 117, /* How may I serve you? */
- 109, /* Select a game to LOAD */
- 108, /* Name your SAVE game */
- 96, /* Save */
- 97, /* Load */
- 98, /* Play */
- 99, /* Cancel */
- 100, /* Quit */
- 101, /* Ok */
- 93, /* Game paused */
- };
-
- const byte string_map_table_v5[] = {
- 0, /* How may I serve you? */
- 20, /* Select a game to LOAD */
- 19, /* Name your SAVE game */
- 7, /* Save */
- 8, /* Load */
- 9, /* Play */
- 10, /* Cancel */
- 11, /* Quit */
- 12, /* Ok */
- 4, /* Game paused */
- };
-
const char *Gui::queryString(int string, int id) {
static char namebuf[64];
--- 607,610 ----
***************
*** 486,489 ****
--- 687,700 ----
close();
break;
+
+ #ifdef _WIN32_WCE
+ case KEYS_DIALOG:
+ clearActionKey(letter);
+ if (_key_mapping_required)
+ getAction(_key_mapping_required - 100)->action_key = letter;
+ _key_mapping_required = 0;
+ draw(0, 200);
+ break;
+ #endif
}
}
***************
*** 520,524 ****
if (_active==1) {
_active++;
! draw(0,100);
_s->_cursorAnimate++;
_s->gdi._cursorActive = 1;
--- 731,735 ----
if (_active==1) {
_active++;
! draw(0,200); // was 100
_s->_cursorAnimate++;
_s->gdi._cursorActive = 1;
***************
*** 530,534 ****
leftMouseClick(_s->mouse.x, _s->mouse.y);
} else if (_s->_lastKeyHit) {
! addLetter((unsigned char)_s->_lastKeyHit);
}
--- 741,751 ----
leftMouseClick(_s->mouse.x, _s->mouse.y);
} else if (_s->_lastKeyHit) {
! if (_dialog != KEYS_DIALOG)
! addLetter((unsigned char)_s->_lastKeyHit);
! #ifdef _WIN32_WCE
! else if (_s->_lastKeyHit > 1000) // GAPI
! addLetter(_s->_lastKeyHit - 1000);
! #endif
!
}
***************
*** 550,553 ****
--- 767,777 ----
_s->pauseSounds(false);
_active = false;
+
+ #ifdef _WIN32_WCE
+ if (_dialog == SAVELOAD_DIALOG) {
+ draw_keyboard = false;
+ toolbar_drawn = false;
+ }
+ #endif
}
***************
*** 565,567 ****
--- 789,798 ----
_active = true;
_dialog = PAUSE_DIALOG;
+ }
+
+ void Gui::options() {
+ _widgets[0] = options_dialog;
+ _active = true;
+ _cur_page = 0;
+ _dialog = OPTIONS_DIALOG;
}
Index: gui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gui.h 14 Mar 2002 13:57:28 -0000 1.7
--- gui.h 14 Mar 2002 16:49:59 -0000 1.8
***************
*** 4,10 ****
enum {
GUI_NONE = 0,
! GUI_TEXT = 1,
GUI_IMAGE = 2,
! GUI_STAT = 3
};
--- 4,14 ----
enum {
GUI_NONE = 0,
! GUI_RESTEXT = 1,
GUI_IMAGE = 2,
! GUI_STAT = 3,
! GUI_CUSTOMTEXT = 4,
! GUI_VARTEXT = 5,
! GUI_ACTIONTEXT = 6,
! GUI_KEYTEXT = 7
};
***************
*** 19,22 ****
--- 23,72 ----
};
+ static const char* string_map_table_custom[] = {
+ "Master Volume :",
+ "Music Volume :",
+ "SFX Volume :",
+ "+",
+ "-",
+ "Sound",
+ "Keys",
+ "About",
+ "Pocket ScummVM",
+ "Build " SCUMMVM_VERSION "(" SCUMMVM_CVS ")",
+ "ScummVM http://scummvm.sourceforge.net",
+ "All games (c) LucasArts",
+ "Quit",
+ "Pause",
+ "Save",
+ "Skip",
+ "Hide"
+ };
+
+ static const byte string_map_table_v6[] = {
+ 117, /* How may I serve you? */
+ 109, /* Select a game to LOAD */
+ 108, /* Name your SAVE game */
+ 96, /* Save */
+ 97, /* Load */
+ 98, /* Play */
+ 99, /* Cancel */
+ 100, /* Quit */
+ 101, /* Ok */
+ 93 /* Game paused */
+ };
+
+ static const byte string_map_table_v5[] = {
+ 0, /* How may I serve you? */
+ 20, /* Select a game to LOAD */
+ 19, /* Name your SAVE game */
+ 7, /* Save */
+ 8, /* Load */
+ 9, /* Play */
+ 10, /* Cancel */
+ 11, /* Quit */
+ 12, /* Ok */
+ 4 /* Game paused */
+ };
+
struct GuiWidget {
byte _type;
***************
*** 48,51 ****
--- 98,104 ----
char *_queryMess;
+ /* optiondialog specifics */
+ int _gui_variables[100];
+
/* savedialog specifics */
int _slotIndex;
***************
*** 76,84 ****
void editString(int index);
void showCaret(bool show);
! void addLetter(byte letter);
! void saveLoadDialog();
void queryMessage(const char *msg, const char *alts);
byte getDefaultColor(int color);
void pause();
};
--- 129,145 ----
void editString(int index);
void showCaret(bool show);
! void addLetter(byte letter);
void queryMessage(const char *msg, const char *alts);
byte getDefaultColor(int color);
+
+ // Dialogs
+ void saveLoadDialog();
void pause();
+ void options();
+
+ void handleSoundDialogCommand(int cmd);
+ void handleOptionsDialogCommand(int cmd);
+ void handleKeysDialogCommand(int cmd);
+
};
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** scumm.h 14 Mar 2002 14:45:03 -0000 1.82
--- scumm.h 14 Mar 2002 16:49:59 -0000 1.83
***************
*** 30,39 ****
#define SCUMMVM_VERSION "0.2.0 devel"
! #ifdef _WIN32_WCE
! // Additional build information for easier bug report
- #define POCKETSCUMM_BUILD "031302"
- #define SCUMMVM_CVS "031002"
- #endif
#define SWAP(a,b) do{int tmp=a; a=b; b=tmp; } while(0)
#define ARRAYSIZE(x) (sizeof(x)/sizeof(x[0]))
--- 30,35 ----
#define SCUMMVM_VERSION "0.2.0 devel"
! #define SCUMMVM_CVS "031402"
#define SWAP(a,b) do{int tmp=a; a=b; b=tmp; } while(0)
#define ARRAYSIZE(x) (sizeof(x)/sizeof(x[0]))
***************
*** 908,912 ****
bool _soundsPaused;
! bool _soundsPaused2;
bool _useTalkAnims;
--- 904,908 ----
bool _soundsPaused;
! bool _soundsPaused2;
bool _useTalkAnims;
***************
*** 1757,1761 ****
void decodeParseString();
void pauseGame(bool user);
! // FIXME void setOptions(void);
void shutDown(int i);
void lock(int type, int i);
--- 1753,1757 ----
void decodeParseString();
void pauseGame(bool user);
! void setOptions(void);
void shutDown(int i);
void lock(int type, int i);
***************
*** 2074,2077 ****
--- 2070,2074 ----
byte VAR_LAST_SOUND;
byte VAR_CUTSCENEEXIT_KEY;
+ byte VAR_OPTIONS_KEY;
byte VAR_TALK_ACTOR;
byte VAR_CAMERA_FAST_X;
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** scummvm.cpp 14 Mar 2002 14:16:20 -0000 1.80
--- scummvm.cpp 14 Mar 2002 16:49:59 -0000 1.81
***************
*** 1038,1041 ****
--- 1038,1045 ----
}
+ void Scumm::setOptions() {
+ ((Gui*)_gui)->options();
+ }
+
void Scumm::shutDown(int i) {
/* TODO: implement this */
***************
*** 1066,1069 ****
--- 1070,1078 ----
if (!_lastKeyHit)
return;
+
+ if (_lastKeyHit==KEY_SET_OPTIONS) {
+ setOptions();
+ return;
+ }
if (_lastKeyHit==_vars[VAR_RESTART_KEY]) {
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** sound.cpp 14 Mar 2002 08:04:21 -0000 1.27
--- sound.cpp 14 Mar 2002 16:49:59 -0000 1.28
***************
*** 414,420 ****
return;
}
! for(i=0;i<size; i++)
data[i] ^= 0x80;
!
playSfxSound(data, size, 1000000 / (256 - rate) );
}
--- 414,424 ----
return;
}
! for(i=0;i<size; i++) {
! // Fixme: From WinCE port
! if (_sound_volume_sfx != 100)
! data[i] = _sound_volume_sfx * data[i] / 100;
!
data[i] ^= 0x80;
! }
playSfxSound(data, size, 1000000 / (256 - rate) );
}
***************
*** 568,577 ****
mc->type = MIXER_STANDARD;
mc->_sfx_sound = sound;
! mc->sound_data.standard._sfx_pos = 0;
! mc->sound_data.standard._sfx_fp_speed = (1<<16) * rate / 22050;
mc->sound_data.standard._sfx_fp_pos = 0;
while (size&0xFFFF0000) size>>=1, rate>>=1;
mc->sound_data.standard._sfx_size = size * 22050 / rate;
}
--- 572,591 ----
mc->type = MIXER_STANDARD;
mc->_sfx_sound = sound;
! mc->sound_data.standard._sfx_pos = 0;
mc->sound_data.standard._sfx_fp_pos = 0;
+ #ifdef _WIN32_WCE
+ mc->sound_data.standard._sfx_fp_speed = (1<<16) * rate / 11025;
+ #else
+ mc->sound_data.standard._sfx_fp_speed = (1<<16) * rate /22050;
+ #endif
while (size&0xFFFF0000) size>>=1, rate>>=1;
+
+
+ #ifdef _WIN32_WCE
+ mc->sound_data.standard._sfx_size = size * 11025 / rate;
+ #else
mc->sound_data.standard._sfx_size = size * 22050 / rate;
+ #endif
}
***************
*** 696,699 ****
--- 710,716 ----
_mixer_channel[i].mix(sounds, len);
}
+
+ if (_soundsPaused2)
+ memset(sounds, 0x0, len * sizeof(int16));
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm gapi_keys.h,NONE,1.1 object.cpp,1.41,1.42 saveload.cpp,1.31,1.32 scumm.h,1.81,1.82
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound imuse.cpp,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list