diff options
| author | Oliver Kiehl | 2003-07-30 19:25:31 +0000 |
|---|---|---|
| committer | Oliver Kiehl | 2003-07-30 19:25:31 +0000 |
| commit | 0f85cc306137e866adbe17ff7498e20d61a7938d (patch) | |
| tree | 52729ad8ac05c3b48aab7fda2aaf0b1da827fb43 /common | |
| parent | 26d05c0190c9cca1444cc7a004c1149b3358ab10 (diff) | |
| download | scummvm-rg350-0f85cc306137e866adbe17ff7498e20d61a7938d.tar.gz scummvm-rg350-0f85cc306137e866adbe17ff7498e20d61a7938d.tar.bz2 scummvm-rg350-0f85cc306137e866adbe17ff7498e20d61a7938d.zip | |
rename bs2 to sword2 to have the same name as the original engine.
besides this way all our engines start with an "s" ;)
svn-id: r9301
Diffstat (limited to 'common')
| -rw-r--r-- | common/engine.cpp | 6 | ||||
| -rw-r--r-- | common/engine.h | 10 | ||||
| -rw-r--r-- | common/gameDetector.cpp | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/common/engine.cpp b/common/engine.cpp index 8c1132431e..1955df16fd 100644 --- a/common/engine.cpp +++ b/common/engine.cpp @@ -144,10 +144,10 @@ Engine *Engine::createFromDetector(GameDetector *detector, OSystem *syst) { } #endif -#ifndef DISABLE_BS2 - if (detector->_game.id >= GID_BS2_FIRST && detector->_game.id <= GID_BS2_LAST) { +#ifndef DISABLE_SWORD2 + if (detector->_game.id >= GID_SWORD2_FIRST && detector->_game.id <= GID_SWORD2_LAST) { // Broken Sword 2 - engine = Engine_BS2_create(detector, syst); + engine = Engine_SWORD2_create(detector, syst); } #endif diff --git a/common/engine.h b/common/engine.h index 5015f670e8..e1385ea428 100644 --- a/common/engine.h +++ b/common/engine.h @@ -41,8 +41,8 @@ enum GameId { GID_SKY_LAST = GID_SKY_FIRST + 49, // Broken Sword 2 - GID_BS2_FIRST, - GID_BS2_LAST = GID_BS2_FIRST + 49 + GID_SWORD2_FIRST, + GID_SWORD2_LAST = GID_SWORD2_FIRST + 49 }; @@ -116,9 +116,9 @@ extern const VersionSettings *Engine_SKY_targetList(); extern Engine *Engine_SKY_create(GameDetector *detector, OSystem *syst); #endif -#ifndef DISABLE_BS2 -extern const VersionSettings *Engine_BS2_targetList(); -extern Engine *Engine_BS2_create(GameDetector *detector, OSystem *syst); +#ifndef DISABLE_SWORD2 +extern const VersionSettings *Engine_SWORD2_targetList(); +extern Engine *Engine_SWORD2_create(GameDetector *detector, OSystem *syst); #endif #endif diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index 15ca149510..af2061a712 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -231,10 +231,10 @@ GameDetector::GameDetector() { totalCount += skyCount; #endif -#ifndef DISABLE_BS2 - const VersionSettings *bs2Versions = Engine_BS2_targetList(); - int bs2Count = countVersions(bs2Versions); - totalCount += bs2Count; +#ifndef DISABLE_SWORD2 + const VersionSettings *sword2Versions = Engine_SWORD2_targetList(); + int sword2Count = countVersions(sword2Versions); + totalCount += sword2Count; #endif VersionSettings *v = (VersionSettings *)calloc(totalCount + 1, sizeof(VersionSettings)); @@ -255,9 +255,9 @@ GameDetector::GameDetector() { v += skyCount; #endif -#ifndef DISABLE_BS2 - memcpy(v, bs2Versions, bs2Count * sizeof(VersionSettings)); - v += bs2Count; +#ifndef DISABLE_SWORD2 + memcpy(v, sword2Versions, sword2Count * sizeof(VersionSettings)); + v += sword2Count; #endif } |