diff options
| author | Gregory Montoir | 2004-11-10 18:09:14 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-11-10 18:09:14 +0000 |
| commit | 507d02d8d224a91fadec6914136c657a56e945fe (patch) | |
| tree | 9ff588666bef445304f3444178c9a979e6eefdbd /kyra/kyra.cpp | |
| parent | 695667d93432dbf34c7dbd3a344eb4f031e00933 (diff) | |
| download | scummvm-rg350-507d02d8d224a91fadec6914136c657a56e945fe.tar.gz scummvm-rg350-507d02d8d224a91fadec6914136c657a56e945fe.tar.bz2 scummvm-rg350-507d02d8d224a91fadec6914136c657a56e945fe.zip | |
get rid of the gameDataPath stuff as File::open already handles it
svn-id: r15781
Diffstat (limited to 'kyra/kyra.cpp')
| -rw-r--r-- | kyra/kyra.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index b4f53a7fef..04304324fa 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -99,14 +99,12 @@ KyraEngine::KyraEngine(GameDetector *detector, OSystem *syst) _mixer->setVolume(ConfMan.getInt("sfx_volume") * ConfMan.getInt("master_volume") / 255); - //getGameDataPath(); - // Initialize backen syst->initSize(320, 200); - _screen = new uint8[320*200]; - memset((void*)_screen, 0, sizeof(_screen)); + _screen = new uint8[320 * 200]; + memset(_screen, 0, 320 * 200); - _resMgr = new Resourcemanager(this, getGameDataPath()); + _resMgr = new Resourcemanager(this); assert(_resMgr); setCurrentPalette(_resMgr->loadPalette("PALETTE.COL")); @@ -125,6 +123,7 @@ KyraEngine::KyraEngine(GameDetector *detector, OSystem *syst) KyraEngine::~KyraEngine() { delete _resMgr; + delete _screen; delete _mouse; delete _items; delete _npcScript; @@ -175,7 +174,7 @@ void KyraEngine::shutdown() { } void KyraEngine::updateScreen(void) { - _system->copyRectToScreen(_screen, 320, 0, 0, 320, 240); + _system->copyRectToScreen(_screen, 320, 0, 0, 320, 200); _system->updateScreen(); } |