aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorStuart George2006-12-19 01:06:45 +0000
committerStuart George2006-12-19 01:06:45 +0000
commit6c46f3ba26b5cbfe2aa00b9de345ee360dd1af82 (patch)
treec5c4d25686bbd517e64f4b9ca564ba6ee390fa38 /common
parent2e6ad11d6d65d4f02e6b8283b47fa31a9abbc4f3 (diff)
downloadscummvm-rg350-6c46f3ba26b5cbfe2aa00b9de345ee360dd1af82.tar.gz
scummvm-rg350-6c46f3ba26b5cbfe2aa00b9de345ee360dd1af82.tar.bz2
scummvm-rg350-6c46f3ba26b5cbfe2aa00b9de345ee360dd1af82.zip
Added Apple IIgs as machine type for AGI engine
svn-id: r24876
Diffstat (limited to 'common')
-rw-r--r--common/util.cpp4
-rw-r--r--common/util.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/common/util.cpp b/common/util.cpp
index e238abe05f..d67027b873 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -193,6 +193,8 @@ const PlatformDescription g_platforms[] = {
{"segacd", "segacd", "SegaCD", kPlatformSegaCD},
{"windows", "win", "Windows", kPlatformWindows},
+ {"2GS", "2gs", "Apple IIgs", kPlatformApple2GS },
+
{0, 0, "Default", kPlatformUnknown}
};
@@ -320,7 +322,7 @@ bool enableSpecialDebugLevel(const String &option) {
void enableSpecialDebugLevelList(const String &option) {
uint start = 0;
uint end = 0;
-
+
const char *str = option.c_str();
for (end = start + 1; end <= option.size(); ++end) {
if (str[end] == ',' || end == option.size()) {
diff --git a/common/util.h b/common/util.h
index 6fb0e68a90..d7299101f8 100644
--- a/common/util.h
+++ b/common/util.h
@@ -37,7 +37,7 @@
template<typename T> inline T ABS (T x) { return (x>=0) ? x : -x; }
template<typename T> inline T MIN (T a, T b) { return (a<b) ? a : b; }
template<typename T> inline T MAX (T a, T b) { return (a>b) ? a : b; }
-template<typename T> inline T CLIP (T v, T amin, T amax)
+template<typename T> inline T CLIP (T v, T amin, T amax)
{ if (v < amin) return amin; else if (v > amax) return amax; else return v; }
/**
@@ -147,6 +147,8 @@ enum Platform {
kPlatform3DO,
// kPlatformPCEngine,
+ kPlatformApple2GS,
+
kPlatformUnknown = -1
};