diff options
| author | Filippos Karapetis | 2009-05-29 08:25:42 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-05-29 08:25:42 +0000 |
| commit | e9444e2b93802d1717901232e2bc4ba1bab37060 (patch) | |
| tree | 1f79ea906ebc54556e47414361a9a155efd7bfe1 /engines/sci/sci.cpp | |
| parent | 637a432b1ffd6bc64f85c61b44b6a7ddb5803467 (diff) | |
| download | scummvm-rg350-e9444e2b93802d1717901232e2bc4ba1bab37060.tar.gz scummvm-rg350-e9444e2b93802d1717901232e2bc4ba1bab37060.tar.bz2 scummvm-rg350-e9444e2b93802d1717901232e2bc4ba1bab37060.zip | |
- Rewrote kSetCursor to be a bit simpler to understand, and got rid of GF_SCI1_NEWSETCURSOR
- Removed the 3 mouse pointer view, loop and cell variables (and their 3 "save" versions) from the game state, as they're all actually not used anywhere
- Cleanup
svn-id: r40976
Diffstat (limited to 'engines/sci/sci.cpp')
| -rw-r--r-- | engines/sci/sci.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index d12a791c88..1e6384e684 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -195,8 +195,7 @@ Common::Error SciEngine::run() { // SCI0/SCI01 if (gamestate->flags & GF_SCI1_EGA || gamestate->flags & GF_SCI1_LOFSABSOLUTE || - gamestate->flags & GF_SCI1_NEWDOSOUND || - gamestate->flags & GF_SCI1_NEWSETCURSOR) { + gamestate->flags & GF_SCI1_NEWDOSOUND) { error("This game entry is erroneous. It's marked as SCI0/SCI01, but it has SCI1 flags set"); } } else if (version >= SCI_VERSION_1_EARLY && version <= SCI_VERSION_1_LATE) { @@ -210,8 +209,7 @@ Common::Error SciEngine::run() { } else if (version == SCI_VERSION_1_1 || version == SCI_VERSION_32) { if (gamestate->flags & GF_SCI1_EGA || gamestate->flags & GF_SCI1_LOFSABSOLUTE || - gamestate->flags & GF_SCI1_NEWDOSOUND || - gamestate->flags & GF_SCI1_NEWSETCURSOR) { + gamestate->flags & GF_SCI1_NEWDOSOUND) { error("This game entry is erroneous. It's marked as SCI1.1/SCI32, but it has SCI1 flags set"); } |