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

Cleanup

Browse source 
svn-id: r24533
This commit is contained in:
Travis Howell 2006-10-27 13:28:32 +00:00
parent f07fc242b3
commit 9f85511537
6 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/agos/agos.h
View file

@ -821,7 +821,7 @@ protected:
void permitInput(); void permitInput();
uint getFeebleFontSize(byte chr); uint getFeebleFontSize(byte chr);
void justifyStart(uint a, uint b); void justifyStart();
void justifyOutPut(byte chr); void justifyOutPut(byte chr);
void loadZone(uint zoneNum); void loadZone(uint zoneNum);

16
engines/agos/charset.cpp
View file

@ -314,10 +314,7 @@ void AGOSEngine::showMessageFormat(const char *s, ...) {
openTextWindow(); openTextWindow();
if (!_showMessageFlag) { if (!_showMessageFlag) {
_windowArray[0] = _textWindow; _windowArray[0] = _textWindow;
if (getGameType() == GType_FF || getGameType() == GType_PP) justifyStart();
justifyStart(_textWindow->textColumn, _textWindow->width);
else
justifyStart(_textWindow->textLength, _textWindow->textMaxLength);
} }
_showMessageFlag = true; _showMessageFlag = true;
_fcsData1[_curWindow] = 1; _fcsData1[_curWindow] = 1;
@ -327,9 +324,14 @@ void AGOSEngine::showMessageFormat(const char *s, ...) {
justifyOutPut(*str); justifyOutPut(*str);
} }
void AGOSEngine::justifyStart(uint a, uint b) { void AGOSEngine::justifyStart() {
_printCharCurPos = a; if (getGameType() == GType_FF || getGameType() == GType_PP) {
_printCharMaxPos = b; _printCharCurPos = _textWindow->textColumn;
_printCharMaxPos = _textWindow->width;
} else {
_printCharCurPos = _textWindow->textLength;
_printCharMaxPos = _textWindow->textMaxLength;
}
_printCharPixelCount = 0; _printCharPixelCount = 0;
_numLettersToPrint = 0; _numLettersToPrint = 0;
_newLines = 0; _newLines = 0;

5
engines/agos/input.cpp
View file

@ -432,10 +432,7 @@ void AGOSEngine::permitInput() {
_curWindow = 0; _curWindow = 0;
if (_windowArray[0] != 0) { if (_windowArray[0] != 0) {
_textWindow = _windowArray[0]; _textWindow = _windowArray[0];
if (getGameType() == GType_FF || getGameType() == GType_PP) justifyStart();
justifyStart(_textWindow->textColumn, _textWindow->width);
else
justifyStart(_textWindow->textLength, _textWindow->textMaxLength);
} }
_mortalFlag = false; _mortalFlag = false;
} }

5
engines/agos/script.cpp
View file

@ -667,10 +667,7 @@ void AGOSEngine::o_defWindow() {
if (num == _curWindow) { if (num == _curWindow) {
_textWindow = _windowArray[num]; _textWindow = _windowArray[num];
if (getGameType() == GType_FF || getGameType() == GType_PP) justifyStart();
justifyStart(_textWindow->textColumn, _textWindow->width);
else
justifyStart(_textWindow->textLength, _textWindow->textMaxLength);
} }
} }

2
engines/agos/string.cpp
View file

@ -726,7 +726,7 @@ void AGOSEngine::printBox() {
_textWindow->textRow = 0; _textWindow->textRow = 0;
_textWindow->textColumnOffset = 0; _textWindow->textColumnOffset = 0;
_textWindow->textLength = 0; _textWindow->textLength = 0;
justifyStart(_textWindow->textLength, _textWindow->textMaxLength); justifyStart();
waitForSync(99); waitForSync(99);
BoxBufferPtr = _boxBuffer; BoxBufferPtr = _boxBuffer;
while (*BoxBufferPtr) while (*BoxBufferPtr)

6
engines/agos/window.cpp
View file

@ -78,11 +78,7 @@ void AGOSEngine::changeWindow(uint a) {
_curWindow = a; _curWindow = a;
justifyOutPut(0); justifyOutPut(0);
_textWindow = _windowArray[a]; _textWindow = _windowArray[a];
justifyStart();
if (getGameType() == GType_FF || getGameType() == GType_PP)
justifyStart(_textWindow->textColumn, _textWindow->width);
else
justifyStart(_textWindow->textLength, _textWindow->textMaxLength);
} }
void AGOSEngine::closeWindow(uint a) { void AGOSEngine::closeWindow(uint a) {