diff options
| author | md5 | 2011-04-10 05:53:42 +0300 |
|---|---|---|
| committer | md5 | 2011-04-10 14:27:48 +0300 |
| commit | b31f39e6c6f97d8e05814ee9a14737580f96b94e (patch) | |
| tree | c8e0942578ad6a1093e20b63d17eb5ad9654810a | |
| parent | 69ec4fbf1be753f67c8de06fc9efc58786a255c3 (diff) | |
| download | scummvm-rg350-b31f39e6c6f97d8e05814ee9a14737580f96b94e.tar.gz scummvm-rg350-b31f39e6c6f97d8e05814ee9a14737580f96b94e.tar.bz2 scummvm-rg350-b31f39e6c6f97d8e05814ee9a14737580f96b94e.zip | |
TINSEL: Changed cdFlags to be non-static and constant
| -rw-r--r-- | engines/tinsel/drives.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp index 6e30caf006..e6f5f1ed0b 100644 --- a/engines/tinsel/drives.cpp +++ b/engines/tinsel/drives.cpp @@ -38,7 +38,6 @@ namespace Tinsel { // FIXME: Avoid non-const global vars char currentCD = '1'; -static uint32 cdFlags[] = { fCd1, fCd2, fCd3, fCd4, fCd5, fCd6, fCd7, fCd8 }; static bool bChangingCD = false; static char nextCD = '\0'; @@ -75,6 +74,8 @@ int GetCurrentCD() { return (currentCD - '1' + 1); } +const uint32 cdFlags[] = { fCd1, fCd2, fCd3, fCd4, fCd5, fCd6, fCd7, fCd8 }; + void SetCD(int flags) { if (flags & cdFlags[currentCD - '1']) return; |