[Scummvm-cvs-logs] SF.net SVN: scummvm: [26913] scummvm/trunk/engines/agos
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Tue May 22 15:11:08 CEST 2007
Revision: 26913
http://scummvm.svn.sourceforge.net/scummvm/?rev=26913&view=rev
Author: kirben
Date: 2007-05-22 06:11:06 -0700 (Tue, 22 May 2007)
Log Message:
-----------
Minor cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/charset.cpp
scummvm/trunk/engines/agos/icons.cpp
scummvm/trunk/engines/agos/window.cpp
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2007-05-22 11:31:31 UTC (rev 26912)
+++ scummvm/trunk/engines/agos/agos.cpp 2007-05-22 13:11:06 UTC (rev 26913)
@@ -315,8 +315,6 @@
_fastFadeCount = 0;
_fastFadeInFlag = 0;
_fastFadeOutFlag = 0;
- _unkPalFlag = 0;
- _usePaletteDelay = 0;
_exitCutscene = 0;
_paletteFlag = 0;
_bottomPalette = 0;
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2007-05-22 11:31:31 UTC (rev 26912)
+++ scummvm/trunk/engines/agos/agos.h 2007-05-22 13:11:06 UTC (rev 26913)
@@ -387,8 +387,6 @@
uint16 _scrollDownHitArea;
bool _fastFadeOutFlag;
- bool _unkPalFlag;
- bool _usePaletteDelay;
byte _paletteFlag;
int _bottomPalette;
uint _fastFadeCount;
@@ -763,8 +761,8 @@
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 @@
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 @@
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 @@
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 @@
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);
Modified: scummvm/trunk/engines/agos/charset.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset.cpp 2007-05-22 11:31:31 UTC (rev 26912)
+++ scummvm/trunk/engines/agos/charset.cpp 2007-05-22 13:11:06 UTC (rev 26913)
@@ -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 @@
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 @@
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 @@
} 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 @@
_fcsData2[idx] = 1;
}
- windowPutChar(*src++);
+ sendWindow(*src++);
}
}
@@ -534,7 +534,7 @@
_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 @@
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 @@
} 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;
}
}
Modified: scummvm/trunk/engines/agos/icons.cpp
===================================================================
--- scummvm/trunk/engines/agos/icons.cpp 2007-05-22 11:31:31 UTC (rev 26912)
+++ scummvm/trunk/engines/agos/icons.cpp 2007-05-22 13:11:06 UTC (rev 26913)
@@ -815,7 +815,7 @@
if (getGameType() != GType_FF && getGameType() != GType_PP) {
changeWindow(num);
- windowPutChar(12);
+ sendWindow(12);
changeWindow(curWindow);
}
Modified: scummvm/trunk/engines/agos/window.cpp
===================================================================
--- scummvm/trunk/engines/agos/window.cpp 2007-05-22 11:31:31 UTC (rev 26912)
+++ scummvm/trunk/engines/agos/window.cpp 2007-05-22 13:11:06 UTC (rev 26913)
@@ -213,7 +213,7 @@
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)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list