aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-07-08 10:28:35 +0000
committerTravis Howell2006-07-08 10:28:35 +0000
commit6ed462e06febcd060348d66a8779362a5b2bc89b (patch)
tree560b089fc1b5955a35c4375687d305b977bb8b04
parentdfbc46f877f072d9526f93661a1b4958436f4140 (diff)
downloadscummvm-rg350-6ed462e06febcd060348d66a8779362a5b2bc89b.tar.gz
scummvm-rg350-6ed462e06febcd060348d66a8779362a5b2bc89b.tar.bz2
scummvm-rg350-6ed462e06febcd060348d66a8779362a5b2bc89b.zip
Rename VAR_WINDOWS_VERSION to VAR_PLATFORM_VERSION
svn-id: r23419
-rw-r--r--engines/scumm/he/intern_he.h2
-rw-r--r--engines/scumm/scumm.cpp2
-rw-r--r--engines/scumm/vars.cpp8
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 377a87c9aa..5fe639db4f 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -397,7 +397,7 @@ protected:
void o80_pickVarRandom();
byte VAR_PLATFORM;
- byte VAR_WINDOWS_VERSION;
+ byte VAR_PLATFORM_VERSION;
byte VAR_CURRENT_CHARSET;
byte VAR_COLOR_DEPTH;
};
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 1a4c5e3590..0763196c12 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -878,7 +878,7 @@ ScummEngine_v80he::ScummEngine_v80he(OSystem *syst, const DetectorResult &dr)
_sndTmrOffs = 0;
VAR_PLATFORM = 0xFF;
- VAR_WINDOWS_VERSION = 0xFF;
+ VAR_PLATFORM_VERSION = 0xFF;
VAR_CURRENT_CHARSET = 0xFF;
VAR_COLOR_DEPTH = 0xFF;
}
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index f5ba50808f..7e2cde25db 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -298,8 +298,8 @@ void ScummEngine_v72he::setupScummVars() {
void ScummEngine_v80he::setupScummVars() {
ScummEngine_v72he::setupScummVars();
- VAR_PLATFORM = 78; // 1 is PC, 2 is Macintosh
- VAR_WINDOWS_VERSION = 79; // 31 is Windows 3.1, 40 is Windows 95+
+ VAR_PLATFORM = 78;
+ VAR_PLATFORM_VERSION = 79;
VAR_CURRENT_CHARSET = 80;
VAR_SOUNDCODE_TMR = 84;
VAR_KEY_STATE = 86;
@@ -653,10 +653,10 @@ void ScummEngine_v80he::resetScummVars() {
if (_game.platform == Common::kPlatformMacintosh) {
VAR(VAR_PLATFORM) = 2;
- VAR(VAR_WINDOWS_VERSION) = 70;
+ VAR(VAR_PLATFORM_VERSION) = 70;
} else {
VAR(VAR_PLATFORM) = 1;
- VAR(VAR_WINDOWS_VERSION) = 40;
+ VAR(VAR_PLATFORM_VERSION) = 40; // 31 is Windows 3.1, 40 is Windows 95+
}
VAR(VAR_COLOR_DEPTH) = 256;
}