diff options
Diffstat (limited to 'engines/sci/engine/kmisc.cpp')
-rw-r--r-- | engines/sci/engine/kmisc.cpp | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp index dca123663d..42a595cdd8 100644 --- a/engines/sci/engine/kmisc.cpp +++ b/engines/sci/engine/kmisc.cpp @@ -35,7 +35,7 @@ namespace Sci { -reg_t kRestartGame(EngineState *s, int, int argc, reg_t *argv) { +reg_t kRestartGame(EngineState *s, int argc, reg_t *argv) { s->restarting_flags |= SCI_GAME_IS_RESTARTING_NOW; s->restarting_flags &= ~SCI_GAME_WAS_RESTARTED_AT_LEAST_ONCE; // This appears to help @@ -48,7 +48,7 @@ reg_t kRestartGame(EngineState *s, int, int argc, reg_t *argv) { /* kGameIsRestarting(): ** Returns the restarting_flag in acc */ -reg_t kGameIsRestarting(EngineState *s, int, int argc, reg_t *argv) { +reg_t kGameIsRestarting(EngineState *s, int argc, reg_t *argv) { s->r_acc = make_reg(0, (s->restarting_flags & SCI_GAME_WAS_RESTARTED)); if (argc) { // Only happens during replay @@ -59,7 +59,7 @@ reg_t kGameIsRestarting(EngineState *s, int, int argc, reg_t *argv) { return s->r_acc; } -reg_t kHaveMouse(EngineState *s, int, int argc, reg_t *argv) { +reg_t kHaveMouse(EngineState *s, int argc, reg_t *argv) { return make_reg(0, SIGNAL_OFFSET); } @@ -71,7 +71,7 @@ enum kMemoryInfoFunc { K_MEMORYINFO_TOTAL_HUNK = 4 // Total amount of hunk memory (SCI01) }; -reg_t kMemoryInfo(EngineState *s, int, int argc, reg_t *argv) { +reg_t kMemoryInfo(EngineState *s, int argc, reg_t *argv) { const uint16 size = 0x7fff; // Must not be 0xffff, or some memory calculations will overflow switch (argv[0].offset) { @@ -92,13 +92,13 @@ reg_t kMemoryInfo(EngineState *s, int, int argc, reg_t *argv) { return NULL_REG; } -reg_t kFlushResources(EngineState *s, int, int argc, reg_t *argv) { +reg_t kFlushResources(EngineState *s, int argc, reg_t *argv) { run_gc(s); debugC(2, kDebugLevelRoom, "Entering room number %d", argv[0].toUint16()); return s->r_acc; } -reg_t kSetDebug(EngineState *s, int, int argc, reg_t *argv) { +reg_t kSetDebug(EngineState *s, int argc, reg_t *argv) { printf("Debug mode activated\n"); g_debugState.seeking = kDebugSeekNothing; @@ -113,7 +113,7 @@ enum { K_NEW_GETTIME_DATE = 3 }; -reg_t kGetTime(EngineState *s, int, int argc, reg_t *argv) { +reg_t kGetTime(EngineState *s, int argc, reg_t *argv) { tm loc_time; uint32 start_time; int retval = 0; // Avoid spurious warning @@ -163,7 +163,7 @@ enum { K_MEMORY_POKE = 6 }; -reg_t kMemory(EngineState *s, int, int argc, reg_t *argv) { +reg_t kMemory(EngineState *s, int argc, reg_t *argv) { switch (argv[0].toUint16()) { case K_MEMORY_ALLOCATE_CRITICAL : if (!s->segMan->allocDynmem(argv[1].toUint16(), "kMemory() critical", &s->r_acc)) { @@ -220,7 +220,7 @@ reg_t kMemory(EngineState *s, int, int argc, reg_t *argv) { return s->r_acc; } -reg_t kPlatform(EngineState *s, int, int argc, reg_t *argv) { +reg_t kPlatform(EngineState *s, int argc, reg_t *argv) { if (argc == 1) { if (argv[0].toUint16() == 4) if (((SciEngine*)g_engine)->getPlatform() == Common::kPlatformWindows) @@ -238,28 +238,4 @@ reg_t kPlatform(EngineState *s, int, int argc, reg_t *argv) { return NULL_REG; } -reg_t kUnknown(EngineState *s, int funct_nr, int argc, reg_t *argv) { - warning("Unknown kernel function 0x%02x", funct_nr); - return NULL_REG; -} - -reg_t kStub(EngineState *s, int funct_nr, int argc, reg_t *argv) { - char tmpbuf[256]; - snprintf(tmpbuf, sizeof(tmpbuf), "Unimplemented kernel function: 0x%02x (%s) (", - funct_nr, s->_kernel->getKernelName(funct_nr).c_str()); - - for (int i = 0; i < argc; i++) { - char tmpbuf2[20]; - sprintf(tmpbuf2, "%04x:%04x", PRINT_REG(argv[i])); - if (i + 1 < argc) - strcat(tmpbuf2, ", "); - strcat(tmpbuf, tmpbuf2); - } - strcat(tmpbuf, ")"); - - warning("%s", tmpbuf); - - return NULL_REG; -} - } // End of namespace Sci |