libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 12:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved some keyboard code from Winnie together with the other keyboard functions

Browse Source 
svn-id: r28965
This commit is contained in:
Filippos Karapetis 2007-09-19 08:27:32 +00:00
parent 85b1bc594d
commit a89694c0d6
3 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/agi/preagi.h
View File

@ -75,6 +75,8 @@ public:
// Keyboard
int getSelection(SelectionTypes type);
bool waitAnyKeyChoice();
bool getSelOkBack();
int rnd(int hi) { return (_rnd->getRandomNumber(hi) + 1); }
// Text

27
engines/agi/preagi_common.cpp
View File

@ -208,4 +208,31 @@ bool PreAgiEngine::waitAnyKeyChoice() {
}
}
bool PreAgiEngine::getSelOkBack() {
Common::Event event;
for (;;) {
while (_eventMan->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_QUIT:
_system->quit();
break;
case Common::EVENT_LBUTTONUP:
return true;
case Common::EVENT_RBUTTONUP:
return false;
case Common::EVENT_KEYDOWN:
switch (event.kbd.keycode) {
case Common::KEYCODE_BACKSPACE:
return false;
default:
return true;
}
default:
break;
}
}
}
}
}

30
engines/agi/preagi_winnie.cpp
View File

@ -218,7 +218,7 @@ int Winnie::parser(int pc, int index, uint8 *buffer) {
default:
// print description
_vm->printStrXOR((char *)(buffer + pc));
if (getSelOkBack())
if (_vm->getSelOkBack())
return IDI_WTP_PAR_OK;
else
return IDI_WTP_PAR_BACK;
@ -854,7 +854,7 @@ void Winnie::getMenuSel(char *szMenu, int *iSel, int fCanSel[]) {
break;
case Common::KEYCODE_s:
if (event.kbd.flags & Common::KBD_CTRL) {
//FlipSound();
_vm->flipflag(fSoundOn);
} else {
*iSel = IDI_WTP_SEL_SOUTH;
makeSel();
@ -1018,32 +1018,6 @@ void Winnie::drawRoomPic() {
delete [] buffer;
}
bool Winnie::getSelOkBack() {
Common::Event event;
for (;;) {
while (_vm->_system->getEventManager()->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_QUIT:
_vm->_system->quit();
break;
case Common::EVENT_LBUTTONUP:
return true;
case Common::EVENT_RBUTTONUP:
return false;
case Common::EVENT_KEYDOWN:
switch (event.kbd.keycode) {
case Common::KEYCODE_BACKSPACE:
return false;
default:
return true;
}
default:
break;
}
}
}
}
void Winnie::clrMenuSel(int *iSel, int fCanSel[]) {
*iSel = IDI_WTP_SEL_OPT_1;
while (!fCanSel[*iSel]) {