diff options
Diffstat (limited to 'scumm/scumm.h')
| -rw-r--r-- | scumm/scumm.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 71d1572e5e..fcb3af4bb7 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -384,14 +384,19 @@ public: ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]); virtual ~ScummEngine(); + /** Startup function: Calls mainInit and then mainRun. */ + void go(); + // Init functions - virtual void scummInit(); - void initScummVars(); + void mainInit(); + virtual void setupScummVars(); + void initScummVars(); - // Startup functions - void launch(); - void go(); + virtual void scummInit(); + + void loadCJKFont(); + void setupMusic(int midi); // Scumm main loop void mainRun(); @@ -1091,7 +1096,7 @@ protected: byte _haveMsg; bool _useTalkAnims; uint16 _defaultTalkDelay; - int tempMusic; + int _tempMusic; int _saveSound; bool _native_mt32; int _midiDriver; // Use the MD_ values from mididrv.h |