aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/agos.cpp2
-rw-r--r--engines/agos/agos.h12
-rw-r--r--engines/agos/charset.cpp26
-rw-r--r--engines/agos/icons.cpp2
-rw-r--r--engines/agos/window.cpp2
5 files changed, 19 insertions, 25 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 1906f49183..e1071f5165 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -315,8 +315,6 @@ AGOSEngine::AGOSEngine(OSystem *syst)
_fastFadeCount = 0;
_fastFadeInFlag = 0;
_fastFadeOutFlag = 0;
- _unkPalFlag = 0;
- _usePaletteDelay = 0;
_exitCutscene = 0;
_paletteFlag = 0;
_bottomPalette = 0;
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index db0b2865e9..bc2e2e4b16 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -387,8 +387,6 @@ protected:
uint16 _scrollDownHitArea;
bool _fastFadeOutFlag;
- bool _unkPalFlag;
- bool _usePaletteDelay;
byte _paletteFlag;
int _bottomPalette;
uint _fastFadeCount;
@@ -763,8 +761,8 @@ protected:
void displayBoxStars();
void invertBox(HitArea * ha, byte a, byte b, byte c, byte d);
- virtual void handleMouseMoved();
void initMouse();
+ virtual void handleMouseMoved();
virtual void drawMousePointer();
virtual void addArrows(WindowBlock *window);
@@ -776,8 +774,6 @@ protected:
virtual uint setupIconHitArea(WindowBlock *window, uint num, uint x, uint y, Item *item_ptr);
virtual void drawIconArray(uint i, Item *item_ptr, int line, int classMask);
-
-
void removeIconArray(uint num);
void loadIconData();
@@ -1103,7 +1099,7 @@ protected:
void resetWindow(WindowBlock *window);
void freeBox(uint index);
- void windowPutChar(uint a);
+ void sendWindow(uint a);
void restoreWindow(WindowBlock *window);
void colorWindow(WindowBlock *window);
@@ -1155,7 +1151,7 @@ protected:
void fillBackGroundFromBack(uint lines);
void fillBackFromFront(uint x, uint y, uint w, uint h);
- virtual void print_char_helper_1(const byte *src, uint len);
+ virtual void doOutput(const byte *src, uint len);
void clsCheck(WindowBlock *window);
void quickLoadOrSave();
@@ -1587,7 +1583,7 @@ protected:
virtual void drawIconArray(uint i, Item *item_ptr, int line, int classMask);
- virtual void print_char_helper_1(const byte *src, uint len);
+ virtual void doOutput(const byte *src, uint len);
virtual void printScreenText(uint vga_sprite_id, uint color, const char *string_ptr, int16 x, int16 y, int16 width);
diff --git a/engines/agos/charset.cpp b/engines/agos/charset.cpp
index 2dbf8277af..c43bea640e 100644
--- a/engines/agos/charset.cpp
+++ b/engines/agos/charset.cpp
@@ -28,7 +28,7 @@
namespace AGOS {
-void AGOSEngine_Feeble::print_char_helper_1(const byte *src, uint len) {
+void AGOSEngine_Feeble::doOutput(const byte *src, uint len) {
if (_textWindow == NULL)
return;
@@ -36,7 +36,7 @@ void AGOSEngine_Feeble::print_char_helper_1(const byte *src, uint len) {
if (getBitFlag(93)) {
if (_curWindow == 3) {
if ((_newLines >= _textWindow->scrollY) && (_newLines < (_textWindow->scrollY + 3)))
- windowPutChar(*src);
+ sendWindow(*src);
if (*src == '\n') // Do two top lines of text only
_newLines++;
src++;
@@ -45,7 +45,7 @@ void AGOSEngine_Feeble::print_char_helper_1(const byte *src, uint len) {
if (getBitFlag(94)) {
if (_curWindow == 3) {
if (_newLines == (_textWindow->scrollY + 7))
- windowPutChar(*src);
+ sendWindow(*src);
if (*src == '\n') // Do two top lines of text only
_newLines++;
src++;
@@ -53,13 +53,13 @@ void AGOSEngine_Feeble::print_char_helper_1(const byte *src, uint len) {
} else {
if (getBitFlag(92))
delay(50);
- windowPutChar(*src++);
+ sendWindow(*src++);
}
}
}
}
-void AGOSEngine::print_char_helper_1(const byte *src, uint len) {
+void AGOSEngine::doOutput(const byte *src, uint len) {
uint idx;
if (_textWindow == NULL)
@@ -73,7 +73,7 @@ void AGOSEngine::print_char_helper_1(const byte *src, uint len) {
_fcsData2[idx] = 1;
}
- windowPutChar(*src++);
+ sendWindow(*src++);
}
}
@@ -534,7 +534,7 @@ void AGOSEngine::justifyOutPut(byte chr) {
_numLettersToPrint = 0;
_printCharCurPos = 0;
_printCharPixelCount = 0;
- print_char_helper_1(&chr, 1);
+ doOutput(&chr, 1);
clsCheck(_textWindow);
} else if (chr == 0 || chr == ' ' || chr == 10) {
bool fit;
@@ -551,13 +551,13 @@ void AGOSEngine::justifyOutPut(byte chr) {
if (fit) {
_printCharCurPos += _printCharPixelCount;
- print_char_helper_1(_lettersToPrintBuf, _numLettersToPrint);
+ doOutput(_lettersToPrintBuf, _numLettersToPrint);
if (_printCharCurPos == _printCharMaxPos) {
_printCharCurPos = 0;
} else {
if (chr)
- print_char_helper_1(&chr, 1);
+ doOutput(&chr, 1);
if (chr == 10)
_printCharCurPos = 0;
else if (chr != 0)
@@ -566,13 +566,13 @@ void AGOSEngine::justifyOutPut(byte chr) {
} else {
const byte newline_character = 10;
_printCharCurPos = _printCharPixelCount;
- print_char_helper_1(&newline_character, 1);
- print_char_helper_1(_lettersToPrintBuf, _numLettersToPrint);
+ doOutput(&newline_character, 1);
+ doOutput(_lettersToPrintBuf, _numLettersToPrint);
if (chr == ' ') {
- print_char_helper_1(&chr, 1);
+ doOutput(&chr, 1);
_printCharCurPos += (getGameType() == GType_FF || getGameType() == GType_PP) ? feebleFontSize[chr - 32] : 1;
} else {
- print_char_helper_1(&chr, 1);
+ doOutput(&chr, 1);
_printCharCurPos = 0;
}
}
diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp
index 1e83420d8f..72afd25f43 100644
--- a/engines/agos/icons.cpp
+++ b/engines/agos/icons.cpp
@@ -815,7 +815,7 @@ void AGOSEngine::removeIconArray(uint num) {
if (getGameType() != GType_FF && getGameType() != GType_PP) {
changeWindow(num);
- windowPutChar(12);
+ sendWindow(12);
changeWindow(curWindow);
}
diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp
index 14bd6afe09..d3b6c1b8cd 100644
--- a/engines/agos/window.cpp
+++ b/engines/agos/window.cpp
@@ -213,7 +213,7 @@ void AGOSEngine::setTextColor(uint color) {
window->text_color = color;
}
-void AGOSEngine::windowPutChar(uint a) {
+void AGOSEngine::sendWindow(uint a) {
if (_textWindow != _windowArray[0]) {
if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) {
if (!(_textWindow->flags & 1)) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-03 04:08:16 +0000