diff options
| author | Filippos Karapetis | 2009-02-21 18:12:02 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-02-21 18:12:02 +0000 |
| commit | 3cd9706c63330403e8d9ef3071697909bbb1f652 (patch) | |
| tree | cf25aa1e7c74235adf90e91d32597fd4a9bd773e /engines/sci | |
| parent | 199121a04e1e753cf732ed0d6e4a4d50487339c4 (diff) | |
| download | scummvm-rg350-3cd9706c63330403e8d9ef3071697909bbb1f652.tar.gz scummvm-rg350-3cd9706c63330403e8d9ef3071697909bbb1f652.tar.bz2 scummvm-rg350-3cd9706c63330403e8d9ef3071697909bbb1f652.zip | |
Now that we've placed everything under the Sci namespace, the Sci:: bits can be removed
svn-id: r38714
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/engine/kernel.cpp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index dbb6a9a125..d39355bff5 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -478,8 +478,7 @@ reg_t k_Unknown(EngineState *s, int funct_nr, int argc, reg_t *argv) { reg_t kFlushResources(EngineState *s, int funct_nr, int argc, reg_t *argv) { run_gc(s); - // FIXME: remove the Sci:: bit once this belongs to the Sci namespace - debugC(2, Sci::kDebugLevelRoom, "Entering room number %d", UKPV(0)); + debugC(2, kDebugLevelRoom, "Entering room number %d", UKPV(0)); return s->r_acc; } @@ -513,12 +512,10 @@ reg_t kGetTime(EngineState *s, int funct_nr, int argc, reg_t *argv) { if (s->version < SCI_VERSION_FTU_NEW_GETTIME) { // Use old semantics if (argc) { // Get seconds since last am/pm switch retval = loc_time.tm_sec + loc_time.tm_min * 60 + (loc_time.tm_hour % 12) * 3600; - // FIXME: remove the Sci:: bit once this belongs to the Sci namespace - debugC(2, Sci::kDebugLevelTime, "GetTime(timeofday) returns %d", retval); + debugC(2, kDebugLevelTime, "GetTime(timeofday) returns %d", retval); } else { // Get time since game started retval = start_time * 60; - // FIXME: remove the Sci:: bit once this belongs to the Sci namespace - debugC(2, Sci::kDebugLevelTime, "GetTime(elapsed) returns %d", retval); + debugC(2, kDebugLevelTime, "GetTime(elapsed) returns %d", retval); } } else { int mode = UKPV_OR_ALT(0, 0); @@ -528,27 +525,23 @@ reg_t kGetTime(EngineState *s, int funct_nr, int argc, reg_t *argv) { switch (mode) { case _K_NEW_GETTIME_TICKS : { retval = start_time * 60; - // FIXME: remove the Sci:: bit once this belongs to the Sci namespace - debugC(2, Sci::kDebugLevelTime, "GetTime(elapsed) returns %d", retval); + debugC(2, kDebugLevelTime, "GetTime(elapsed) returns %d", retval); break; } case _K_NEW_GETTIME_TIME_12HOUR : { loc_time.tm_hour %= 12; retval = (loc_time.tm_min << 6) | (loc_time.tm_hour << 12) | (loc_time.tm_sec); - // FIXME: remove the Sci:: bit once this belongs to the Sci namespace - debugC(2, Sci::kDebugLevelTime, "GetTime(12h) returns %d", retval); + debugC(2, kDebugLevelTime, "GetTime(12h) returns %d", retval); break; } case _K_NEW_GETTIME_TIME_24HOUR : { retval = (loc_time.tm_min << 5) | (loc_time.tm_sec >> 1) | (loc_time.tm_hour << 11); - // FIXME: remove the Sci:: bit once this belongs to the Sci namespace - debugC(2, Sci::kDebugLevelTime, "GetTime(24h) returns %d", retval); + debugC(2, kDebugLevelTime, "GetTime(24h) returns %d", retval); break; } case _K_NEW_GETTIME_DATE : { retval = (loc_time.tm_mon << 5) | loc_time.tm_mday | (loc_time.tm_year << 9); - // FIXME: remove the Sci:: bit once this belongs to the Sci namespace - debugC(2, Sci::kDebugLevelTime, "GetTime(date) returns %d", retval); + debugC(2, kDebugLevelTime, "GetTime(date) returns %d", retval); break; } default: { |