[Scummvm-cvs-logs] CVS: scummvm/queen queen.h,1.15,1.16 queen.cpp,1.47,1.48
Gregory Montoir
cyx at users.sourceforge.net
Wed Dec 3 02:34:01 CET 2003
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv30809
Modified Files:
queen.h queen.cpp
Log Message:
removed unused stuff
Index: queen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- queen.h 1 Dec 2003 20:48:40 -0000 1.15
+++ queen.h 3 Dec 2003 10:33:01 -0000 1.16
@@ -36,42 +36,34 @@
class Sound;
class QueenEngine : public Engine {
- void errorString(const char *buf_input, char *buf_output);
-protected:
- bool _quickLaunch; // set when starting with -x
-
- uint16 _debugMode;
- int _numScreenUpdates;
-
- int _number_of_savegames;
-
- FILE *_dump_file;
-
- Graphics *_graphics;
- Input *_input;
- Resource *_resource;
- Logic *_logic;
- Display *_display;
- Sound *_sound;
-
- const char *_detectname; // necessary for music
-
public:
+
QueenEngine(GameDetector *detector, OSystem *syst);
virtual ~QueenEngine();
protected:
- byte _fastMode;
- void go();
+ void errorString(const char *buf_input, char *buf_output);
//! Called when we go from one room to another
void roomChanged(); // SETUP_ROOM
+ void go();
+
void initialise();
static void timerHandler(void *ptr);
void gotTimerTick();
+
+
+ Graphics *_graphics;
+ Input *_input;
+ Resource *_resource;
+ Logic *_logic;
+ Display *_display;
+ Sound *_sound;
+
+ const char *_detectname; // necessary for music
};
} // End of namespace Queen
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- queen.cpp 1 Dec 2003 20:48:40 -0000 1.47
+++ queen.cpp 3 Dec 2003 10:33:01 -0000 1.48
@@ -102,12 +102,9 @@
_mixer->setVolume(ConfMan.getInt("sfx_volume"));
- _debugMode = ConfMan.hasKey("debuglevel");
_debugLevel = ConfMan.getInt("debuglevel");
_detectname = detector->_game.detectname;
- _fastMode = 0;
-
_system->init_size(320, 200);
}
@@ -188,9 +185,6 @@
void QueenEngine::go() {
- if (!_dump_file)
- _dump_file = stdout;
-
initialise();
_logic->oldRoom(0);
@@ -226,6 +220,7 @@
}
void QueenEngine::initialise(void) {
+
_resource = new Resource(_gameDataPath, _detectname, _system->get_savefile_manager(), getSavePath());
_input = new Input(_resource->getLanguage(), _system);
_display = new Display(_resource->getLanguage(), _system, _input);
More information about the Scummvm-git-logs
mailing list