diff options
author | uruk | 2014-05-05 18:59:17 +0200 |
---|---|---|
committer | uruk | 2014-05-05 18:59:17 +0200 |
commit | b595d9ee0a66c3a8980b0c513529bd0ff0ffe5b5 (patch) | |
tree | 89e5732d53b5face29f22632ee3374044b26c7f0 /engines/cge2/cge2.cpp | |
parent | 8e3bbbea7c97ac222a7f061b68fe161b455bf0f8 (diff) | |
download | scummvm-rg350-b595d9ee0a66c3a8980b0c513529bd0ff0ffe5b5.tar.gz scummvm-rg350-b595d9ee0a66c3a8980b0c513529bd0ff0ffe5b5.tar.bz2 scummvm-rg350-b595d9ee0a66c3a8980b0c513529bd0ff0ffe5b5.zip |
CGE2: Add Text and a reduced skeleton of cge2_main.
Diffstat (limited to 'engines/cge2/cge2.cpp')
-rw-r--r-- | engines/cge2/cge2.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp index 370846faf7..bc2ce5615d 100644 --- a/engines/cge2/cge2.cpp +++ b/engines/cge2/cge2.cpp @@ -31,6 +31,7 @@ #include "cge2/bitmap.h" #include "cge2/vga13h.h" #include "cge2/sound.h" +#include "cge2/text.h" namespace CGE2 { @@ -42,11 +43,13 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription) _midiPlayer = nullptr; _fx = nullptr; _sound = nullptr; + _text = nullptr; _quitFlag = false; _bitmapPalette = nullptr; _mode = 0; _music = true; + _startupMode = 1; } void CGE2Engine::init() { @@ -55,6 +58,7 @@ void CGE2Engine::init() { _fx = new Fx(this, 16); _sound = new Sound(this); _midiPlayer = new MusicPlayer(this); + _text = new Text(this, "CGE"); } void CGE2Engine::deinit() { @@ -64,6 +68,7 @@ void CGE2Engine::deinit() { delete _fx; delete _sound; delete _midiPlayer; + delete _text; } bool CGE2Engine::hasFeature(EngineFeature f) const { @@ -93,12 +98,8 @@ Common::Error CGE2Engine::run() { initGraphics(kScrWidth, kScrHeight, false); init(); - - showTitle("WELCOME"); - // Temporary code to test the midi player. - _midiPlayer->loadMidi(1); - g_system->delayMillis(100000); + cge2_main(); deinit(); return Common::kNoError; |