From 0770800844854ade735524b33e04b0a7858eefe7 Mon Sep 17 00:00:00 2001 From: Joseph-Eugene Winzer Date: Wed, 21 Feb 2018 22:57:58 +0100 Subject: SUPERNOVA: Removes Console commands Most of them were for debugging only anyway and commands like `giveall` actually broke parts of the game (and didn't even give you all items). --- engines/supernova/console.cpp | 77 ------------------------------------------- engines/supernova/console.h | 6 ---- 2 files changed, 83 deletions(-) diff --git a/engines/supernova/console.cpp b/engines/supernova/console.cpp index 4dc7f04794..9e7c15ca77 100644 --- a/engines/supernova/console.cpp +++ b/engines/supernova/console.cpp @@ -30,85 +30,8 @@ namespace Supernova { Console::Console(SupernovaEngine *vm, GameManager *gm) { - registerCmd("render", WRAP_METHOD(Console, cmdRenderImage)); - registerCmd("play", WRAP_METHOD(Console, cmdPlaySound)); - registerCmd("music", WRAP_METHOD(Console, cmdMusic)); - registerCmd("list", WRAP_METHOD(Console, cmdList)); - registerCmd("inventory", WRAP_METHOD(Console, cmdInventory)); - registerCmd("giveall", WRAP_METHOD(Console, cmdGiveAll)); - _vm = vm; _gm = gm; } -bool Console::cmdRenderImage(int argc, const char **argv) { - if (argc != 3) { - debugPrintf("Usage: render [filenumber] [section]\n"); - return true; - } - - int image = atoi(argv[1]); - if (_vm->setCurrentImage(image)) - _vm->renderImage(atoi(argv[2])); - else - debugPrintf("Image %d is invalid!", image); - - return true; -} - -bool Console::cmdPlaySound(int argc, const char **argv) { - if (argc != 2) { - debugPrintf("Usage: play [0-%d]\n", kAudioNumSamples - 1); - return true; - } - - int sample = Common::String(argv[1]).asUint64(); - _vm->playSound(static_cast(sample)); - - return true; -} - -bool Console::cmdMusic(int argc, const char **argv) { - if (argc != 2) { - debugPrintf("Usage: music [49/52]\n"); - return true; - } - - _vm->playSoundMod(atoi(argv[1])); - - return true; -} - -bool Console::cmdList(int argc, const char **argv) { - // Objects in room and sections - - return true; -} - -bool Console::cmdInventory(int argc, const char **argv) { - if (argc != 2 && argc != 3) { - debugPrintf("Usage: inventory [list][add/remove [object]]"); - return true; - } - - // TODO - - return true; -} - -bool Console::cmdGiveAll(int argc, const char **argv) { - _gm->takeObject(*_gm->_rooms[INTRO]->getObject(0)); - _gm->takeObject(*_gm->_rooms[INTRO]->getObject(1)); - _gm->takeObject(*_gm->_rooms[INTRO]->getObject(2)); - _gm->takeObject(*_gm->_rooms[GENERATOR]->getObject(2)); // Commander Keycard - _gm->takeObject(*_gm->_rooms[GENERATOR]->getObject(0)); // Power Cord with Plug - _gm->takeObject(*_gm->_rooms[CABIN_L1]->getObject(5)); // Pen - _gm->takeObject(*_gm->_rooms[CABIN_R3]->getObject(0)); // Chess Board - _gm->takeObject(*_gm->_rooms[CABIN_R3]->getObject(9)); // Rope - _gm->takeObject(*_gm->_rooms[AIRLOCK]->getObject(4)); // Helmet - _gm->takeObject(*_gm->_rooms[AIRLOCK]->getObject(5)); // Space Suit - _gm->takeObject(*_gm->_rooms[AIRLOCK]->getObject(6)); // Supply - return true; -} - } diff --git a/engines/supernova/console.h b/engines/supernova/console.h index 74b40c25f8..32642c8ce7 100644 --- a/engines/supernova/console.h +++ b/engines/supernova/console.h @@ -39,12 +39,6 @@ public: Console(Supernova::SupernovaEngine *vm, Supernova::GameManager *gm); virtual ~Console() {} - bool cmdRenderImage(int argc, const char **argv); - bool cmdPlaySound(int argc, const char **argv); - bool cmdMusic(int argc, const char **argv); - bool cmdList(int argc, const char **argv); - bool cmdInventory(int argc, const char **argv); - bool cmdGiveAll(int argc, const char **argv); private: SupernovaEngine *_vm; GameManager *_gm; -- cgit v1.2.3