[Scummvm-cvs-logs] CVS: scummvm/sky autoroute.h,1.7,1.8 control.cpp,1.60,1.61 control.h,1.27,1.28 disk.cpp,1.51,1.52 intro.cpp,1.40,1.41 logic.cpp,1.138,1.139 rnc_deco.cpp,1.15,1.16 screen.cpp,1.52,1.53 text.cpp,1.56,1.57 text.h,1.28,1.29
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Nov 8 12:28:20 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.12,1.13 adlibmusic.cpp,1.14,1.15 gmmusic.cpp,1.14,1.15 mt32music.cpp,1.14,1.15 musicbase.cpp,1.15,1.16
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon debug.cpp,1.22,1.23 simon.cpp,1.332,1.333 sound.cpp,1.49,1.50 vga.cpp,1.89,1.90
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv7829
Modified Files:
autoroute.h control.cpp control.h disk.cpp intro.cpp logic.cpp
rnc_deco.cpp screen.cpp text.cpp text.h
Log Message:
cleanup whitespaces
Index: autoroute.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- autoroute.h 5 Oct 2003 20:21:19 -0000 1.7
+++ autoroute.h 8 Nov 2003 20:27:26 -0000 1.8
@@ -37,15 +37,15 @@
uint16 checkBlock(uint16 *blockPos);
void clipCoordX(uint16 x, uint8 &blkX, int16 &initX);
void clipCoordY(uint16 y, uint8 &blkY, int16 &initY);
- void initWalkGrid(uint8 screen, uint8 width);
+ void initWalkGrid(uint8 screen, uint8 width);
bool calcWalkGrid(uint8 startX, uint8 startY, uint8 destX, uint8 destY);
- uint16 *makeRouteData(uint8 startX, uint8 startY, uint8 destX, uint8 destY);
+ uint16 *makeRouteData(uint8 startX, uint8 startY, uint8 destX, uint8 destY);
uint16 *checkInitMove(uint16 *data, int16 initStaX);
SkyGrid *_grid;
uint16 *_routeGrid;
uint16 *_routeBuf;
static const int16 _routeDirections[4];
- static const uint16 _logicCommands[4];
+ static const uint16 _logicCommands[4];
};
#endif // AUTOROUTE_H
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- control.cpp 25 Oct 2003 14:15:21 -0000 1.60
+++ control.cpp 8 Nov 2003 20:27:26 -0000 1.61
@@ -99,7 +99,7 @@
}
void SkyTextResource::flushForRedraw(void) {
-
+
if (_oldX < GAME_SCREEN_WIDTH) {
uint16 cpWidth = (PAN_LINE_WIDTH > (GAME_SCREEN_WIDTH - _oldX))?(GAME_SCREEN_WIDTH - _oldX):(PAN_LINE_WIDTH);
for (uint8 cnty = 0; cnty < PAN_CHAR_HEIGHT; cnty++)
@@ -220,7 +220,7 @@
}
void SkyControl::removePanel(void) {
-
+
free(_screenBuf);
free(_sprites.controlPanel); free(_sprites.button);
free(_sprites.buttonDown); free(_sprites.savePanel);
@@ -259,7 +259,7 @@
_sprites.musicBodge = NULL;
else
_sprites.musicBodge = _skyDisk->loadFile(60509, NULL);
-
+
//Main control panel: X Y Text OnClick
_controlPanel = createResource(_sprites.controlPanel, 1, 0, 0, 0, 0, DO_NOTHING, MAINPANEL);
_exitButton = createResource( _sprites.button, 3, 0, 16, 125, 50, EXIT, MAINPANEL);
@@ -276,9 +276,9 @@
_fxPanButton = createResource( _sprites.button, 3, 2, 58, 99, 86, TOGGLE_FX, MAINPANEL);
if (SkyEngine::isCDVersion()) { // CD Version: Toggle text/speech
- _musicPanButton = createResource( _sprites.button, 3, 0, 58, 119, 52, TOGGLE_TEXT, MAINPANEL);
+ _musicPanButton = createResource( _sprites.button, 3, 0, 58, 119, 52, TOGGLE_TEXT, MAINPANEL);
} else { // disk version: toggle music on/off
- _musicPanButton = createResource( _sprites.button, 3, 0, 58, 119, 91, TOGGLE_MS, MAINPANEL);
+ _musicPanButton = createResource( _sprites.button, 3, 0, 58, 119, 91, TOGGLE_MS, MAINPANEL);
}
_bodge = createResource( _sprites.musicBodge, 2, 1, 98, 115, 0, DO_NOTHING, MAINPANEL);
_yesNo = createResource( _sprites.yesNo, 1, 0, -2, 40, 0, DO_NOTHING, MAINPANEL);
@@ -304,7 +304,7 @@
_quitButton = createResource( _sprites.button, 3, 0, 72, 129, 49, SP_CANCEL, SAVEPANEL);
_restoreButton = createResource( _sprites.button, 3, 0, 29, 129, 51, RESTORE_A_GAME, SAVEPANEL);
_autoSaveButton = createResource( _sprites.button, 3, 0, 115, 129, 0x8FFF, RESTORE_AUTO, SAVEPANEL);
-
+
_savePanLookList[0] = _saveButton;
_restorePanLookList[0] = _restoreButton;
_restorePanLookList[1] = _savePanLookList[1] = _downSlowButton;
@@ -424,7 +424,7 @@
_savedMouse = _skyMouse->giveCurrentMouseType();
_savedCharSet = _skyText->giveCurrentCharSet();
_skyText->fnSetFont(0);
- _skyMouse->spriteMouse(MOUSE_NORMAL,0,0);
+ _skyMouse->spriteMouse(MOUSE_NORMAL, 0, 0);
_lastButton = -1;
_curButtonText = 0;
_textSprite = NULL;
@@ -461,7 +461,7 @@
_savedMouse = _skyMouse->giveCurrentMouseType();
- _skyMouse->spriteMouse(MOUSE_NORMAL,0,0);
+ _skyMouse->spriteMouse(MOUSE_NORMAL, 0, 0);
bool quitPanel = false;
_lastButton = -1;
_curButtonText = 0;
@@ -617,14 +617,14 @@
if ((_mouseX >= 77) && (_mouseX <= 114)) { // over 'yes'
wantMouse = MOUSE_CROSS;
if (_mouseClicked) {
- quitPanel = true;
- retVal = true;
+ quitPanel = true;
+ retVal = true;
}
} else if ((_mouseX >= 156) && (_mouseX <= 193)) { // over 'no'
wantMouse = MOUSE_CROSS;
if (_mouseClicked) {
- quitPanel = true;
- retVal = false;
+ quitPanel = true;
+ retVal = false;
}
} else
wantMouse = MOUSE_NORMAL;
@@ -716,7 +716,6 @@
uint32 flags = SkyEngine::_systemVars.systemFlags & TEXT_FLAG_MASK;
SkyEngine::_systemVars.systemFlags &= ~TEXT_FLAG_MASK;
-
if (flags == SF_ALLOW_TEXT) {
flags = SF_ALLOW_SPEECH;
_statusBar->setToText(0x7000 + 21); // speech only
@@ -737,7 +736,7 @@
}
void SkyControl::toggleMusic(void) {
-
+
if (SkyEngine::_systemVars.systemFlags & SF_MUS_OFF) {
SkyEngine::_systemVars.systemFlags &= ~SF_MUS_OFF;
_skyMusic->startMusic(SkyEngine::_systemVars.currentMusic);
@@ -785,12 +784,12 @@
if (SkyEngine::isCDVersion())
strcpy(fName, "SKY-VM-CD.ASD");
else
- sprintf(fName, "SKY-VM%03d.ASD", SkyEngine::_systemVars.gameVersion);
+ sprintf(fName, "SKY-VM%03d.ASD", SkyEngine::_systemVars.gameVersion);
SaveFileManager *mgr = _system->get_savefile_manager();
f = mgr->open_savefile(fName, _savePath, false);
if (f != NULL) {
- test = true;
- delete f;
+ test = true;
+ delete f;
}
delete mgr;
return test;
@@ -884,7 +883,7 @@
clickRes = handleClick(lookList[cnt]);
- if (clickRes == SHIFTED) {
+ if (clickRes == SHIFTED) {
_selectedGame = _firstText;
refreshNames = true;
}
@@ -922,7 +921,7 @@
force_keyboard(false);
#endif
- return clickRes;
+ return clickRes;
}
bool SkyControl::checkKeyList(uint8 key) {
@@ -944,7 +943,7 @@
} else {
if (_enteredTextWidth >= PAN_LINE_WIDTH - 10)
return;
- if (((key >= 'A') && (key <= 'Z')) || ((key >= 'a') && (key <= 'z')) ||
+ if (((key >= 'A') && (key <= 'Z')) || ((key >= 'a') && (key <= 'z')) ||
((key >= '0') && (key <= '9')) || checkKeyList(key)) {
uint8 strLen = 0;
while (textBuf[0]) {
@@ -952,7 +951,7 @@
strLen++;
}
if (strLen < MAX_TEXT_LEN) {
- textBuf[0] = key;
+ textBuf[0] = key;
textBuf[1] = 0;
}
}
@@ -1085,7 +1084,7 @@
if (SkyEngine::isCDVersion())
strcpy(fName, "SKY-VM-CD.ASD");
else
- sprintf(fName, "SKY-VM%03d.ASD", SkyEngine::_systemVars.gameVersion);
+ sprintf(fName, "SKY-VM%03d.ASD", SkyEngine::_systemVars.gameVersion);
SaveFile *outf;
SaveFileManager *mgr = _system->get_savefile_manager();
outf = mgr->open_savefile(fName, _savePath, true);
@@ -1256,7 +1255,7 @@
STOSW(destPos, _skySound->_saveSounds[0]);
STOSW(destPos, _skySound->_saveSounds[1]);
- STOSD(destPos, _skyMusic->giveCurrentMusic());
+ STOSD(destPos, _skyMusic->giveCurrentMusic());
STOSD(destPos, _savedCharSet);
STOSD(destPos, _savedMouse);
STOSD(destPos, SkyEngine::_systemVars.currentPalette);
@@ -1781,43 +1780,43 @@
};
uint8 SkyControl::_crossImg[594] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0B, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x4D, 0x61,
- 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0x08, 0x4E, 0x53, 0x50, 0x4F, 0x0C, 0x4D, 0x4E, 0x51, 0x58, 0x58, 0x54, 0x4E, 0x08, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x54, 0x58, 0x50, 0x4E, 0xFF,
- 0xFF, 0xFF, 0xFF, 0x50, 0x4E, 0x54, 0x58, 0x58, 0x54, 0x4E, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0x61, 0x53, 0x58, 0x54, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0x50, 0x4E, 0x55, 0x58, 0x58, 0x53, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x05, 0x51, 0x58, 0x58,
- 0x51, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x51, 0x58,
- 0x59, 0x58, 0x51, 0x61, 0xFF, 0xFF, 0x61, 0x54, 0x58, 0x58, 0x4F, 0x52, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x55, 0x58, 0x58, 0x57, 0x4E,
- 0x4F, 0x56, 0x58, 0x57, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x51, 0x58, 0x58, 0x58, 0x58, 0x58, 0x54, 0x4E, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0x6A, 0x4F, 0x58, 0x58, 0x58, 0x58, 0x52, 0x06, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x54, 0x58,
- 0x58, 0x58, 0x58, 0x57, 0x53, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x09, 0x58, 0x58, 0x58, 0x57, 0x56, 0x58, 0x58, 0x58,
- 0x57, 0x4F, 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0x61, 0x55, 0x58, 0x58, 0x58, 0x58, 0x4E, 0x64, 0x57, 0x58, 0x58, 0x58, 0x58, 0x53, 0x61, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x57, 0x58, 0x58, 0x58, 0x58,
- 0x50, 0xFF, 0xFF, 0x4E, 0x57, 0x58, 0x58, 0x58, 0x58, 0x56, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x58, 0x58, 0x58, 0x58, 0x58, 0x53, 0x09, 0xFF, 0xFF, 0xFF, 0x4E,
- 0x57, 0x58, 0x58, 0x58, 0x58, 0x58, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x57,
- 0x58, 0x58, 0x58, 0x58, 0x56, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x58, 0x58, 0x58, 0x58,
- 0x58, 0x57, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x55, 0x58, 0x58, 0x58, 0x58, 0x58, 0x4E,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x58, 0x58, 0x58, 0x58, 0x4E, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0x06, 0x58, 0x58, 0x58, 0x58, 0x58, 0x52, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0x0C, 0x52, 0x58, 0x58, 0x51, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x56, 0x58,
- 0x58, 0x58, 0x58, 0x56, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x56,
- 0x58, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x4D, 0x4D, 0x51, 0x56, 0x58, 0x58, 0x50, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x54, 0x09, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x50, 0x54, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x06, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF
+ 0xFF, 0xFF, 0xFF, 0xFF, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0B, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x4D, 0x61,
+ 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0x08, 0x4E, 0x53, 0x50, 0x4F, 0x0C, 0x4D, 0x4E, 0x51, 0x58, 0x58, 0x54, 0x4E, 0x08, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x54, 0x58, 0x50, 0x4E, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0x50, 0x4E, 0x54, 0x58, 0x58, 0x54, 0x4E, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0x61, 0x53, 0x58, 0x54, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0x50, 0x4E, 0x55, 0x58, 0x58, 0x53, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x05, 0x51, 0x58, 0x58,
+ 0x51, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x51, 0x58,
+ 0x59, 0x58, 0x51, 0x61, 0xFF, 0xFF, 0x61, 0x54, 0x58, 0x58, 0x4F, 0x52, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x55, 0x58, 0x58, 0x57, 0x4E,
+ 0x4F, 0x56, 0x58, 0x57, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x51, 0x58, 0x58, 0x58, 0x58, 0x58, 0x54, 0x4E, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0x6A, 0x4F, 0x58, 0x58, 0x58, 0x58, 0x52, 0x06, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x54, 0x58,
+ 0x58, 0x58, 0x58, 0x57, 0x53, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x09, 0x58, 0x58, 0x58, 0x57, 0x56, 0x58, 0x58, 0x58,
+ 0x57, 0x4F, 0x0A, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0x61, 0x55, 0x58, 0x58, 0x58, 0x58, 0x4E, 0x64, 0x57, 0x58, 0x58, 0x58, 0x58, 0x53, 0x61, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x57, 0x58, 0x58, 0x58, 0x58,
+ 0x50, 0xFF, 0xFF, 0x4E, 0x57, 0x58, 0x58, 0x58, 0x58, 0x56, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x58, 0x58, 0x58, 0x58, 0x58, 0x53, 0x09, 0xFF, 0xFF, 0xFF, 0x4E,
+ 0x57, 0x58, 0x58, 0x58, 0x58, 0x58, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x57,
+ 0x58, 0x58, 0x58, 0x58, 0x56, 0x4E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x58, 0x58, 0x58, 0x58,
+ 0x58, 0x57, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0x55, 0x58, 0x58, 0x58, 0x58, 0x58, 0x4E,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x58, 0x58, 0x58, 0x58, 0x4E, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0x06, 0x58, 0x58, 0x58, 0x58, 0x58, 0x52, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0x0C, 0x52, 0x58, 0x58, 0x51, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x56, 0x58,
+ 0x58, 0x58, 0x58, 0x56, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x56,
+ 0x58, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x4D, 0x4D, 0x51, 0x56, 0x58, 0x58, 0x50, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4F, 0x54, 0x09, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4E, 0x50, 0x54, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x06, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0x61, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF
};
Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- control.h 5 Oct 2003 20:21:19 -0000 1.27
+++ control.h 8 Nov 2003 20:27:26 -0000 1.28
@@ -179,7 +179,7 @@
void doAutoSave(void);
uint16 quickXRestore(uint16 slot);
bool loadSaveAllowed(void);
-
+
private:
void initPanel(void);
void removePanel(void);
@@ -271,7 +271,7 @@
uint16 _savedMouse;
uint32 _savedCharSet;
uint16 _enteredTextWidth;
-
+
SkyConResource *createResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, int16 pX, int16 pY, uint32 pText, uint8 pOnClick, uint8 panelType);
dataFileHeader *_textSprite;
Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- disk.cpp 10 Oct 2003 13:55:07 -0000 1.51
+++ disk.cpp 8 Nov 2003 20:27:26 -0000 1.52
@@ -413,7 +413,7 @@
filePtr = loadFile(fileNr, NULL);
sprintf(buf, "dumps/file-%d.dmp", fileNr);
-
+
out.open(buf, "", File::kFileReadMode);
if (out.isOpen() == false) {
out.open(buf, "", File::kFileWriteMode);
Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- intro.cpp 5 Oct 2003 20:21:19 -0000 1.40
+++ intro.cpp 8 Nov 2003 20:27:26 -0000 1.41
@@ -895,9 +895,9 @@
}
}
#ifdef _WIN32_WCE
- uint8 nDelay = (msecs > 15)?(15):((uint8)msecs);
+ uint8 nDelay = (msecs > 15) ? (15) : ((uint8)msecs);
#else
- uint8 nDelay = (msecs > 50)?(50):((uint8)msecs);
+ uint8 nDelay = (msecs > 50) ? (50) : ((uint8)msecs);
#endif
_system->delay_msecs(nDelay);
msecs -= nDelay;
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- logic.cpp 7 Nov 2003 02:22:02 -0000 1.138
+++ logic.cpp 8 Nov 2003 20:27:26 -0000 1.139
@@ -78,7 +78,7 @@
for (int i = 0; i < ARRAYSIZE(_moduleList); i++)
_moduleList[i] = 0;
_stackPtr = 0;
-
+
_currentSection = 0xFF; //force music & sound reload
initScriptVariables();
}
@@ -345,7 +345,7 @@
C_ANIM_UP + _compact->extCompact->megaSet + dir * 4);
uint16 arAnimIndex = _compact->extCompact->arAnimIndex;
- if (!animList[arAnimIndex/2]) {
+ if (!animList[arAnimIndex / 2]) {
arAnimIndex = 0;
_compact->extCompact->arAnimIndex = 0; // reset
}
@@ -1205,7 +1205,7 @@
switch (command) {
case 0: // push_variable
- push( _scriptVariables[READ_LE_UINT16(scriptData++)/4] );
+ push( _scriptVariables[READ_LE_UINT16(scriptData++) / 4] );
break;
case 1: // less_than
a = pop();
@@ -1239,10 +1239,10 @@
a = pop();
if (!a)
- scriptData += s/2;
+ scriptData += s / 2;
break;
case 6: // pop_var
- b = _scriptVariables[READ_LE_UINT16(scriptData++)/4] = pop();
+ b = _scriptVariables[READ_LE_UINT16(scriptData++) / 4] = pop();
break;
case 7: // minus
a = pop();
@@ -1256,7 +1256,7 @@
break;
case 9: // skip_always
s = READ_LE_UINT16(scriptData++);
- scriptData += s/2;
+ scriptData += s / 2;
break;
case 10: // if_or
a = pop();
@@ -1306,7 +1306,7 @@
do {
if (a == READ_LE_UINT16(scriptData)) {
- scriptData += READ_LE_UINT16(scriptData + 1)/2;
+ scriptData += READ_LE_UINT16(scriptData + 1) / 2;
scriptData++;
break;
}
@@ -1335,7 +1335,7 @@
int16 t = READ_LE_UINT16(scriptData++);
a = pop();
if (a)
- scriptData += t/2;
+ scriptData += t / 2;
break;
}
case 13:
@@ -2537,5 +2537,4 @@
else target->extCompact->spTime = (uint16)_skyText->_dtLetters + 5;
target->logic = L_TALK;
}
-
Index: rnc_deco.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- rnc_deco.cpp 6 Jul 2003 22:50:37 -0000 1.15
+++ rnc_deco.cpp 8 Nov 2003 20:27:26 -0000 1.16
@@ -92,7 +92,7 @@
if (newBitCount < 0) {
newBitCount += amount;
- remBits = (newBitBuffh << (16-newBitCount));
+ remBits = (newBitBuffh << (16 - newBitCount));
newBitBuffh >>= newBitCount;
newBitBuffl >>= newBitCount;
newBitBuffl |= remBits;
@@ -101,7 +101,7 @@
amount -= newBitCount;
newBitCount = 16 - amount;
}
- remBits = (newBitBuffh << (16-amount));
+ remBits = (newBitBuffh << (16 - amount));
_bitBuffh = newBitBuffh >> amount;
_bitBuffl = (newBitBuffl >> amount) | remBits;
_bitCount = (uint8)newBitCount;
@@ -134,7 +134,7 @@
a |= ((b >> j) & 1) << (bitLength - j - 1);
*table++ = a;
- *(table + 0x1e) = (huffLength[i] << 8)|(i & 0x00FF);
+ *(table + 0x1e) = (huffLength[i] << 8) | (i & 0x00FF);
huffCode += 1 << (16 - bitLength);
}
}
@@ -253,7 +253,7 @@
if (crcBlock((uint8 *)output, unpackLen) != crcUnpacked)
return UNPACKED_CRC;
-
+
// all is done..return the amount of unpacked bytes
return unpackLen;
}
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- screen.cpp 12 Oct 2003 13:33:21 -0000 1.52
+++ screen.cpp 8 Nov 2003 20:27:26 -0000 1.53
@@ -28,8 +28,7 @@
#include "sky/skydefs.h"
#include "sky/struc.h"
-uint8 SkyScreen::_top16Colours[16*3] =
-{
+uint8 SkyScreen::_top16Colours[16*3] = {
0, 0, 0,
38, 38, 38,
63, 63, 63,
@@ -155,7 +154,7 @@
}
void SkyScreen::convertPalette(uint8 *inPal, uint8* outPal) { //convert 3 byte 0..63 rgb to 4byte 0..255 rgbx
-
+
int i;
for (i = 0; i < VGA_COLOURS; i++) {
@@ -384,7 +383,8 @@
void SkyScreen::handleTimer(void) {
_gotTick = true;
- if (_seqInfo.running) processSequence();
+ if (_seqInfo.running)
+ processSequence();
}
void SkyScreen::startSequence(uint16 fileNum) {
@@ -485,7 +485,8 @@
}
if (_seqInfo.framesLeft == 0) {
_seqInfo.running = false;
- if (!_seqInfo.runningItem) free(_seqInfo.seqData);
+ if (!_seqInfo.runningItem)
+ free(_seqInfo.seqData);
_seqInfo.seqData = _seqInfo.seqDataPos = NULL;
}
}
@@ -527,7 +528,7 @@
dataFileHeader *spriteData =
(dataFileHeader *)SkyEngine::fetchItem(spriteComp->frame >> 6);
if (!spriteData) {
- debug(9,"Missing file %d",spriteComp->frame >> 6);
+ debug(9,"Missing file %d", spriteComp->frame >> 6);
spriteComp->status = 0;
} else {
sortList[spriteCnt].yCood = spriteComp->ycood + spriteData->s_offset_y + spriteData->s_height;
@@ -587,7 +588,7 @@
(spriteData->screen == SkyLogic::_scriptVariables[SCREEN])) {
uint8 *toBeDrawn = (uint8 *)SkyEngine::fetchItem(spriteData->frame >> 6);
if (!toBeDrawn) {
- debug(9, "Spritedata %d not loaded",spriteData->frame >> 6);
+ debug(9, "Spritedata %d not loaded", spriteData->frame >> 6);
spriteData->status = 0;
} else {
drawSprite(toBeDrawn, spriteData);
Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- text.cpp 5 Oct 2003 20:21:20 -0000 1.56
+++ text.cpp 8 Nov 2003 20:27:26 -0000 1.57
@@ -62,7 +62,8 @@
if (SkyEngine::isCDVersion()) {
_preAfterTableArea = _skyDisk->loadFile(60522, NULL);
- } else _preAfterTableArea = NULL;
+ } else
+ _preAfterTableArea = NULL;
}
SkyText::~SkyText(void) {
@@ -259,7 +260,7 @@
return ;
uint32 sectionNo = (textNr & 0x0F000) >> 12;
-
+
if (SkyEngine::_itemList[FIRST_TEXT_SEC + sectionNo] == (void **)NULL) { //check if already loaded
debug(5, "Loading Text item(s) for Section %d", (sectionNo>>2));
@@ -267,13 +268,13 @@
SkyEngine::_itemList[FIRST_TEXT_SEC + sectionNo] = (void **)_skyDisk->loadFile((uint16)fileNo, NULL);
}
_textItemPtr = (uint8 *)SkyEngine::_itemList[FIRST_TEXT_SEC + sectionNo];
-
+
uint32 offset = 0;
uint32 nr32MsgBlocks = (textNr & 0x0fe0);
uint32 skipBytes;
byte *blockPtr;
bool bitSeven;
-
+
if (nr32MsgBlocks) {
blockPtr = (byte *)(_textItemPtr + 4);
nr32MsgBlocks >>= 5;
@@ -290,17 +291,17 @@
remItems &= 0x0fe0;
remItems += READ_LE_UINT16(_textItemPtr);
blockPtr = _textItemPtr + remItems;
-
+
do {
skipBytes = *blockPtr++;
bitSeven = (bool)((skipBytes >> (7)) & 0x1);
skipBytes &= ~(1UL << 7);
-
+
if (bitSeven)
skipBytes <<= 3;
-
+
offset += skipBytes;
-
+
} while (--textNr);
}
@@ -352,7 +353,7 @@
}
bool SkyText::getTBit() {
-
+
if (_shiftBits) {
(_shiftBits)--;
} else {
@@ -369,7 +370,7 @@
}
displayText_t SkyText::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
-
+
//Render text pointed to by *textPtr in buffer *dest
uint8 textChar;
@@ -377,7 +378,7 @@
char *lastSpace = curPos;
byte *centerTblPtr = _centreTable;
uint16 lineWidth = 0;
-
+
_dtCol = color;
_dtLineWidth = pixelWidth;
_dtLines = 0;
@@ -403,12 +404,12 @@
lastSpace = curPos; //keep track of last space
*(uint32 *)centerTblPtr = TO_LE_32(lineWidth);
}
-
+
lineWidth += *(_characterSet+textChar); //add character width
lineWidth += (uint16)_dtCharSpacing; //include character spacing
-
+
if (pixelWidth <= lineWidth) {
-
+
if (*(lastSpace-1) == 10)
error("line width exceeded!");
@@ -449,7 +450,7 @@
((struct dataFileHeader *)curDest)->s_sp_size = (uint16)(_dtLineWidth * _charHeight * _dtLines);
((struct dataFileHeader *)curDest)->s_offset_x = 0;
((struct dataFileHeader *)curDest)->s_offset_y = 0;
-
+
//reset position
curPos = textPtr;
@@ -459,7 +460,7 @@
do {
if (_dtCentre) {
-
+
uint32 width = _dtLineWidth;
width -= READ_LE_UINT32(centerTblPtr);
centerTblPtr += 4;
@@ -479,7 +480,7 @@
prevDest = curDest;
} while (textChar >= 10);
-
+
struct displayText_t ret;
ret.textData = _dtData;
ret.textWidth = _dtLastWidth;
@@ -498,7 +499,7 @@
for (int i = 0; i < _charHeight; i++) {
byte *prevPos = curPos;
-
+
data = READ_BE_UINT16(charSpritePtr);
mask = READ_BE_UINT16(charSpritePtr + 2);
charSpritePtr += 4;
@@ -524,7 +525,7 @@
curPos = prevPos;
curPos += _dtLineWidth;
}
-
+
//update position
dest = startPos + charWidth + _dtCharSpacing*2 - 1;
@@ -535,7 +536,7 @@
getText(textNum);
struct displayText_t textInfo = displayText(NULL, centre, width, color);
-
+
_lowTextWidth = textInfo.textWidth;
byte *textData = textInfo.textData;
Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- text.h 7 Nov 2003 02:22:02 -0000 1.28
+++ text.h 8 Nov 2003 20:27:27 -0000 1.29
@@ -77,7 +77,7 @@
uint32 charHeight;
uint32 charSpacing;
} _mainCharacterSet, _linkCharacterSet, _controlCharacterSet;
-
+
uint32 _curCharSet;
uint8 *_characterSet;
uint8 _charHeight;
@@ -85,7 +85,7 @@
char _textBuffer[1024];
uint8 _centreTable[40];
-
+
uint8 *_mouseTextData; //space for the mouse text
uint8 _dtCol;
uint16 _dtLineWidth; //width of line in pixels
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sky/music adlibchannel.cpp,1.12,1.13 adlibmusic.cpp,1.14,1.15 gmmusic.cpp,1.14,1.15 mt32music.cpp,1.14,1.15 musicbase.cpp,1.15,1.16
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon debug.cpp,1.22,1.23 simon.cpp,1.332,1.333 sound.cpp,1.49,1.50 vga.cpp,1.89,1.90
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list