diff options
| author | Travis Howell | 2004-08-23 10:52:10 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-08-23 10:52:10 +0000 |
| commit | d35660a6cb72afa610aba8296ac1b23813be17de (patch) | |
| tree | d00d7a4a51c8bb8947dd48bc670b18350d6598a1 | |
| parent | d8aa9226958c194cb028e9cd46c6fa95fa7f7a72 (diff) | |
| download | scummvm-rg350-d35660a6cb72afa610aba8296ac1b23813be17de.tar.gz scummvm-rg350-d35660a6cb72afa610aba8296ac1b23813be17de.tar.bz2 scummvm-rg350-d35660a6cb72afa610aba8296ac1b23813be17de.zip | |
Switch to case
svn-id: r14712
| -rw-r--r-- | scumm/intern.h | 2 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 3dee94de6a..bb6f1db18d 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -654,8 +654,6 @@ protected: virtual void executeOpcode(byte i); virtual const char *getOpcodeDesc(byte i); - byte stringLen(byte *); - /* Version 7 script opcodes */ void o7_getString(); void o7_objectX(); diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 469eac377b..2b28d8fee8 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -3255,17 +3255,20 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { engine = new ScummEngine_v5(detector, syst, game); break; case 6: - if (game.heversion >= 60) { - // TODO: probably use another variable with version number + switch (game.heversion) { #ifndef __PALM_OS__ - if (game.heversion >= 72) - engine = new ScummEngine_v72he(detector, syst, game); - else if (game.heversion >= 70) - engine = new ScummEngine_v7he(detector, syst, game); - else + case 72: + engine = new ScummEngine_v72he(detector, syst, game); + break; + case 71: + case 70: + engine = new ScummEngine_v7he(detector, syst, game); + break; #endif - engine = new ScummEngine_v6he(detector, syst, game); - } else { + case 60: + engine = new ScummEngine_v6he(detector, syst, game); + break; + default: engine = new ScummEngine_v6(detector, syst, game); } break; |