thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SAGA2: Drop custom TRUE/FALSE

Browse source
This commit is contained in:
Eugene Sandulenko 2021-06-13 16:56:52 +02:00
parent 4eebd6d6bf
commit 97f7a0e529
No known key found for this signature in database
GPG key ID: 014D387312D34F08
96 changed files with 1251 additions and 1259 deletions
Download patch file Download diff file Expand all files Collapse all files

22
engines/saga2/msgbox.cpp
View file

@ -147,7 +147,7 @@ ErrorWindow::ErrorWindow(char *msg, char *btnMsg1, char *btnMsg2)
// requester info struct
rInfo.result = -1;
rInfo.running = TRUE;
rInfo.running = true;
strcpy(mbChs1Text, "\x13");
strcpy(mbChs2Text, "\x1B");
@ -179,7 +179,7 @@ ErrorWindow::ErrorWindow(char *msg, char *btnMsg1, char *btnMsg2)
int16 ErrorWindow::getResult(void) {
open();
draw();
EventLoop(rInfo.running, TRUE);
EventLoop(rInfo.running, true);
return rInfo.result;
}
@ -193,25 +193,25 @@ void ErrorWindow::ErrorModeHandleKey(short key, short) {
if (strchr(mbChs2Text, tolower(key)) ||
strchr(mbChs2Text, toupper(key))) {
rInfo.result = 2;
rInfo.running = FALSE;
rInfo.running = false;
return;
}
if (strchr(mbChs1Text, tolower(key)) ||
strchr(mbChs1Text, toupper(key))) {
rInfo.result = 1;
rInfo.running = FALSE;
rInfo.running = false;
return;
}
if (numBtns < 2) {
rInfo.result = 1;
rInfo.running = FALSE;
rInfo.running = false;
return;
}
}
GameMode SimpleMode = {
NULL, // no previous mode
FALSE, // mode is not nestable
false, // mode is not nestable
ErrorWindow::ErrorModeSetup,
ErrorWindow::ErrorModeCleanup,
ErrorWindow::ErrorModeHandleTask,
@ -240,7 +240,7 @@ SimpleWindow::~SimpleWindow(void) {
}
bool SimpleWindow::isModal(void) {
return TRUE;
return true;
}
void SimpleWindow::update(const Rect16 &) {
@ -261,7 +261,7 @@ void SimpleWindow::drawClipped(
int16 textPos = textPosHigh;
//textPallete pal( 33+9, 36+9, 41+9, 34+9, 40+9, 43+9 );
textPallete pal(33 + 9, 33 + 9, 41 + 9, 33 + 9, 33 + 9, 41 + 9);
bool selected = FALSE;
bool selected = false;
box.x += 10;
box.y += 10;
@ -380,14 +380,14 @@ bool SimpleButton::activate(gEventType why) {
deactivate();
notify(gEventNewValue, 1); // notify App of successful hit
}
return FALSE;
return false;
}
bool SimpleButton::pointerHit(gPanelMessage &) {
//if (ghosted) return FALSE;
//if (ghosted) return false;
activate(gEventMouseDown);
return TRUE;
return true;
}
void SimpleButton::pointerRelease(gPanelMessage &) {