From b31f39e6c6f97d8e05814ee9a14737580f96b94e Mon Sep 17 00:00:00 2001 From: md5 Date: Sun, 10 Apr 2011 05:53:42 +0300 Subject: TINSEL: Changed cdFlags to be non-static and constant --- engines/tinsel/drives.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3