aboutsummaryrefslogtreecommitdiff
path: root/sword2
diff options
context:
space:
mode:
authorMax Horn2003-09-08 15:38:34 +0000
committerMax Horn2003-09-08 15:38:34 +0000
commitf23a34c9e5cd236c2454c2dee716841d9dd58acd (patch)
treeea2b309b1146a4d028aa787d6be50f1e44aad914 /sword2
parentea0fcaaea0287e05cbcb883f83153b15c7ee68e8 (diff)
downloadscummvm-rg350-f23a34c9e5cd236c2454c2dee716841d9dd58acd.tar.gz
scummvm-rg350-f23a34c9e5cd236c2454c2dee716841d9dd58acd.tar.bz2
scummvm-rg350-f23a34c9e5cd236c2454c2dee716841d9dd58acd.zip
renamed VersionSettings -> TargetSettings and also renamed some of its members; added GameDetector::findTarget; made launcher use that new method; some initial preparations for Plugin code
svn-id: r10092
Diffstat (limited to 'sword2')
-rw-r--r--sword2/logic.cpp2
-rw-r--r--sword2/sword2.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/sword2/logic.cpp b/sword2/logic.cpp
index 533d8c3e9b..61a6ba8367 100644
--- a/sword2/logic.cpp
+++ b/sword2/logic.cpp
@@ -95,7 +95,7 @@ int logic::Process_session(void) //Tony6June96 (first run 21Oct96)
if (head->fileType!=GAME_OBJECT)
Con_fatal_error("Logic_engine %d not an object", ID);
- cur_object_hub = (_object_hub *) (head+1);
+ cur_object_hub = (_object_hub *) (head+1);
// Zdebug(" %d id(%d) pc(%d)", cur_object_hub->logic_level, cur_object_hub->script_id[cur_object_hub->logic_level], cur_object_hub->script_pc[cur_object_hub->logic_level]);
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index d7cfcde395..5889613a1a 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -78,7 +78,7 @@ uint8 stepOneCycle=0; // for use while game paused
//------------------------------------------------------------------------------------
-static const VersionSettings sword2_settings[] = {
+static const TargetSettings sword2_settings[] = {
/* Broken Sword 2 */
{"sword2", "Broken Sword II", GID_SWORD2, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "players.clu" },
{"sword2demo", "Broken Sword II (Demo)", GID_SWORD2_DEMO, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "players.clu" },
@@ -87,7 +87,7 @@ static const VersionSettings sword2_settings[] = {
Sword2State *g_sword2 = NULL;
-const VersionSettings *Engine_SWORD2_targetList() {
+const TargetSettings *Engine_SWORD2_targetList() {
return sword2_settings;
}