[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.96,1.97 dialogs.cpp,1.77,1.78 dialogs.h,1.26,1.27 resource.cpp,1.169,1.170 script_v6.cpp,1.203,1.204 scumm.h,1.318,1.319 scummvm.cpp,2.465,2.466 string.cpp,1.163,1.164
Max Horn
fingolfin at users.sourceforge.net
Sat Nov 1 18:19:11 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui EditTextWidget.cpp,1.15,1.16 EditTextWidget.h,1.8,1.9 ListWidget.cpp,1.25,1.26 PopUpWidget.cpp,1.18,1.19 ScrollBarWidget.cpp,1.9,1.10 about.cpp,1.5,1.6 about.h,1.1,1.2 browser.cpp,1.13,1.14 browser.h,1.8,1.9 chooser.cpp,1.5,1.6 chooser.h,1.4,1.5 console.cpp,1.34,1.35 console.h,1.18,1.19 dialog.cpp,1.31,1.32 dialog.h,1.21,1.22 launcher.cpp,1.61,1.62 launcher.h,1.12,1.13 message.cpp,1.13,1.14 message.h,1.9,1.10 newgui.cpp,1.62,1.63 newgui.h,1.29,1.30 options.cpp,1.27,1.28 options.h,1.6,1.7 widget.cpp,1.18,1.19 widget.h,1.21,1.22
- Next message: [Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15749/scumm
Modified Files:
debugger.cpp dialogs.cpp dialogs.h resource.cpp script_v6.cpp
scumm.h scummvm.cpp string.cpp
Log Message:
turned NewGui into a singleton, and made OSystem a pseudo-singleton; added Widget::findWidget (preparing to add support for nested widgets, for the tab widget)
Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- debugger.cpp 26 Oct 2003 21:30:49 -0000 1.96
+++ debugger.cpp 2 Nov 2003 02:18:14 -0000 1.97
@@ -40,7 +40,7 @@
namespace Scumm {
ScummDebugger::ScummDebugger(ScummEngine *s)
- : Common::Debugger<ScummDebugger>(s->_newgui) {
+ : Common::Debugger<ScummDebugger>() {
_vm = s;
// Register variables
Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- dialogs.cpp 1 Nov 2003 22:19:24 -0000 1.77
+++ dialogs.cpp 2 Nov 2003 02:18:14 -0000 1.78
@@ -192,8 +192,8 @@
kQuitCmd = 'QUIT'
};
-SaveLoadDialog::SaveLoadDialog(NewGui *gui, ScummEngine *scumm)
- : ScummDialog(gui, scumm, 20, 8, 280, 184) {
+SaveLoadDialog::SaveLoadDialog(ScummEngine *scumm)
+ : ScummDialog(scumm, 20, 8, 280, 184) {
const int x = _w - kButtonWidth - 8;
int y = 20;
@@ -218,9 +218,9 @@
//
// Create the sub dialog(s)
//
- _aboutDialog = new AboutDialog(gui);
+ _aboutDialog = new AboutDialog();
#ifndef DISABLE_HELP
- _helpDialog = new HelpDialog(gui, scumm);
+ _helpDialog = new HelpDialog(scumm);
#endif
// The save game list
@@ -388,11 +388,11 @@
};
#ifndef _WIN32_WCE
-OptionsDialog::OptionsDialog(NewGui *gui, ScummEngine *scumm)
- : ScummDialog(gui, scumm, 40, 30, 240, 124) {
+OptionsDialog::OptionsDialog(ScummEngine *scumm)
+ : ScummDialog(scumm, 40, 30, 240, 124) {
#else
-OptionsDialog::OptionsDialog(NewGui *gui, ScummEngine *scumm)
- : ScummDialog(gui, scumm, 40, 30, 240, 124 + kButtonHeight + 4) {
+OptionsDialog::OptionsDialog(ScummEngine *scumm)
+ : ScummDialog(scumm, 40, 30, 240, 124 + kButtonHeight + 4) {
#endif
//
// Add the buttons
@@ -442,7 +442,7 @@
// Create the sub dialog(s)
//
#ifdef _WIN32_WCE
- _keysDialog = new KeysDialog(gui, scumm);
+ _keysDialog = new KeysDialog(scumm);
#endif
}
@@ -538,8 +538,8 @@
kPrevCmd = 'PREV'
};
-HelpDialog::HelpDialog(NewGui *gui, ScummEngine *scumm)
- : ScummDialog(gui, scumm, 5, 5, 310, 190) {
+HelpDialog::HelpDialog(ScummEngine *scumm)
+ : ScummDialog(scumm, 5, 5, 310, 190) {
_page = 1;
_numPages = ScummHelp::numPages(scumm->_gameId);
@@ -608,18 +608,18 @@
#pragma mark -
-InfoDialog::InfoDialog(NewGui *gui, ScummEngine *scumm, int res)
-: ScummDialog(gui, scumm, 0, 80, 0, 16) { // dummy x and w
+InfoDialog::InfoDialog(ScummEngine *scumm, int res)
+: ScummDialog(scumm, 0, 80, 0, 16) { // dummy x and w
setInfoText(queryResString (res));
}
-InfoDialog::InfoDialog(NewGui *gui, ScummEngine *scumm, const String& message)
-: ScummDialog(gui, scumm, 0, 80, 0, 16) { // dummy x and w
+InfoDialog::InfoDialog(ScummEngine *scumm, const String& message)
+: ScummDialog(scumm, 0, 80, 0, 16) { // dummy x and w
setInfoText(message);
}
void InfoDialog::setInfoText(const String& message) {
- int width = _gui->getStringWidth(message.c_str()) + 16;
+ int width = g_gui.getStringWidth(message) + 16;
_x = (_scumm->_screenWidth - width) >> 1;
_w = width;
@@ -629,12 +629,12 @@
#pragma mark -
-PauseDialog::PauseDialog(NewGui *gui, ScummEngine *scumm)
- : InfoDialog(gui, scumm, 10) {
+PauseDialog::PauseDialog(ScummEngine *scumm)
+ : InfoDialog(scumm, 10) {
}
-ConfirmExitDialog::ConfirmExitDialog(NewGui *gui, ScummEngine *scumm)
- : InfoDialog(gui, scumm, "Do you really want to quit (y/n)?") {
+ConfirmExitDialog::ConfirmExitDialog(ScummEngine *scumm)
+ : InfoDialog(scumm, "Do you really want to quit (y/n)?") {
}
void ConfirmExitDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
@@ -657,8 +657,8 @@
};
-KeysDialog::KeysDialog(NewGui *gui, ScummEngine *scumm)
- : ScummDialog(gui, scumm, 30, 20, 260, 160) {
+KeysDialog::KeysDialog(ScummEngine *scumm)
+ : ScummDialog(scumm, 30, 20, 260, 160) {
addButton(160, 20, "Map", kMapCmd, 'M'); // Map
addButton(160, 40, "OK", kOKCmd, 'O'); // OK
addButton(160, 60, "Cancel", kCancelCmd, 'C'); // Cancel
Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- dialogs.h 1 Nov 2003 22:19:24 -0000 1.26
+++ dialogs.h 2 Nov 2003 02:18:14 -0000 1.27
@@ -37,8 +37,8 @@
class ScummDialog : public Dialog {
public:
- ScummDialog(NewGui *gui, ScummEngine *scumm, int x, int y, int w, int h)
- : Dialog(gui, x, y, w, h), _scumm(scumm) {}
+ ScummDialog(ScummEngine *scumm, int x, int y, int w, int h)
+ : Dialog(x, y, w, h), _scumm(scumm) {}
protected:
typedef Common::String String;
@@ -53,7 +53,7 @@
class SaveLoadDialog : public ScummDialog {
public:
- SaveLoadDialog(NewGui *gui, ScummEngine *scumm);
+ SaveLoadDialog(ScummEngine *scumm);
~SaveLoadDialog();
virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
virtual void open();
@@ -83,7 +83,7 @@
class HelpDialog : public ScummDialog {
public:
- HelpDialog(NewGui *gui, ScummEngine *scumm);
+ HelpDialog(ScummEngine *scumm);
virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
protected:
@@ -111,7 +111,7 @@
#endif
public:
- OptionsDialog(NewGui *gui, ScummEngine *scumm);
+ OptionsDialog(ScummEngine *scumm);
~OptionsDialog();
virtual void open();
@@ -137,9 +137,9 @@
class InfoDialog : public ScummDialog {
public:
// arbitrary message
- InfoDialog(NewGui *gui, ScummEngine *scumm, const String& message);
+ InfoDialog(ScummEngine *scumm, const String& message);
// from resources
- InfoDialog(NewGui *gui, ScummEngine *scumm, int res);
+ InfoDialog(ScummEngine *scumm, int res);
virtual void handleMouseDown(int x, int y, int button, int clickCount) {
close();
@@ -155,7 +155,7 @@
class PauseDialog : public InfoDialog {
public:
- PauseDialog(NewGui *gui, ScummEngine *scumm);
+ PauseDialog(ScummEngine *scumm);
virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers)
{
if (ascii == ' ') // Close pause dialog if space key is pressed
@@ -167,7 +167,7 @@
class ConfirmExitDialog : public InfoDialog {
public:
- ConfirmExitDialog(NewGui *gui, ScummEngine *scumm);
+ ConfirmExitDialog(ScummEngine *scumm);
virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers);
};
@@ -175,7 +175,7 @@
class KeysDialog : public ScummDialog {
public:
- KeysDialog(NewGui *gui, ScummEngine *scumm);
+ KeysDialog(ScummEngine *scumm);
virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers);
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- resource.cpp 1 Nov 2003 21:15:32 -0000 1.169
+++ resource.cpp 2 Nov 2003 02:18:14 -0000 1.170
@@ -240,7 +240,7 @@
error("Cannot find file: '%s'", filename);
} else {
sprintf(buf, "Cannot find file: '%s'", filename);
- InfoDialog dialog(_newgui, this, (char*)buf);
+ InfoDialog dialog(this, (char*)buf);
runDialog(dialog);
error("Cannot find file: '%s'", filename);
}
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- script_v6.cpp 9 Oct 2003 14:10:20 -0000 1.203
+++ script_v6.cpp 2 Nov 2003 02:18:14 -0000 1.204
@@ -2425,7 +2425,7 @@
break;
case 3:
if (readArray(233,0,50) == 0) {
- InfoDialog info(_newgui, this, "Set MineRoad - You can now jump the gorge.");
+ InfoDialog info(this, "Set MineRoad - You can now jump the gorge.");
runDialog(info);
writeArray(233, 0, 50, 1); // INSANE callback: Chain
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- scumm.h 28 Oct 2003 17:07:23 -0000 1.318
+++ scumm.h 2 Nov 2003 02:18:14 -0000 1.319
@@ -34,7 +34,6 @@
class Dialog;
class GameDetector;
-class NewGui;
namespace Scumm {
@@ -340,9 +339,6 @@
/** We keep running until this is set to true. */
bool _quit;
-
- // GUI
- NewGui *_newgui;
protected:
Dialog *_pauseDialog;
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.465
retrieving revision 2.466
diff -u -d -r2.465 -r2.466
--- scummvm.cpp 1 Nov 2003 21:15:33 -0000 2.465
+++ scummvm.cpp 2 Nov 2003 02:18:14 -0000 2.466
@@ -64,7 +64,6 @@
extern bool isSmartphone(void);
#endif
-extern NewGui *g_gui;
extern uint16 _debugLevel;
namespace Scumm {
@@ -307,7 +306,6 @@
_videoFinished = false;
_smushPlay = false;
_quit = false;
- _newgui = NULL;
_pauseDialog = NULL;
_optionsDialog = NULL;
_saveLoadDialog = NULL;
@@ -650,8 +648,6 @@
// Setup GDI object
gdi._numStrips = _screenWidth / 8;
- _newgui = g_gui;
-
// Create debugger
_debugger = new ScummDebugger(this);
@@ -1366,7 +1362,7 @@
#endif
sprintf(buf, "Successfully saved game state in file:\n\n%s", filename);
- TimedMessageDialog dialog(_newgui, buf, 1500);
+ TimedMessageDialog dialog(buf, 1500);
runDialog(dialog);
}
if (success && _saveLoadFlag != 1)
@@ -2459,25 +2455,25 @@
void ScummEngine::pauseDialog() {
if (!_pauseDialog)
- _pauseDialog = new PauseDialog(_newgui, this);
+ _pauseDialog = new PauseDialog(this);
runDialog(*_pauseDialog);
}
void ScummEngine::saveloadDialog() {
if (!_saveLoadDialog)
- _saveLoadDialog = new SaveLoadDialog(_newgui, this);
+ _saveLoadDialog = new SaveLoadDialog(this);
runDialog(*_saveLoadDialog);
}
void ScummEngine::optionsDialog() {
if (!_optionsDialog)
- _optionsDialog = new OptionsDialog(_newgui, this);
+ _optionsDialog = new OptionsDialog(this);
runDialog(*_optionsDialog);
}
void ScummEngine::confirmexitDialog() {
if (!_confirmExitDialog)
- _confirmExitDialog = new ConfirmExitDialog(_newgui, this);
+ _confirmExitDialog = new ConfirmExitDialog(this);
if (runDialog(*_confirmExitDialog)) {
_quit = true;
@@ -2496,7 +2492,7 @@
vsprintf(buf, message, va);
va_end(va);
- MessageDialog dialog(_newgui, buf, "OK", "Cancel");
+ MessageDialog dialog(buf, "OK", "Cancel");
return runDialog(dialog);
}
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- string.cpp 1 Nov 2003 15:19:30 -0000 1.163
+++ string.cpp 2 Nov 2003 02:18:16 -0000 1.164
@@ -80,7 +80,7 @@
// FIXME: I know this is the right thing to do for MI1 and MI2. For
// all other games it's just a guess.
- InfoDialog dialog(_newgui, this, (char*)buf);
+ InfoDialog dialog(this, (char*)buf);
VAR(VAR_KEYPRESS) = runDialog(dialog);
_messagePtr = tmp;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui EditTextWidget.cpp,1.15,1.16 EditTextWidget.h,1.8,1.9 ListWidget.cpp,1.25,1.26 PopUpWidget.cpp,1.18,1.19 ScrollBarWidget.cpp,1.9,1.10 about.cpp,1.5,1.6 about.h,1.1,1.2 browser.cpp,1.13,1.14 browser.h,1.8,1.9 chooser.cpp,1.5,1.6 chooser.h,1.4,1.5 console.cpp,1.34,1.35 console.h,1.18,1.19 dialog.cpp,1.31,1.32 dialog.h,1.21,1.22 launcher.cpp,1.61,1.62 launcher.h,1.12,1.13 message.cpp,1.13,1.14 message.h,1.9,1.10 newgui.cpp,1.62,1.63 newgui.h,1.29,1.30 options.cpp,1.27,1.28 options.h,1.6,1.7 widget.cpp,1.18,1.19 widget.h,1.21,1.22
- Next message: [Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list