[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.37,1.38 scumm.h,1.44,1.45 scummvm.cpp,1.59,1.60
Max Horn
fingolfin at users.sourceforge.net
Tue Oct 22 17:25:06 CEST 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv23630
Modified Files:
gfx.cpp scumm.h scummvm.cpp
Log Message:
removed old GUI code
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- gfx.cpp 22 Oct 2002 11:48:24 -0000 1.37
+++ gfx.cpp 23 Oct 2002 00:24:54 -0000 1.38
@@ -22,7 +22,6 @@
#include "stdafx.h"
#include "scumm.h"
#include "actor.h"
-#include "gui/gui.h"
#include "gui/newgui.h"
#include "resource.h"
#include "util.h"
@@ -168,7 +167,7 @@
}
/* Handle shaking */
- if (_shakeEnabled && !_gui->isActive() && !_newgui->isActive()) {
+ if (_shakeEnabled && !_newgui->isActive()) {
_shakeFrame = (_shakeFrame + 1) & (NUM_SHAKE_POSITIONS - 1);
_system->set_shake_pos(shake_positions[_shakeFrame]);
} else if (!_shakeEnabled &&_shakeFrame != 0) {
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- scumm.h 22 Oct 2002 13:04:39 -0000 1.44
+++ scumm.h 23 Oct 2002 00:24:54 -0000 1.45
@@ -28,7 +28,6 @@
#include "common/file.h"
class GameDetector;
-class Gui;
class NewGui;
class Dialog;
class Scumm;
@@ -395,7 +394,6 @@
// GUI
- Gui *_gui;
NewGui *_newgui;
Dialog *_pauseDialog;
@@ -1351,7 +1349,6 @@
void go();
- void setupGUIColors();
byte getDefaultGUIColor(int color);
void waitForTimer(int msec_delay);
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- scummvm.cpp 22 Oct 2002 11:48:24 -0000 1.59
+++ scummvm.cpp 23 Oct 2002 00:24:54 -0000 1.60
@@ -31,7 +31,6 @@
#include "debug.h"
#include "dialogs.h"
#include "gameDetector.h"
-#include "gui/gui.h"
#include "gui/newgui.h"
#include "gui/message.h"
#include "object.h"
@@ -101,9 +100,6 @@
_realHeight = 200;
}
- _gui = new Gui();
- _gui->init(this);
-
_newgui = g_gui;
_bundle = new Bundle();
_sound = new Sound(this);
@@ -177,8 +173,6 @@
if (_saveLoadDialog)
delete _saveLoadDialog;
- delete _gui;
-
delete _bundle;
delete _sound;
if (_imuse)
@@ -935,13 +929,11 @@
void Scumm::pauseGame(bool user)
{
- //_gui->pause();
pauseDialog();
}
void Scumm::setOptions()
{
- _gui->options();
//_newgui->optionsDialog();
}
@@ -964,18 +956,7 @@
void Scumm::pauseDialog()
{
if (!_pauseDialog) {
-#if 0
- // HACK HACK
- const char *message = "This demonstrates MessageDialog's abilities.\n"
- "For example it supports multi line text.\n"
- "\n"
- "Well, not much more right now, really :-)\n"
- "And there are still some bugs in it, too\n";
- // <- FIXME: This is needed due to a bug...
- _pauseDialog = new MessageDialog(_newgui, message);
-#else
_pauseDialog = new PauseDialog(_newgui, this);
-#endif
}
runDialog(_pauseDialog);
@@ -1065,7 +1046,6 @@
if (_features & GF_AFTER_V7)
runScript(_vars[VAR_UNK_SCRIPT], 0, 0, 0);
- //_gui->saveLoadDialog(); // FIXME: Old Gui
saveloadDialog(); // Display NewGui
if (_features & GF_AFTER_V7)
@@ -1487,14 +1467,9 @@
new_time = _system->get_msecs();
waitForTimer(delta * 15 + last_time - new_time);
last_time = _system->get_msecs();
- if (_gui->isActive()) {
- _gui->loop();
- delta = 5;
- } else {
- delta = scummLoop(delta);
- if (delta < 1) // Ensure we don't get into a loop
- delta = 1; // by not decreasing sleepers.
- }
+ delta = scummLoop(delta);
+ if (delta < 1) // Ensure we don't get into a loop
+ delta = 1; // by not decreasing sleepers.
}
}
@@ -1562,7 +1537,6 @@
void Scumm::go() {
launch();
- setupGUIColors();
mainRun();
}
@@ -1578,18 +1552,6 @@
return readArray(110, 0, color);
} else {
return getStringAddress(21)[color];
- }
-}
-
-void Scumm::setupGUIColors() {
-
- /* FIXME: strange IF line? */
- if (_gameId && !(_features & GF_SMALL_HEADER) && !(_features & GF_AFTER_V7)) {
- _gui->_bgcolor = getDefaultGUIColor(0);
- _gui->_color = getDefaultGUIColor(1);
- _gui->_textcolor = getDefaultGUIColor(2);
- _gui->_textcolorhi = getDefaultGUIColor(6);
- _gui->_shadowcolor = getDefaultGUIColor(8);
}
}
More information about the Scummvm-git-logs
mailing list