Ticket #8857: kyra3-debugger.diff

debugger.cpp

@@ -29 +29 @@
 #include "kyra/debugger.h"
 #include "kyra/kyra_v1.h"
 #include "kyra/kyra_v2.h"
+#include "kyra/kyra_v3.h"
 #include "kyra/screen.h"
 #include "kyra/timer.h"
 #include "kyra/resource.h"
@@ -449 +450 @@
                 _vm->_dbgPass = val;            
         } else {
                 DebugPrintf("Syntax: pass_codes <0/1>\n");
+        }
+
+        return true;
+}
+
+Debugger_v3::Debugger_v3(KyraEngine_v3 *vm) : Debugger(vm), _vm(vm) {
+        DCmd_Register("continue",                       WRAP_METHOD(Debugger_v3, Cmd_Exit));
+        DCmd_Register("give",                           WRAP_METHOD(Debugger_v3, cmd_giveItem));
+}
+
+bool Debugger_v3::cmd_giveItem(int argc, const char **argv) {
+        if (argc == 2) {
+                int item = atoi(argv[1]);
+
+                // Kyrandia 3 has only 73 items (-1 to 71), otherwise it will crash
+                if (item < -1 || item > 71) {
+                        DebugPrintf("itemid must be any value between (including) -1 and 71\n");
+                        return true;
+                }
+
+                _vm->setHandItem(item);
+        } else {
+                DebugPrintf("Syntax: give <itemid>\n");
         }
 
         return true;

debugger.h

@@ -33 +33 @@
 class KyraEngine;
 class KyraEngine_v1;
 class KyraEngine_v2;
+class KyraEngine_v3;
 
 class Debugger : public ::GUI::Debugger {
 public:
@@ -86 +87 @@
         bool cmd_giveItem(int argc, const char **argv);
         bool cmd_passcodes(int argc, const char **argv);
 };
+
+class Debugger_v3 : public Debugger {
+public:
+        Debugger_v3(KyraEngine_v3 *vm);
+        virtual ~Debugger_v3() {}
+
+protected:
+        KyraEngine_v3 *_vm;
+        
+        bool cmd_giveItem(int argc, const char **argv); 
+};
+
 
 } // End of namespace Kyra
 

kyra_v3.cpp

@@ -32 +32 @@
 #include "kyra/vqa.h"
 #include "kyra/gui.h"
 #include "kyra/timer.h"
+#include "kyra/debugger.h"
 
 #include "common/system.h"
 #include "common/config-manager.h"
@@ -130 +131 @@
         _invWsaFrame = -1;
         _score = 0;
         memset(_scoreFlagTable, 0, sizeof(_scoreFlagTable));
+        _debugger = 0;
 }
 
 KyraEngine_v3::~KyraEngine_v3() {
@@ -188 +190 @@
         delete [] _stringBuffer;
         delete [] _newShapeFiledata;
         delete _invWsa;
+        delete _debugger;
 }
 
 int KyraEngine_v3::init() {
@@ -197 +200 @@
                 error("_screen->init() failed");
 
         KyraEngine::init();
+        
+        _debugger = new Debugger_v3(this);
+        assert(_debugger);
 
         _soundDigital = new SoundDigital(this, _mixer);
         assert(_soundDigital);
@@ -1344 +1350 @@
                 default:
                         break;
                 }
+                
+    if (_debugger->isAttached())
+                _debugger->onFrame();
+                
         }
 }
 
@@ -1376 +1386 @@
                                 if (event.kbd.keycode == 'd')
                                         _debugger->attach();
                         }*/
+
+                        if (event.kbd.flags == Common::KBD_CTRL) {
+                                if (event.kbd.keycode == 'd')
+                                        _debugger->attach();
+                        }
+                        
                         break;
 
                 case Common::EVENT_MOUSEMOVE: {

kyra_v3.h

@@ -40 +40 @@
 class MainMenu;
 class WSAMovieV2;
 class TextDisplayer_v3;
+class Debugger_v3;
 struct Button;
 
 class KyraEngine_v3 : public KyraEngine {
+friend class Debugger_v3;
 friend class TextDisplayer_v3;
 public:
         KyraEngine_v3(OSystem *system, const GameFlags &flags);
@@ -742 +744 @@
 
         // misc
         TextDisplayer_v3 *_text;
+        Debugger_v3 *_debugger; 
         bool _wsaPlayingVQA;
 
         // resource specific