libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add a debug console in Winnie (patch by clone2727)

Browse Source 
svn-id: r29215
This commit is contained in:
Filippos Karapetis 2007-10-13 23:48:59 +00:00
parent 86b6429e97
commit a08b6606a6
6 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/agi/console.cpp
View File

@ -243,4 +243,20 @@ bool Console::Cmd_Cont(int argc, const char **argv) {
return true;
}
PreAGI_Console::PreAGI_Console(PreAgiEngine *vm) {
_vm = vm;
}
Winnie_Console::Winnie_Console(PreAgiEngine *vm, Winnie *winnie) : PreAGI_Console(vm) {
_winnie = winnie;
DCmd_Register("curRoom", WRAP_METHOD(Winnie_Console, Cmd_CurRoom));
}
bool Winnie_Console::Cmd_CurRoom(int argc, const char **argv) {
_winnie->debugCurRoom();
return true;
}
} // End of namespace Agi

30
engines/agi/console.h
View File

@ -28,6 +28,8 @@
#include "gui/debugger.h"
#include "agi/preagi_winnie.h"
namespace Agi {
class AgiEngine;
@ -73,6 +75,34 @@ private:
AgiEngine *_vm;
};
class PreAGI_Console : public GUI::Debugger {
public:
PreAGI_Console(PreAgiEngine *vm);
virtual ~PreAGI_Console(void) {}
protected:
virtual void preEnter() {}
virtual void postEnter() {}
private:
PreAgiEngine *_vm;
};
class Winnie_Console : public PreAGI_Console {
public:
Winnie_Console(PreAgiEngine *vm, Winnie *winnie);
virtual ~Winnie_Console(void) {}
protected:
virtual void preEnter() {}
virtual void postEnter() {}
private:
Winnie *_winnie;
bool Cmd_CurRoom(int argc, const char **argv);
};
} // End of namespace Agi
#endif /* AGI_CONSOLE_H */

1
engines/agi/preagi.h
View File

@ -56,6 +56,7 @@ public:
GfxMgr *_gfx;
SoundMgr *_sound;
PictureMgr *_picture;
PreAGI_Console *_console;
void clearImageStack() {}
void recordImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,

10
engines/agi/preagi_common.cpp
View File

@ -133,6 +133,14 @@ int PreAgiEngine::getSelection(SelectionTypes type) {
if (type == kSelYesNo || type == kSelAnyKey)
return 1;
case Common::EVENT_KEYDOWN:
if (event.kbd.keycode == Common::KEYCODE_d && (event.kbd.flags & Common::KBD_CTRL) && _console) {
_console->attach();
_console->onFrame();
//FIXME: If not cleared, clicking again will start the console
event.kbd.keycode = Common::KEYCODE_INVALID;
event.kbd.flags = 0;
continue;
}
switch (event.kbd.keycode) {
case Common::KEYCODE_y:
if (type == kSelYesNo)
@ -161,6 +169,8 @@ int PreAgiEngine::getSelection(SelectionTypes type) {
if (type == kSelBackspace)
return 0;
default:
if (event.kbd.flags & Common::KBD_CTRL)
break;
if (type == kSelYesNo) {
return 2;
} else if (type == kSelNumber) {

20
engines/agi/preagi_winnie.cpp
View File

@ -919,6 +919,12 @@ void Winnie::getMenuSel(char *szMenu, int *iSel, int fCanSel[]) {
incMenuSel(iSel, fCanSel);
break;
case Common::EVENT_KEYDOWN:
if (event.kbd.keycode == Common::KEYCODE_d && (event.kbd.flags & Common::KBD_CTRL) && _vm->_console) {
_vm->_console->attach();
_vm->_console->onFrame();
continue;
}
switch (event.kbd.keycode) {
case Common::KEYCODE_ESCAPE:
*iSel = IDI_WTP_SEL_HOME;
@ -1006,8 +1012,10 @@ void Winnie::getMenuSel(char *szMenu, int *iSel, int fCanSel[]) {
break;
}
default:
keyHelp();
clrMenuSel(iSel, fCanSel);
if (!(event.kbd.flags & Common::KBD_CTRL)) {
keyHelp();
clrMenuSel(iSel, fCanSel);
}
break;
}
break;
@ -1213,8 +1221,14 @@ void Winnie::loadGame() {
free(buffer);
}
Winnie::Winnie(PreAgiEngine* vm) : _vm(vm) {
// Console-related functions
void Winnie::debugCurRoom() {
_vm->_console->DebugPrintf("Current Room = %d\n", _room);
}
Winnie::Winnie(PreAgiEngine* vm) : _vm(vm) {
_vm->_console = new Winnie_Console(_vm, this);
}
void Winnie::init() {

3
engines/agi/preagi_winnie.h
View File

@ -304,6 +304,8 @@ public:
void init();
void run();
void debugCurRoom();
private:
PreAgiEngine *_vm;
WTP_SAVE_GAME _game;
@ -360,3 +362,4 @@ private:
#endif