diff options
author | Max Horn | 2003-05-20 20:42:28 +0000 |
---|---|---|
committer | Max Horn | 2003-05-20 20:42:28 +0000 |
commit | 1a394aa3c764c8a50def5bb9d8aa1342d962fbdd (patch) | |
tree | fc456ba99a56a6b594cc4817807a59531af2ecd2 /scumm/scummvm.cpp | |
parent | 410f8b48264ed9fd02f0d18d462d74a67688f9fa (diff) | |
download | scummvm-rg350-1a394aa3c764c8a50def5bb9d8aa1342d962fbdd.tar.gz scummvm-rg350-1a394aa3c764c8a50def5bb9d8aa1342d962fbdd.tar.bz2 scummvm-rg350-1a394aa3c764c8a50def5bb9d8aa1342d962fbdd.zip |
added enum's for the known actor/object claasses; extended putClass/getClass to translate the X/Y flip classes; made code use the new enum's; some other cleanup
svn-id: r7753
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r-- | scumm/scummvm.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 1fd9e91b07..18be9f9983 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -542,9 +542,6 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _hexdumpScripts = false; _showStack = false; - if (_features & GF_SMALL_HEADER) - Actor::INVALID_BOX = 255; - if (_gameId == GID_ZAK256) { // FmTowns is 320x240 _screenWidth = 320; _screenHeight = 240; @@ -695,11 +692,11 @@ void Scumm::scummInit() { setupCursor(); // Allocate and Initialize actors + Actor::initActorClass(this); _actors = new Actor[_numActors]; for (i = 1; i < _numActors; i++) { a = derefActor(i); a->number = i; - a->initActorClass(this); a->initActor(1); } |