[Scummvm-cvs-logs] CVS: scummvm/sword1 control.cpp,1.53,1.54 control.h,1.21,1.22 credits.cpp,1.15,1.16 debug.h,1.6,1.7 eventman.cpp,1.7,1.8 eventman.h,1.5,1.6 logic.cpp,1.53,1.54 logic.h,1.15,1.16 memman.h,1.6,1.7 menu.cpp,1.26,1.27 menu.h,1.11,1.12 mouse.cpp,1.29,1.30 mouse.h,1.17,1.18 music.cpp,1.45,1.46 music.h,1.22,1.23 object.h,1.7,1.8 objectman.cpp,1.11,1.12 objectman.h,1.10,1.11 resman.cpp,1.31,1.32 resman.h,1.15,1.16 router.cpp,1.14,1.15 router.h,1.9,1.10 screen.cpp,1.54,1.55 screen.h,1.20,1.21 sound.cpp,1.46,1.47 sound.h,1.22,1.23 staticres.cpp,1.11,1.12 sword1.cpp,1.89,1.90 sworddefs.h,1.19,1.20 text.cpp,1.13,1.14 text.h,1.6,1.7
Eugene Sandulenko
sev at users.sourceforge.net
Sat Jul 30 14:15:04 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound audiocd.cpp,1.21,1.22 audiostream.cpp,1.74,1.75 audiostream.h,1.47,1.48 flac.cpp,1.10,1.11 fmopl.cpp,1.31,1.32 fmopl.h,1.16,1.17 mididrv.cpp,1.64,1.65 mididrv.h,1.48,1.49 midiparser_xmidi.cpp,1.21,1.22 mixer.cpp,1.193,1.194 mixer.h,1.107,1.108 mp3.cpp,1.23,1.24 mpu401.cpp,1.31,1.32 rate.cpp,1.40,1.41 vorbis.cpp,1.26,1.27 wave.cpp,1.7,1.8
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/missing _stdio.cpp,1.13,1.14 _stdlib.cpp,1.10,1.11 _string.cpp,1.7,1.8 _time.cpp,1.6,1.7 _unistd.cpp,1.6,1.7 memory.h,1.3,1.4 stdio.h,1.7,1.8 unistd.h,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/sword1
Modified Files:
control.cpp control.h credits.cpp debug.h eventman.cpp
eventman.h logic.cpp logic.h memman.h menu.cpp menu.h
mouse.cpp mouse.h music.cpp music.h object.h objectman.cpp
objectman.h resman.cpp resman.h router.cpp router.h screen.cpp
screen.h sound.cpp sound.h staticres.cpp sword1.cpp
sworddefs.h text.cpp text.h
Log Message:
Remove trailing whitespaces.
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- control.cpp 10 May 2005 23:17:37 -0000 1.53
+++ control.cpp 30 Jul 2005 21:11:44 -0000 1.54
@@ -419,7 +419,7 @@
void Control::setupMainPanel(void) {
uint32 panelId;
-
+
if (SwordEngine::_systemVars.controlPanelMode == CP_DEATHSCREEN)
panelId = SR_DEATHPANEL;
else {
@@ -428,13 +428,13 @@
else
panelId = SR_PANEL_ENGLISH;
}
-
+
ControlButton *panel = new ControlButton( 0, 0, panelId, 0, _resMan, _screenBuf, _system);
panel->draw();
delete panel;
if (SwordEngine::_systemVars.controlPanelMode != CP_NORMAL)
- createButtons(_deathButtons, 3);
+ createButtons(_deathButtons, 3);
else {
createButtons(_panelButtons, 7);
_buttons[5]->setSelected(SwordEngine::_systemVars.showText);
@@ -551,12 +551,12 @@
// ids: 1 = music, 2 = speech, 3 = sfx
uint8 volL = 0, volR = 0;
if (id == 1)
- _music->giveVolume(&volL, &volR);
+ _music->giveVolume(&volL, &volR);
else if (id == 2)
_sound->giveSpeechVol(&volL, &volR);
else if (id == 3)
_sound->giveSfxVol(&volL, &volR);
-
+
int8 direction = 0;
if ((action >= 4) && (action <= 6)) // lower part of the button => decrease volume
direction = -1;
@@ -576,7 +576,7 @@
int16 resVolR = volR + direction * factorR;
volL = (uint8)MAX((int16)0, MIN(resVolL, (int16)255));
- volR = (uint8)MAX((int16)0, MIN(resVolR, (int16)255));
+ volR = (uint8)MAX((int16)0, MIN(resVolR, (int16)255));
if (id == 1)
_music->setVolume(volL, volR);
@@ -714,13 +714,13 @@
void Control::writeSavegameDescriptions(void) {
Common::OutSaveFile *outf;
outf = _saveFileMan->openForSaving("SAVEGAME.INF");
-
+
if (!outf) {
// Display an error message, and do nothing
displayMessage(0, "Unable to write to path '%s'", _saveFileMan->getSavePath());
return;
}
-
+
// if the player accidently clicked the last slot and then deselected it again,
// we'd still have _saveFiles == 64, so get rid of the empty end.
while (strlen((char*)_saveNames[_saveFiles - 1]) == 0)
@@ -843,12 +843,12 @@
mode &= ~TEXT_RED_FONT;
font = _redFont;
}
-
+
if (mode == TEXT_RIGHT_ALIGN) // negative x coordinate means right-aligned.
x -= getTextWidth(str);
else if (mode == TEXT_CENTER)
x -= getTextWidth(str) / 2;
-
+
uint16 destX = x;
while (*str) {
uint8 *dst = _screenBuf + y * SCREEN_WIDTH + destX;
@@ -872,7 +872,7 @@
void Control::renderVolumeBar(uint8 id, uint8 volL, uint8 volR) {
uint16 destX = _volumeButtons[id].x + 20;
uint16 destY = _volumeButtons[id].y + 116;
-
+
for (uint8 chCnt = 0; chCnt < 2; chCnt++) {
uint8 vol = (chCnt == 0) ? volL : volR;
FrameHeader *frHead = _resMan->fetchFrame(_resMan->openFetchRes(SR_VLIGHT), (vol + 15) >> 4);
@@ -936,7 +936,7 @@
}
_restoreBuf = (uint8*)malloc(
- TOTAL_SECTIONS * 2 +
+ TOTAL_SECTIONS * 2 +
NUM_SCRIPT_VARS * 4 +
(sizeof(Object) - 12000));
@@ -946,7 +946,7 @@
for (cnt = 0; cnt < TOTAL_SECTIONS; cnt++)
liveBuf[cnt] = inf->readUint16LE();
-
+
for (cnt = 0; cnt < NUM_SCRIPT_VARS; cnt++)
scriptBuf[cnt] = inf->readUint32LE();
@@ -1056,7 +1056,7 @@
{475, 332 + 40, SR_BUTTON, BUTTON_DONE }
};
-const ButtonInfo Control::_saveButtons[16] = {
+const ButtonInfo Control::_saveButtons[16] = {
{114, 32 + 40, SR_SLAB1, BUTTON_SAVE_SELECT1 },
{114, 68 + 40, SR_SLAB2, BUTTON_SAVE_SELECT2 },
{114, 104 + 40, SR_SLAB3, BUTTON_SAVE_SELECT3 },
Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- control.h 24 Jun 2005 15:23:49 -0000 1.21
+++ control.h 30 Jul 2005 21:11:44 -0000 1.22
@@ -137,6 +137,6 @@
};
} // End of namespace Sword1
-
+
#endif //BSCONTROL_H
Index: credits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/credits.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- credits.cpp 24 Jun 2005 15:23:49 -0000 1.15
+++ credits.cpp 30 Jul 2005 21:11:44 -0000 1.16
@@ -98,8 +98,8 @@
uint8 *palSrc = credFile.fetchFile(FONT_PAL, &_palLen);
for (uint32 cnt = 0; cnt < _palLen; cnt++)
_palette[(cnt / 3) * 4 + cnt % 3] = palSrc[cnt];
- _palLen /= 3;
-
+ _palLen /= 3;
+
generateFonts(&credFile);
uint8 *textData = credFile.fetchFile(TEXT);
@@ -165,7 +165,7 @@
free(_bigFont);
_smlFont = _bigFont = NULL;
free(screenBuf);
-
+
// credits done, now show the revolution logo
uint8 *revoBuf = credFile.decompressFile(REVO_LOGO);
uint8 *revoPal = credFile.fetchFile(REVO_PAL, &_palLen);
@@ -214,7 +214,7 @@
font = _bigFont;
fntSize = 32;
flags &= ~FNT_BIG;
- } else
+ } else
font = _smlFont;
uint16 width = getWidth(font, line);
Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/debug.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- debug.h 24 Jun 2005 15:23:49 -0000 1.6
+++ debug.h 30 Jul 2005 21:11:44 -0000 1.7
@@ -35,7 +35,7 @@
static const char _mCodeNames[100][35];
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif // BSDEBUG_H
Index: eventman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/eventman.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- eventman.cpp 24 Jun 2005 15:23:49 -0000 1.7
+++ eventman.cpp 30 Jul 2005 21:11:44 -0000 1.8
@@ -46,9 +46,9 @@
compact->o_logic = LOGIC_script; //force into script mode
_eventPendingList[globCnt].delay = 0; //started, so remove from queue
compact->o_tree.o_script_level++;
- compact->o_tree.o_script_id[compact->o_tree.o_script_level] =
+ compact->o_tree.o_script_id[compact->o_tree.o_script_level] =
compact->o_event_list[objCnt].o_event_script;
- compact->o_tree.o_script_pc[compact->o_tree.o_script_level] =
+ compact->o_tree.o_script_pc[compact->o_tree.o_script_level] =
compact->o_event_list[objCnt].o_event_script;
}
}
@@ -78,9 +78,9 @@
cpt->o_logic = LOGIC_script; //force into script mode
_eventPendingList[globCnt].delay = 0; //started, so remove from queue
cpt->o_tree.o_script_level++;
- cpt->o_tree.o_script_id[cpt->o_tree.o_script_level] =
+ cpt->o_tree.o_script_id[cpt->o_tree.o_script_level] =
cpt->o_event_list[objCnt].o_event_script;
- cpt->o_tree.o_script_pc[cpt->o_tree.o_script_level] =
+ cpt->o_tree.o_script_pc[cpt->o_tree.o_script_level] =
cpt->o_event_list[objCnt].o_event_script;
return SCRIPT_STOP;
}
Index: eventman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/eventman.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- eventman.h 1 Jan 2005 16:09:24 -0000 1.5
+++ eventman.h 30 Jul 2005 21:11:44 -0000 1.6
@@ -45,6 +45,6 @@
GlobalEvent _eventPendingList[TOTAL_EVENT_SLOTS];
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif // BSEVENTMAN_H
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- logic.cpp 24 Jun 2005 15:23:49 -0000 1.53
+++ logic.cpp 30 Jul 2005 21:11:44 -0000 1.54
@@ -76,12 +76,12 @@
_scriptVars[_scriptVarInit[cnt][0]] = _scriptVarInit[cnt][1];
if (SwordEngine::_systemVars.isDemo)
_scriptVars[PLAYINGDEMO] = 1;
-
+
delete _eventMan;
_eventMan = new EventManager();
delete _textMan;
- _textMan = new Text(_objMan, _resMan,
+ _textMan = new Text(_objMan, _resMan,
(SwordEngine::_systemVars.language == BS1_CZECH) ? true : false);
_screen->useTextManager(_textMan);
_textRunning = _speechRunning = false;
@@ -97,7 +97,7 @@
Object *cpt = _objMan->fetchObject(SAND_25);
Object *george = _objMan->fetchObject(PLAYER);
if (george->o_place == HOLDING_REPLICA_25) // is george holding the replica in his hands?
- fnFullSetFrame(cpt, SAND_25, IMPFLRCDT, IMPFLR, 0, 0, 0, 0); // empty impression in floor
+ fnFullSetFrame(cpt, SAND_25, IMPFLRCDT, IMPFLR, 0, 0, 0, 0); // empty impression in floor
else
fnFullSetFrame(cpt, SAND_25, IMPPLSCDT, IMPPLS, 0, 0, 0, 0); // impression filled with plaster
}
@@ -250,7 +250,7 @@
int Logic::logicWaitTalk(Object *compact) {
Object *target = _objMan->fetchObject(compact->o_down_flag);
-
+
if (target->o_status & STAT_TALK_WAIT) {
compact->o_logic = LOGIC_script;
return 1;
@@ -278,7 +278,7 @@
int32 walkPc;
if ((_scriptVars[GEORGE_WALKING] == 0) && (id == PLAYER))
_scriptVars[GEORGE_WALKING] = 1;
-
+
compact->o_resource = compact->o_walk_resource;
compact->o_status |= STAT_SHRINK;
route = compact->o_route;
@@ -291,7 +291,7 @@
compact->o_anim_x =compact->o_xcoord;
compact->o_anim_y =compact->o_ycoord;
- if (((_scriptVars[GEORGE_WALKING] == 2) && (walkPc > 5) && (id == PLAYER) &&
+ if (((_scriptVars[GEORGE_WALKING] == 2) && (walkPc > 5) && (id == PLAYER) &&
(route[walkPc - 1].step == 5) && (route[walkPc].step == 0)) ||
((_scriptVars[GEORGE_WALKING] == 3) && (id == PLAYER))) {
@@ -356,10 +356,10 @@
animData += 4;
compact->o_anim_pc++; // go to next frame of anim
- if (_speechFinished || (compact->o_anim_pc >= numFrames) ||
+ if (_speechFinished || (compact->o_anim_pc >= numFrames) ||
(_speechRunning && (_sound->amISpeaking() == 0)))
compact->o_anim_pc = 0; //set to frame 0, closed mouth
-
+
AnimUnit *animPtr = (AnimUnit*)(animData + sizeof(AnimUnit) * compact->o_anim_pc);
if (!(compact->o_status & STAT_SHRINK)) {
compact->o_anim_x = FROM_LE_32(animPtr->animX);
@@ -418,7 +418,7 @@
void Logic::updateScreenParams(void) {
Object *compact = (Object*)_objMan->fetchObject(PLAYER);
- _screen->setScrolling((int16)(compact->o_xcoord - _scriptVars[FEET_X]),
+ _screen->setScrolling((int16)(compact->o_xcoord - _scriptVars[FEET_X]),
(int16)(compact->o_ycoord - _scriptVars[FEET_Y]));
}
@@ -501,7 +501,7 @@
default:
warning("mcode[%d]: too many arguments(%d)", mCodeNumber, mCodeArguments);
}
- if (mCodeReturn == 0)
+ if (mCodeReturn == 0)
return pc;
break;
case IT_PUSHNUMBER:
@@ -637,7 +637,7 @@
int switchValue = stack[--stackIdx];
int switchCount = scriptCode[pc++];
int doneSwitch=0;
-
+
for (int cnt = 0; (cnt < switchCount) && (doneSwitch==0); cnt++) {
if (switchValue == scriptCode[pc]) {
pc += scriptCode[pc+1];
@@ -785,7 +785,7 @@
};
int Logic::fnBackground(Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) {
-
+
cpt->o_status &= ~(STAT_FORE | STAT_SORT);
cpt->o_status |= STAT_BACK;
return SCRIPT_CONT;
@@ -830,7 +830,7 @@
}
if ((cpt->o_anim_resource == 0) || (cpt->o_resource == 0))
error("fnAnim called width (%d/%d) => (%d/%d)", cdt, spr, cpt->o_anim_resource, cpt->o_resource);
-
+
FrameHeader *frameHead = _resMan->fetchFrame(_resMan->openFetchRes(cpt->o_resource), 0);
if (frameHead->offsetX || frameHead->offsetY) { // boxed mega anim?
cpt->o_status |= STAT_SHRINK;
@@ -849,14 +849,14 @@
}
int Logic::fnSetFrame(Object *cpt, int32 id, int32 cdt, int32 spr, int32 frameNo, int32 f, int32 z, int32 x) {
-
+
AnimUnit *animPtr;
uint8 *data = (uint8*)_resMan->openFetchRes(cdt);
data += sizeof(Header);
if (frameNo == LAST_FRAME)
frameNo = READ_LE_UINT32(data) - 1;
-
+
data += 4;
animPtr = (AnimUnit*)(data + frameNo * sizeof(AnimUnit));
@@ -1100,7 +1100,7 @@
if (cdt && (!spr)) { // if 'cdt' is non-zero but 'spr' is zero - 'cdt' is an anim table tag
AnimSet *animTab = (AnimSet*)((uint8*)_resMan->openFetchRes(cdt) + sizeof(Header));
animTab += cpt->o_dir;
-
+
cpt->o_anim_resource = FROM_LE_32(animTab->cdt);
if (animTab->cdt)
cpt->o_resource = FROM_LE_32(animTab->spr);
@@ -1114,7 +1114,7 @@
if (cpt->o_anim_resource) {
if (!cpt->o_resource)
error("ID %d: Can't run anim with cdt=%d, spr=%d", id, cdt, spr);
-
+
FrameHeader *frameHead = _resMan->fetchFrame(_resMan->openFetchRes(cpt->o_resource), 0);
if (frameHead->offsetX && frameHead->offsetY) { // is this a boxed mega?
cpt->o_status |= STAT_SHRINK;
@@ -1351,7 +1351,7 @@
/* if (cpt->o_type == TYPE_PLAYER)
^= this was the original condition from the game sourcecode.
not sure why it doesn't work*/
- if (id == PLAYER)
+ if (id == PLAYER)
_scriptVars[NEW_SCREEN] = screen;
else
cpt->o_screen = screen; // move the mega
@@ -1422,7 +1422,7 @@
if (stance > 0)
dir = 9;
int route = _router->routeFinder(id, cpt, cpt->o_xcoord, cpt->o_ycoord, dir);
-
+
if (route)
cpt->o_down_flag = 1; //1 means ok
else
@@ -1506,7 +1506,7 @@
int Logic::fnGetTo(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d, int32 z, int32 x) {
Object *place = _objMan->fetchObject(cpt->o_place);
-
+
cpt->o_tree.o_script_level++;
cpt->o_tree.o_script_pc[cpt->o_tree.o_script_level] = place->o_get_to_script;
cpt->o_tree.o_script_id[cpt->o_tree.o_script_level] = place->o_get_to_script;
@@ -1727,7 +1727,7 @@
varId = READ_LE_UINT16(data);
_scriptVars[varId] = READ_LE_UINT16(data + 2);
data += 4;
- break;
+ break;
case opcSetVar32:
varId = READ_LE_UINT16(data);
_scriptVars[varId] = READ_LE_UINT32(data + 2);
@@ -1767,7 +1767,7 @@
runStartScript(_startData[pos]);
if (spainVisit2)
runStartScript(_helperData[HELP_SPAIN2]);
-
+
if (pos == 0)
pos = 1;
Object *compact = _objMan->fetchObject(PLAYER);
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- logic.h 10 May 2005 23:48:47 -0000 1.15
+++ logic.h 30 Jul 2005 21:11:45 -0000 1.16
@@ -125,7 +125,7 @@
int fnGotoBookmark (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
int fnSendSync (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
int fnWaitSync (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
-
+
int cfnClickInteract(Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
int cfnSetScript (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
@@ -158,9 +158,9 @@
int fnEndChooser (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
int fnStartMenu (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
int fnEndMenu (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
-
+
int cfnReleaseMenu (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
-
+
int fnAddSubject (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
int fnAddObject (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
int fnRemoveObject (Object *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x);
@@ -233,6 +233,6 @@
HELP_SPAIN2
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif //BSLOGIC_H
Index: memman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/memman.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- memman.h 24 Jun 2005 15:23:50 -0000 1.6
+++ memman.h 30 Jul 2005 21:11:45 -0000 1.7
@@ -58,6 +58,6 @@
MemHandle *_memListFreeEnd;
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif //MEMMAN_H
Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/menu.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- menu.cpp 24 Jun 2005 15:23:50 -0000 1.26
+++ menu.cpp 30 Jul 2005 21:11:45 -0000 1.27
@@ -57,7 +57,7 @@
3, 2, 1, 0, 7, 6, 5, 4,
4, 3, 2, 1, 0, 7, 6, 5,
5, 4, 3, 2, 1, 0, 7, 6,
- 6, 5, 4, 3, 2, 1, 0, 7
+ 6, 5, 4, 3, 2, 1, 0, 7
};
MenuIcon::MenuIcon(uint8 menuType, uint8 menuPos, uint32 resId, uint32 frame, Screen *screen) {
Index: menu.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/menu.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- menu.h 1 Jan 2005 16:09:24 -0000 1.11
+++ menu.h 30 Jul 2005 21:11:45 -0000 1.12
@@ -103,6 +103,6 @@
static const byte _fadeEffectBottom[64];
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif //BSMENU_H
Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- mouse.cpp 24 Jun 2005 15:23:50 -0000 1.29
+++ mouse.cpp 30 Jul 2005 21:11:45 -0000 1.30
@@ -57,9 +57,9 @@
_mouseOverride = false;
_currentPtrId = _currentLuggageId = 0;
- for (uint8 cnt = 0; cnt < 17; cnt++) // force res manager to keep mouse
+ for (uint8 cnt = 0; cnt < 17; cnt++) // force res manager to keep mouse
_resMan->resOpen(MSE_POINTER + cnt); // cursors in memory all the time
-
+
_system->showMouse(false);
createPointer(0, 0);
}
@@ -140,7 +140,7 @@
if (y > 40) {
for (uint16 priority = 0; (priority < 10) && (!touchedId); priority++) {
for (uint16 cnt = 0; (cnt < _numObjs) && (!touchedId); cnt++) {
- if ((_objList[cnt].compact->o_priority == priority) &&
+ if ((_objList[cnt].compact->o_priority == priority) &&
(Logic::_scriptVars[MOUSE_X] >= (uint32)_objList[cnt].compact->o_mouse_x1) &&
(Logic::_scriptVars[MOUSE_X] <= (uint32)_objList[cnt].compact->o_mouse_x2) &&
(Logic::_scriptVars[MOUSE_Y] >= (uint32)_objList[cnt].compact->o_mouse_y1) &&
@@ -172,7 +172,7 @@
if (Logic::_scriptVars[MENU_LOOKING])
_logic->cfnPresetScript(NULL, -1, PLAYER, SCR_menu_look, 0, 0, 0, 0);
}
-
+
Logic::_scriptVars[MOUSE_BUTTON] = _state & MOUSE_DOWN_MASK;
if (Logic::_scriptVars[SPECIAL_ITEM]) {
Object *compact = _objMan->fetchObject(Logic::_scriptVars[SPECIAL_ITEM]);
Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mouse.h 24 Jun 2005 15:23:50 -0000 1.17
+++ mouse.h 30 Jul 2005 21:11:45 -0000 1.18
@@ -108,5 +108,5 @@
};
} // End of namespace Sword1
-
+
#endif //BSMOUSE_H
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- music.cpp 24 Jun 2005 15:23:50 -0000 1.45
+++ music.cpp 30 Jul 2005 21:11:45 -0000 1.46
@@ -112,7 +112,7 @@
switch (_musicMode) {
#ifdef USE_MAD
case MusicMp3:
- return makeMP3Stream(&_file, _file.size());
+ return makeMP3Stream(&_file, _file.size());
#endif
#ifdef USE_VORBIS
case MusicVorbis:
@@ -212,7 +212,7 @@
if ((expectedSamples > 0) && _audioSource->endOfData()) {
debug(2, "Music reached EOF");
_audioSource->endOfData();
- if (_looping) {
+ if (_looping) {
delete _audioSource; // recreate same source.
_audioSource = createAudioSource();
}
@@ -323,7 +323,7 @@
_mutex.unlock();
/* The handle will load the music file now. It can take a while, so unlock
- the mutex before, to have the soundthread playing normally.
+ the mutex before, to have the soundthread playing normally.
As the corresponding _converter is NULL, the handle will be ignored by the playing thread */
if (_handles[newStream].play(_tuneList[tuneId], loopFlag != 0)) {
_mutex.lock();
Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- music.h 24 Jun 2005 15:23:50 -0000 1.22
+++ music.h 30 Jul 2005 21:11:45 -0000 1.23
@@ -116,6 +116,6 @@
static const char _tuneList[TOTAL_TUNES][8]; // in staticres.cpp
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif // BSMUSIC_H
Index: object.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/object.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- object.h 24 Jun 2005 15:23:50 -0000 1.7
+++ object.h 30 Jul 2005 21:11:45 -0000 1.8
@@ -32,7 +32,7 @@
#define EXTRA_GRID_SIZE 20
//--------------------------------------------------------------------------------------
-struct OEventSlot { //receiving event list in the compact -
+struct OEventSlot { //receiving event list in the compact -
int32 o_event; //array of these with O_TOTAL_EVENTS elements
int32 o_event_script;
};
@@ -70,12 +70,12 @@
int32 o_resource; // 32 id of spr file it comes from
int32 o_sync; // 36 receive sync here
int32 o_pause; // 40 logic_engine() pauses these cycles
- int32 o_xcoord; // 44
+ int32 o_xcoord; // 44
int32 o_ycoord; // 48
int32 o_mouse_x1; // 52 top-left of mouse area is (x1,y1)
- int32 o_mouse_y1; // 56
+ int32 o_mouse_y1; // 56
int32 o_mouse_x2; // 60 bottom-right of area is (x2,y2) (these coords are inclusive)
- int32 o_mouse_y2; // 64
+ int32 o_mouse_y2; // 64
int32 o_priority; // 68
int32 o_mouse_on; // 72
int32 o_mouse_off; // 76
@@ -83,7 +83,7 @@
int32 o_interact; // 84
int32 o_get_to_script; // 88
int32 o_scale_a; // 92 used by floors
- int32 o_scale_b; // 96
+ int32 o_scale_b; // 96
int32 o_anim_x; // 100
int32 o_anim_y; // 104
@@ -123,7 +123,7 @@
WalkData route[24];
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif //BSOBJECT_H
Index: objectman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/objectman.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- objectman.cpp 24 Jun 2005 15:23:50 -0000 1.11
+++ objectman.cpp 30 Jul 2005 21:11:45 -0000 1.12
@@ -42,7 +42,7 @@
_liveList[128] = _liveList[129] = _liveList[130] = _liveList[131] = _liveList[133] =
_liveList[134] = _liveList[145] = _liveList[146] = _liveList[TEXT_sect] = 1;
-
+
for (cnt = 0; cnt < TOTAL_SECTIONS; cnt++) {
if (_liveList[cnt])
_cptData[cnt] = (uint8*)_resMan->cptResOpen(_objectList[cnt]) + sizeof(Header);
Index: objectman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/objectman.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- objectman.h 24 Jun 2005 15:56:27 -0000 1.10
+++ objectman.h 30 Jul 2005 21:11:45 -0000 1.11
@@ -48,7 +48,7 @@
uint32 lastTextNumber(int section);
void closeSection(uint32 screen);
-
+
void saveLiveList(uint16 *dest); // for loading/saving
void loadLiveList(uint16 *src);
private:
@@ -60,6 +60,6 @@
static char _errorStr[];
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif //OBJECTMAN_H
Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/resman.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- resman.cpp 24 Jun 2005 15:23:50 -0000 1.31
+++ resman.cpp 30 Jul 2005 21:11:45 -0000 1.32
@@ -88,7 +88,7 @@
guiFatalError(msg);
}
-
+
_prj.noClu = file.readUint32LE();
_prj.clu = new Clu[_prj.noClu];
memset(_prj.clu, 0, _prj.noClu * sizeof(Clu));
@@ -137,14 +137,14 @@
free(grpIndex);
}
free(cluIndex);
-
+
if (_prj.clu[3].grp[5].noRes == 29)
for (uint8 cnt = 0; cnt < 29; cnt++)
_srIdList[cnt] = 0x04050000 | cnt;
}
void ResMan::freeCluDescript(void) {
-
+
for (uint32 clusCnt = 0; clusCnt < _prj.noClu; clusCnt++) {
Clu *cluster = _prj.clu + clusCnt;
for (uint32 grpCnt = 0; grpCnt < cluster->noGrp; grpCnt++) {
@@ -271,7 +271,7 @@
void ResMan::resClose(uint32 id) {
MemHandle *handle = resHandle(id);
if (!handle->refCount) {
- warning("Resource Manager fail: unlocking object with refCount 0. Id: %d\n", id);
+ warning("Resource Manager fail: unlocking object with refCount 0. Id: %d\n", id);
} else {
handle->refCount--;
if (!handle->refCount)
@@ -312,7 +312,7 @@
assert(_openCluStart);
Clu *closeClu = _openCluStart;
_openCluStart = _openCluStart->nextOpen;
-
+
closeClu->file->close();
delete closeClu->file;
closeClu->file = NULL;
Index: resman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/resman.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- resman.h 10 May 2005 22:56:22 -0000 1.15
+++ resman.h 30 Jul 2005 21:11:45 -0000 1.16
@@ -85,6 +85,6 @@
int _openClus;
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif //RESMAN_H
Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/router.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- router.cpp 24 Jun 2005 15:23:50 -0000 1.14
+++ router.cpp 30 Jul 2005 21:11:45 -0000 1.15
@@ -33,8 +33,8 @@
/****************************************************************************
* JROUTER.C polygon router with modular walks
* using a tree of modules
- * 21 july 94
- * 3 november 94
+ * 21 july 94
+ * 3 november 94
* System currently works by scanning grid data and coming up with a ROUTE
* as a series of way points(nodes), the smoothest eight directional PATH
* through these nodes is then found, and a WALK created to fit the PATH.
@@ -42,9 +42,9 @@
* Two funtions are called by the user, RouteFinder creates a route as a
* module list, HardWalk creates an animation list from the module list.
* The split is only provided to allow the possibility of turning the
- * autorouter over two game cycles.
+ * autorouter over two game cycles.
****************************************************************************
- *
+ *
* Routine timings on osborne 486
*
* Read floor resource (file already loaded) 112 pixels
@@ -54,7 +54,7 @@
*
*
****************************************************************************
- *
+ *
* Modified 12 Oct 95
*
* Target Points within 1 pixel of a line are ignored ???
@@ -87,8 +87,8 @@
{
/****************************************************************************
* RouteFinder.C polygon router with modular walks
- * 21 august 94
- * 3 november 94
+ * 21 august 94
+ * 3 november 94
* RouteFinder creates a list of modules that enables HardWalk to create
* an animation list.
*
@@ -96,15 +96,15 @@
* as a series of way points(nodes), the smoothest eight directional PATH
* through these nodes is then found, this information is made available to
* HardWalk for a WALK to be created to fit the PATH.
- *
+ *
* 30 november 94 return values modified
- *
+ *
* return 0 = failed to find a route
- *
+ *
* 1 = found a route
*
* 2 = mega already at target
- *
+ *
****************************************************************************/
int32 routeFlag = 0;
@@ -121,7 +121,7 @@
standFrames = framesPerChar;
turnFramesLeft = standFrames;
turnFramesRight = standFrames;
- walkFramesLeft = 0;
+ walkFramesLeft = 0;
walkFramesRight = 0;
slowInFrames = 0;
slowOutFrames = 0;
@@ -130,7 +130,7 @@
{
turnFramesLeft = 3 * framesPerChar + NO_DIRECTIONS + 2 * SLOW_IN + 4 * SLOW_OUT;
turnFramesRight = 3 * framesPerChar + NO_DIRECTIONS + 2 * SLOW_IN + 4 * SLOW_OUT + NO_DIRECTIONS;
- walkFramesLeft = framesPerChar + NO_DIRECTIONS;
+ walkFramesLeft = framesPerChar + NO_DIRECTIONS;
walkFramesRight = 2 * framesPerChar + NO_DIRECTIONS;
slowInFrames = 3 * framesPerChar + NO_DIRECTIONS;
slowOutFrames = 3 * framesPerChar + NO_DIRECTIONS + 2 * SLOW_IN;
@@ -139,7 +139,7 @@
{
turnFramesLeft = framesPerChar + NO_DIRECTIONS;
turnFramesRight = framesPerChar + 2 * NO_DIRECTIONS;
- walkFramesLeft = 0;
+ walkFramesLeft = 0;
walkFramesRight = 0;
slowInFrames = 0;
slowOutFrames = 0;
@@ -149,7 +149,7 @@
// All route data now loaded start finding a route
// **************************************************************************
// **************************************************************************
-// Check if we can get a route through the floor changed 12 Oct95 JPS
+// Check if we can get a route through the floor changed 12 Oct95 JPS
// **************************************************************************
routeFlag = GetRoute();
@@ -159,7 +159,7 @@
if (targetDir >7)// if target direction specified as any
{
targetDir = startDir;
- }
+ }
// just a turn on the spot is required set an end module for the route let the animator deal with it
// modularPath is normally set by ExtractRoute
modularPath[0].dir = startDir;
@@ -181,8 +181,8 @@
SmoothestPath();//Converts the route to an exact path
// The Route had waypoints and direction options
// The Path is an exact set of lines in 8 directions that reach the target.
- // The path is in module format, but steps taken in each direction are not accurate
- // if target dir = 8 then the walk isn't linked to an anim so
+ // The path is in module format, but steps taken in each direction are not accurate
+ // if target dir = 8 then the walk isn't linked to an anim so
// we can create a route without sliding and miss the exact target
if (targetDir == NO_DIRECTIONS)
{
@@ -211,33 +211,33 @@
{
/****************************************************************************
* GetRoute.C extract a path from walk grid
- * 12 october 94
+ * 12 october 94
*
* GetRoute currently works by scanning grid data and coming up with a ROUTE
* as a series of way points(nodes).
* static _routeData route[O_ROUTE_SIZE];
- *
+ *
* return 0 = failed to find a route
- *
+ *
* 1 = found a route
*
* 2 = mega already at target
- *
+ *
* 3 = failed to find a route because target was on a line
- *
+ *
****************************************************************************/
int32 routeGot = 0;
int32 level;
int32 changed;
- if ((startX == targetX) && (startY == targetY))
+ if ((startX == targetX) && (startY == targetY))
routeGot = 2;
else // 'else' added by JEL (23jan96) otherwise 'routeGot' affected even when already set to '2' above - causing some 'turns' to walk downwards on the spot
routeGot = CheckTarget(targetX,targetY);// returns 3 if target on a line ( +- 1 pixel )
- if (routeGot == 0) //still looking for a route check if target is within a pixel of a line
+ if (routeGot == 0) //still looking for a route check if target is within a pixel of a line
{
// scan through the nodes linking each node to its nearest neighbour until no more nodes change
// This is the routine that finds a route using Scan()
@@ -277,7 +277,7 @@
* turns (subject to two 45 degree turns being better than one 90 degree turn).
* Secondly when walking in a given direction the number of steps required to reach the end of that run
* is not calculated accurately. This is because I was unable to derive a function to relate number of
- * steps taken between two points to the shrunken step size
+ * steps taken between two points to the shrunken step size
*
*/
int32 p;
@@ -350,14 +350,14 @@
if ( dDS < 0)
dDS = dDS + NO_DIRECTIONS;
- // Determine the amount of turning involved in each possible path
+ // Determine the amount of turning involved in each possible path
dS = turntable[dS];
dD = turntable[dD];
dSS = turntable[dSS];
dDD = turntable[dDD];
dSD = turntable[dSD];
dDS = turntable[dDS];
- // get the best path out ie assume next section uses best direction
+ // get the best path out ie assume next section uses best direction
if (dSD < dSS)
{
dSS = dSD;
@@ -381,10 +381,10 @@
tempturns[3] = DD;
turns[3] = 3;
i = 0;
- do
+ do
{
j = 0;
- do
+ do
{
if (tempturns[j] > tempturns[j + 1])
{
@@ -397,7 +397,7 @@
}
j = j + 1;
}
- while (j < 3);
+ while (j < 3);
i = i + 1;
}
while (i < 3);
@@ -414,8 +414,8 @@
Go_dos("BestTurns failed");*/
error("BestTurns failed");
}
- i = 0;
- steps = 0;
+ i = 0;
+ steps = 0;
do
{
option = 1 << turns[i];
@@ -428,7 +428,7 @@
#ifdef PLOT_PATHS // plot the best path
if (steps != 0)
{
- i = 0;
+ i = 0;
do
{
RouteLine(smoothPath[i].x, smoothPath[i].y, smoothPath[i+1].x, smoothPath[i+1].y, 228);
@@ -454,7 +454,7 @@
// best turns will end heading as near as possible to target dir rest is down to anim for now
smoothPath[steps].dir = 9;
smoothPath[steps].num = ROUTE_END_FLAG;
- return 1;
+ return 1;
}
@@ -469,14 +469,14 @@
* No longer checks the data it only creates the smoothPath array JPS
****************************************************************************/
{
- static int32 k;
- int32 tempK;
- int32 x;
- int32 y;
- int32 x2;
- int32 y2;
- int32 dx;
- int32 dy;
+ static int32 k;
+ int32 tempK;
+ int32 x;
+ int32 y;
+ int32 x2;
+ int32 y2;
+ int32 dx;
+ int32 dy;
int32 dsx;
int32 dsy;
int32 ddx;
@@ -618,7 +618,7 @@
tempK = k;
}
- return tempK;
+ return tempK;
}
int32 Router::SlidyPath()
@@ -659,7 +659,7 @@
stepX = stepX >> 19;// quarter a step minimum
stepY = stepY >> 19;
if ((ABS(deltaX)>=ABS(stepX)) && (ABS(deltaY)>=ABS(stepY)))
- {
+ {
modularPath[slidy].x = smoothPath[smooth].x;
modularPath[slidy].y = smoothPath[smooth].y;
modularPath[slidy].dir = smoothPath[smooth].dir;
@@ -693,7 +693,7 @@
* Skidding every where HardWalk creates an animation that exactly fits the
* smoothPath and uses foot slipping to fit whole steps into the route
* Parameters: georgeg,mouseg
- * Returns: rout
+ * Returns: rout
*
* produce a module list from the line data
*
@@ -830,8 +830,8 @@
left = 0;
lastCount = stepCount;
- lastDir = 99;// this ensures that we don't put in turn frames for the start
- currentDir = 99;// this ensures that we don't put in turn frames for the start
+ lastDir = 99;// this ensures that we don't put in turn frames for the start
+ currentDir = 99;// this ensures that we don't put in turn frames for the start
do
{
while (modularPath[p].num == 0)
@@ -923,7 +923,7 @@
frameCount += 1;
walkAnim[lastCount + frameCount - 1].x += errorX*frameCount/frames;
}
- while (frameCount<frames);
+ while (frameCount<frames);
}
if (errorY != 0)
{
@@ -934,16 +934,16 @@
frameCount += 1;
walkAnim[lastCount + frameCount-1].y += errorY*frameCount/frames;
}
- while (frameCount<frames);
+ while (frameCount<frames);
}
// Now is the time to put in the turn frames for the last turn
if (frames < framesPerStep)
- currentDir = 99;// this ensures that we don't put in turn frames for this walk or the next
+ currentDir = 99;// this ensures that we don't put in turn frames for this walk or the next
if (currentDir != 99)
lastRealDir = currentDir;
// check each turn condition in turn
if (((lastDir != 99) && (currentDir != 99)) && (megaId == GEORGE)) // only for george
- {
+ {
lastDir = currentDir - lastDir;//1 and -7 going right -1 and 7 going left
if (((lastDir == -1) || (lastDir == 7)) || ((lastDir == -2) || (lastDir == 6)))
{
@@ -951,13 +951,13 @@
frame = lastCount - framesPerStep;
do
{
- walkAnim[frame].frame += 104;//turning left
+ walkAnim[frame].frame += 104;//turning left
frame += 1;
}
while (frame < lastCount );
}
if (((lastDir == 1) || (lastDir == -7)) || ((lastDir == 2) || (lastDir == -6)))
- {
+ {
// turn at the end of the current walk
frame = lastCount - framesPerStep;
do
@@ -1155,7 +1155,7 @@
solid = 2;
modularPath[1].dir = smoothPath[0].dir;
modularPath[1].num = 0;
- }
+ }
modularPath[solid-1].x = smoothPath[smooth-1].x;
modularPath[solid-1].y = smoothPath[smooth-1].y;
// set up the end of the walk
@@ -1354,8 +1354,8 @@
left = 0;
lastCount = stepCount;
- lastDir = 99;// this ensures that we don't put in turn frames for the start
- currentDir = 99;// this ensures that we don't put in turn frames for the start
+ lastDir = 99;// this ensures that we don't put in turn frames for the start
+ currentDir = 99;// this ensures that we don't put in turn frames for the start
do
{
@@ -1411,7 +1411,7 @@
// Now is the time to put in the turn frames for the last turn
if ((stepCount - lastCount) < framesPerStep)// no step taken
{
- currentDir = 99;// this ensures that we don't put in turn frames for this walk or the next
+ currentDir = 99;// this ensures that we don't put in turn frames for this walk or the next
if (slowStart == 1)// clean up if a slow in but no walk
{
stepCount -= 3;
@@ -1421,7 +1421,7 @@
}
// check each turn condition in turn
if (((lastDir != 99) && (currentDir != 99)) && (megaId == GEORGE)) // only for george
- {
+ {
lastDir = currentDir - lastDir;//1 and -7 going right -1 and 7 going left
if (((lastDir == -1) || (lastDir == 7)) || ((lastDir == -2) || (lastDir == 6)))
{
@@ -1429,13 +1429,13 @@
frame = lastCount - framesPerStep;
do
{
- walkAnim[frame].frame += 104;//turning left
+ walkAnim[frame].frame += 104;//turning left
frame += 1;
}
while (frame < lastCount );
}
if (((lastDir == 1) || (lastDir == -7)) || ((lastDir == 2) || (lastDir == -6)))
- {
+ {
// turn at the end of the current walk
frame = lastCount - framesPerStep;
do
@@ -1453,7 +1453,7 @@
}
p = p + 1;
lastDir = currentDir;
- slowStart = 0; //can only be valid first time round
+ slowStart = 0; //can only be valid first time round
}
while (modularPath[p].dir < NO_DIRECTIONS);
@@ -1467,11 +1467,11 @@
// place stop frames here
// slowdown at the end of the last walk
frame = lastCount - framesPerStep;
- if (walkAnim[frame].frame == 24)
+ if (walkAnim[frame].frame == 24)
{
do
{
- walkAnim[frame].frame += 278;//stopping right
+ walkAnim[frame].frame += 278;//stopping right
frame += 1;
}
while (frame < lastCount );
@@ -1482,7 +1482,7 @@
walkAnim[stepCount].y = moduleY;
stepCount += 1;
}
- else if (walkAnim[frame].frame == 30)
+ else if (walkAnim[frame].frame == 30)
{
do
{
@@ -1503,11 +1503,11 @@
// place stop frames here
// slowdown at the end of the last walk
frame = lastCount - framesPerStep;
- if (walkAnim[frame].frame == 72)
+ if (walkAnim[frame].frame == 72)
{
do
{
- walkAnim[frame].frame += 244;//stopping left
+ walkAnim[frame].frame += 244;//stopping left
frame += 1;
}
while (frame < lastCount );
@@ -1518,11 +1518,11 @@
walkAnim[stepCount].y = moduleY;
stepCount += 1;
}
- else if (walkAnim[frame].frame == 78)
+ else if (walkAnim[frame].frame == 78)
{
do
{
- walkAnim[frame].frame += 245;//stopping left
+ walkAnim[frame].frame += 245;//stopping left
frame += 1;
}
while (frame < lastCount );
@@ -1562,7 +1562,7 @@
p=0;
#ifdef PLOT_PATHS
RouteLine(modularPath[i].x, modularPath[i].y, modularPath[i+1].x, modularPath[i+1].y, 227);
-#endif
+#endif
i += 1;
}
while (i<p-1);
@@ -1608,7 +1608,7 @@
int32 changed = 0;
// For all the nodes that have new values and a distance less than enddist
// ie dont check for new routes from a point we checked before or from a point
- // that is already further away than the best route so far.
+ // that is already further away than the best route so far.
i = 0;
do
{
@@ -1646,11 +1646,11 @@
}
k-=1;
}
- while (k > 0);
+ while (k > 0);
}
i=i+1;
}
- while (i < nnodes);
+ while (i < nnodes);
return changed;
}
@@ -1658,12 +1658,12 @@
int32 Router::NewCheck(int32 status, int32 x1 , int32 y1 , int32 x2 ,int32 y2)
/******************************************************************************
* NewCheck routine checks if the route between two points can be achieved
- * without crossing any of the bars in the Bars array.
+ * without crossing any of the bars in the Bars array.
*
* NewCheck differs from check in that that 4 route options are considered
* corresponding to actual walked routes.
*
- * Note distance doesnt take account of shrinking ???
+ * Note distance doesnt take account of shrinking ???
*
* Note Bars array must be properly calculated ie min max dx dy co
*****************************************************************************/
@@ -1674,11 +1674,11 @@
int32 dly;
int32 dirX;
int32 dirY;
- int32 step1;
- int32 step2;
- int32 step3;
- int32 steps;
- int32 options;
+ int32 step1;
+ int32 step2;
+ int32 step3;
+ int32 steps;
+ int32 options;
steps = 0;
options = 0;
@@ -1722,11 +1722,11 @@
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1, y1, x1+dx, y1, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1+dx, y1, x2, y2, 231);
-#endif
+#endif
}
}
//diagonal, square a code 2 route
@@ -1743,11 +1743,11 @@
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1, y1, x1+dlx,y1+dly, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1+dlx, y2, x2, y2, 231);
-#endif
+#endif
}
}
}
@@ -1768,15 +1768,15 @@
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1, y1, x1+dx/2, y1, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1+dx/2, y1, x1+dx/2+dlx, y2, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1+dx/2+dlx, y2, x2, y2, 231);
-#endif
+#endif
}
}
}
@@ -1797,15 +1797,15 @@
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1, y1, x1+dlx/2, y1+dly/2, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1+dlx/2, y1+dly/2, x1+dx+dlx/2, y1+dly/2, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1+dx+dlx/2, y1+dly/2, x2, y2, 231);
-#endif
+#endif
options = options + 8;
}
}
@@ -1834,11 +1834,11 @@
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1 ,y1 ,x1 ,y1+dy, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1 ,y1+dy ,x2, y2, 231);
-#endif
+#endif
options = options + 2;
}
}
@@ -1855,11 +1855,11 @@
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1, y1, x2, y1+dly, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x2, y1+dly, x2, y2, 231);
-#endif
+#endif
options = options + 4;
}
}
@@ -1880,15 +1880,15 @@
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1, y1, x1, y1+dy/2, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1, y1+dy/2, x2, y1+dy/2+dly, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x2, y1+dy/2+dly, x2, y2, 231);
-#endif
+#endif
options = options + 1;
}
}
@@ -1911,15 +1911,15 @@
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1, y1, x1+dlx/2, y1+dly/2, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1+dlx/2, y1+dly/2, x1+dlx/2, y1+dy+dly/2, 231);
-#endif
+#endif
#ifdef PLOT_PATHS
if (status == 1)
RouteLine(x1+dlx/2, y1+dy+dly/2, x2, y2, 231);
-#endif
+#endif
}
}
}
@@ -1942,7 +1942,7 @@
int32 Router::Check(int32 x1 , int32 y1 , int32 x2 ,int32 y2)
{
-//call the fastest line check for the given line
+//call the fastest line check for the given line
//returns 1 if line didn't cross any bars
int32 steps;
@@ -1972,7 +1972,7 @@
int32 dirx;
int32 diry;
int32 co;
- int32 slope;
+ int32 slope;
int32 i;
int32 xc;
int32 yc;
@@ -1980,7 +1980,7 @@
int32 ymin;
int32 xmax;
int32 ymax;
- int32 linesCrossed = 1;
+ int32 linesCrossed = 1;
if (x1 > x2)
@@ -2013,9 +2013,9 @@
do
{
// this is the inner inner loop
- if ((xmax >= bars[i].xmin) && ( xmin <= bars[i].xmax)) //skip if not on module
+ if ((xmax >= bars[i].xmin) && ( xmin <= bars[i].xmax)) //skip if not on module
{
- if ((ymax >= bars[i].ymin) && ( ymin <= bars[i].ymax)) //skip if not on module
+ if ((ymax >= bars[i].ymin) && ( ymin <= bars[i].ymax)) //skip if not on module
{
// okay its a valid line calculate an intersept
// wow but all this arithmatic we must have loads of time
@@ -2025,16 +2025,16 @@
//calculate x intercept and check its on both lines
xc = ((bars[i].co * dirx) - (co * bars[i].dx)) / slope;
- if ((xc >= xmin-1) && (xc <= xmax+1)) //skip if not on module
+ if ((xc >= xmin-1) && (xc <= xmax+1)) //skip if not on module
{
- if ((xc >= bars[i].xmin-1) && (xc <= bars[i].xmax+1)) //skip if not on line
+ if ((xc >= bars[i].xmin-1) && (xc <= bars[i].xmax+1)) //skip if not on line
{
yc = ((bars[i].co * diry) - (co * bars[i].dy)) / slope;
- if ((yc >= ymin-1) && (yc <= ymax+1)) //skip if not on module
+ if ((yc >= ymin-1) && (yc <= ymax+1)) //skip if not on module
{
- if ((yc >= bars[i].ymin-1) && (yc <= bars[i].ymax+1)) //skip if not on line
+ if ((yc >= bars[i].ymin-1) && (yc <= bars[i].ymax+1)) //skip if not on line
{
linesCrossed = 0;
}
@@ -2058,7 +2058,7 @@
int32 xc;
int32 xmin;
int32 xmax;
- int32 linesCrossed = 1;
+ int32 linesCrossed = 1;
if (x1 > x2)
{
@@ -2077,9 +2077,9 @@
do
{
// this is the inner inner loop
- if ((xmax >= bars[i].xmin) && ( xmin <= bars[i].xmax)) //skip if not on module
+ if ((xmax >= bars[i].xmin) && ( xmin <= bars[i].xmax)) //skip if not on module
{
- if ((y >= bars[i].ymin) && ( y <= bars[i].ymax)) //skip if not on module
+ if ((y >= bars[i].ymin) && ( y <= bars[i].ymax)) //skip if not on module
{
// okay its a valid line calculate an intersept
// wow but all this arithmatic we must have loads of time
@@ -2091,7 +2091,7 @@
{
dy = y-bars[i].y1;
xc = bars[i].x1 + (bars[i].dx * dy)/bars[i].dy;
- if ((xc >= xmin-1) && (xc <= xmax+1)) //skip if not on module
+ if ((xc >= xmin-1) && (xc <= xmax+1)) //skip if not on module
{
linesCrossed = 0;
}
@@ -2113,7 +2113,7 @@
int32 yc;
int32 ymin;
int32 ymax;
- int32 linesCrossed = 1;
+ int32 linesCrossed = 1;
if (y1 > y2)
{
@@ -2132,7 +2132,7 @@
{
if ((x >= bars[i].xmin) && ( x <= bars[i].xmax)) //overlapping
{
- if ((ymax >= bars[i].ymin) && ( ymin <= bars[i].ymax)) //skip if not on module
+ if ((ymax >= bars[i].ymin) && ( ymin <= bars[i].ymax)) //skip if not on module
{
// okay its a valid line calculate an intersept
// wow but all this arithmatic we must have loads of time
@@ -2144,7 +2144,7 @@
{
dx = x-bars[i].x1;
yc = bars[i].y1 + (bars[i].dy * dx)/bars[i].dx;
- if ((yc >= ymin-1) && (yc <= ymax+1)) //the intersept overlaps
+ if ((yc >= ymin-1) && (yc <= ymax+1)) //the intersept overlaps
{
linesCrossed = 0;
}
@@ -2185,16 +2185,16 @@
// this is the inner inner loop
- if ((xmax >= bars[i].xmin) && ( xmin <= bars[i].xmax)) //overlapping line
+ if ((xmax >= bars[i].xmin) && ( xmin <= bars[i].xmax)) //overlapping line
{
- if ((ymax >= bars[i].ymin) && ( ymin <= bars[i].ymax)) //overlapping line
+ if ((ymax >= bars[i].ymin) && ( ymin <= bars[i].ymax)) //overlapping line
{
- // okay this line overlaps the target calculate an y intersept for x
+ // okay this line overlaps the target calculate an y intersept for x
if (bars[i].dx == 0)// vertical line so we know it overlaps y
{
- yc = 0;
+ yc = 0;
}
else
{
@@ -2202,7 +2202,7 @@
yc = bars[i].y1 + (bars[i].dy * dx)/bars[i].dx;
}
- if ((yc >= ymin) && (yc <= ymax)) //overlapping point for y
+ if ((yc >= ymin) && (yc <= ymax)) //overlapping point for y
{
onLine = 3;// target on a line so drop out
//Tdebug("RouteFail due to target on a line %d %d",x,y);
@@ -2219,7 +2219,7 @@
xc = bars[i].x1 + (bars[i].dx * dy)/bars[i].dy;
}
- if ((xc >= xmin) && (xc <= xmax)) //skip if not on module
+ if ((xc >= xmin) && (xc <= xmax)) //skip if not on module
{
onLine = 3;// target on a line so drop out
//Tdebug("RouteFail due to target on a line %d %d",x,y);
@@ -2278,7 +2278,7 @@
error("RouteFinder Error too many bars %d", nbars);
#endif
nbars = 0;
- }
+ }
nnodes = FROM_LE_32(floorHeader.numNodes)+1; //array starts at 0 begins at a start node has nnodes nodes and a target node
@@ -2406,7 +2406,7 @@
// finish setting grid by putting mega node at begining
// and target node at end and reset current values
node[0].x = startX;
- node[0].y = startY;
+ node[0].y = startY;
node[0].level = 1;
node[0].prev = 0;
node[0].dist = 0;
@@ -2420,7 +2420,7 @@
}
while (i < nnodes);
node[nnodes].x = targetX;
- node[nnodes].y = targetY;
+ node[nnodes].y = targetY;
node[nnodes].level = 0;
node[nnodes].prev = 0;
node[nnodes].dist = 9999;
@@ -2436,7 +2436,7 @@
/****************************************************************************
* ExtractRoute gets route from the node data after a full scan, route is
* written with just the basic way points and direction options for heading
- * to the next point.
+ * to the next point.
****************************************************************************/
{
int32 prev;
@@ -2488,7 +2488,7 @@
{
#ifdef PLOT_PATHS
BresenhamLine(route[p+1].x-128,route[p+1].y-128, route[p].x-128,route[p].y-128, (uint8*)screen_ad, true_pixel_size_x, pixel_size_y, ROUTE_END_FLAG);
-#endif
+#endif
dx = route[p+1].x - route[p].x;
dy = route[p+1].y - route[p].y;
dirx = 1;
@@ -2519,17 +2519,17 @@
dir = dir + diry * dirx; // 1,3,5 or 7
route[p].dirD = dir;
}
- p = p + 1;
+ p = p + 1;
}
while (p < (routeLength));
// set the last dir to continue previous route unless specified
if (targetDir == NO_DIRECTIONS)
- {
+ {
route[p].dirS = route[p-1].dirS;
route[p].dirD = route[p-1].dirD;
}
else
- {
+ {
route[p].dirS = targetDir;
route[p].dirD = targetDir;
}
Index: router.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/router.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- router.h 24 Jun 2005 15:23:50 -0000 1.9
+++ router.h 30 Jul 2005 21:11:45 -0000 1.10
@@ -152,8 +152,8 @@
int32 LoadWalkResources(Object *mega, int32 x, int32 y, int32 targetDir);
int32 GetRoute(void);
int32 CheckTarget(int32 x, int32 y);
-
- int32 Scan(int32 level);
+
+ int32 Scan(int32 level);
int32 NewCheck(int32 status, int32 x1, int32 x2, int32 y1, int32 y2);
int32 Check(int32 x1, int32 y1, int32 x2, int32 y2);
int32 HorizCheck(int32 x1, int32 y, int32 x2);
@@ -164,7 +164,7 @@
int32 SlidyPath();
void SlidyWalkAnimator(WalkData *walkAnim);
-
+
int32 SmoothestPath();
int32 SmoothCheck(int32 best, int32 p, int32 dirS, int32 dirD);
@@ -174,6 +174,6 @@
void BresenhamLine(int32 x1,int32 y1,int32 x2,int32 y2, uint8 *screen, int32 width, int32 height, int32 colour);
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif //BSROUTER_H
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- screen.cpp 24 Jun 2005 15:23:50 -0000 1.54
+++ screen.cpp 30 Jul 2005 21:11:45 -0000 1.55
@@ -203,7 +203,7 @@
if (diffY) {
diffY = SCRNGRID_Y - diffY;
uint16 cpWidth = 0;
- for (uint16 cntx = 0; cntx < gridW; cntx++)
+ for (uint16 cntx = 0; cntx < gridW; cntx++)
if (gridPos[cntx]) {
gridPos[cntx] >>= 1;
cpWidth++;
@@ -397,7 +397,7 @@
frameHead = _textMan->giveSpriteData((uint8)compact->o_target);
else
frameHead = _resMan->fetchFrame(_resMan->openFetchRes(compact->o_resource), compact->o_frame);
-
+
uint8 *sprData = ((uint8*)frameHead) + sizeof(FrameHeader);
uint16 spriteX = compact->o_anim_x;
@@ -496,7 +496,7 @@
if (*grid) {
uint8 *blkData = _layerBlocks[level + 1] + (READ_LE_UINT16(grid) - 1) * 128;
blitBlockClear(x + blkx, y + blky, blkData);
- } else
+ } else
break;
grid -= lGridSizeX;
}
@@ -821,7 +821,7 @@
int16 sprY = *pSprY - SCREEN_TOP_EDGE;
int16 sprW = *pSprWidth;
int16 sprH = *pSprHeight;
-
+
if (sprY < 0) {
*incr = (uint16)((-sprY) * sprW);
sprH += sprY;
@@ -833,7 +833,7 @@
sprW += sprX;
sprX = 0;
}
-
+
if (sprY + sprH > _scrnSizeY)
sprH = _scrnSizeY - sprY;
if (sprX + sprW > _scrnSizeX)
Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- screen.h 11 Mar 2005 15:30:26 -0000 1.20
+++ screen.h 30 Jul 2005 21:11:45 -0000 1.21
@@ -139,7 +139,7 @@
SortSpr _sortList[MAX_SORT];
uint8 _foreLength, _backLength, _sortLength;
uint16 _scrnSizeX, _scrnSizeY, _gridSizeX, _gridSizeY;
-
+
static RoomDef _roomDefTable[TOTAL_ROOMS]; // from ROOMS.C (not const, see fnSetParallax)
uint8 _targetPalette[256 * 4];
@@ -150,7 +150,7 @@
// mainloop that no further fading is necessary.
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif //BSSCREEN_H
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- sound.cpp 24 Jun 2005 15:23:50 -0000 1.46
+++ sound.cpp 30 Jul 2005 21:11:45 -0000 1.47
@@ -137,7 +137,7 @@
if (_currentCowFile != SwordEngine::_systemVars.currentCD) {
if (_currentCowFile)
closeCowSystem();
- initCowSystem();
+ initCowSystem();
}
}
@@ -191,7 +191,7 @@
int16 *data = uncompressSpeech(index + _cowHeaderSize, sampleSize, &size);
if (data)
_mixer->playRaw(&_speechHandle, data, size, 11025, SPEECH_FLAGS, SOUND_SPEECH_ID, speechVol, speechPan);
- }
+ }
#ifdef USE_MAD
else if (_cowMode == CowMp3) {
_cowFile.seek(index);
@@ -208,7 +208,7 @@
_cowFile.seek(index);
_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_speechHandle, makeVorbisStream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan);
for (int cnt = 0; cnt < 480; cnt++)
- _waveVolume[cnt] = true;
+ _waveVolume[cnt] = true;
_waveVolPos = 0;
}
#endif
@@ -242,7 +242,7 @@
} else {
// the demo speech files have the uncompressed size embedded
// in the compressed stream *sigh*
- if (READ_LE_UINT16(fBuf + headerPos) == 1) {
+ if (READ_LE_UINT16(fBuf + headerPos) == 1) {
resSize = READ_LE_UINT16(fBuf + headerPos + 2);
resSize |= READ_LE_UINT16(fBuf + headerPos + 6) << 16;
} else
@@ -297,7 +297,7 @@
warning("Wave vol tab too small.");
return;
}
- int32 average = 0;
+ int32 average = 0;
for (cnt = 0; cnt < 918; cnt++)
average += blkPos[cnt];
average /= 918;
@@ -327,7 +327,7 @@
if (_cowFile.isOpen()) {
debug(1, "Using MP3 compressed Speech Cluster");
_cowMode = CowMp3;
- }
+ }
#endif
#ifdef USE_VORBIS
if (!_cowFile.isOpen()) {
@@ -364,7 +364,7 @@
_cowHeader[cnt] = _cowFile.readUint32LE();
_currentCowFile = SwordEngine::_systemVars.currentCD;
} else
- warning("Sound::initCowSystem: Can't open SPEECH%d.CLU", SwordEngine::_systemVars.currentCD);
+ warning("Sound::initCowSystem: Can't open SPEECH%d.CLU", SwordEngine::_systemVars.currentCD);
}
void Sound::closeCowSystem(void) {
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sound.h 24 Jun 2005 15:56:27 -0000 1.22
+++ sound.h 30 Jul 2005 21:11:45 -0000 1.23
@@ -105,7 +105,7 @@
CowMode _cowMode;
Audio::SoundHandle _speechHandle, _fxHandle;
Common::RandomSource _rnd;
-
+
QueueElement _fxQueue[MAX_FXQ_LENGTH];
uint8 _endOfQueue;
Audio::Mixer *_mixer;
@@ -121,6 +121,6 @@
#endif
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif //BSSOUND_H
Index: staticres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/staticres.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- staticres.cpp 24 Jun 2005 15:23:50 -0000 1.11
+++ staticres.cpp 30 Jul 2005 21:11:45 -0000 1.12
@@ -1055,13 +1055,13 @@
SCRIPT0, // 0 STANDARD SCRIPTS
SCRIPT1, // 1 PARIS 1
- SCRIPT2, // 2
- SCRIPT3, // 3
- SCRIPT4, // 4
- SCRIPT5, // 5
- SCRIPT6, // 6
- SCRIPT7, // 7
- SCRIPT8, // 8
+ SCRIPT2, // 2
[...1393 lines suppressed...]
};
#endif
@@ -6523,7 +6523,7 @@
{181,182,184,0}, // 57
{181,182,184,0}, // 58
{0}, // 59
- {184,0}, // 60
+ {184,0}, // 60
{185,0}, // 61
{0}, // 62 Just music
@@ -6577,7 +6577,7 @@
(uint8)(VAL & 0xFF), (uint8)((VAL >> 8) & 0xFF), (uint8)(VAL >> 16)
#define ENCODE32(VAL) \
(uint8)(VAL & 0xFF), (uint8)((VAL >> 8) & 0xFF), (uint8)((VAL >> 16) & 0xFF), (uint8)(VAL >> 24)
-
+
#define LOGIC_CALL_FN(FN_ID, PARAM) \
opcCallFn, ENCODE8(FN_ID), ENCODE8(PARAM)
#define LOGIC_CALL_FN_LONG(FN_ID, PARAM1, PARAM2, PARAM3) \
Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- sword1.cpp 24 Jun 2005 15:56:27 -0000 1.89
+++ sword1.cpp 30 Jul 2005 21:11:45 -0000 1.90
@@ -49,7 +49,7 @@
/* Broken Sword 1 */
static const GameSettings sword1FullSettings =
{"sword1", "Broken Sword I", GF_DEFAULT_TO_1X_SCALER};
-static const GameSettings sword1DemoSettings =
+static const GameSettings sword1DemoSettings =
{"sword1demo", "Broken Sword I (Demo)", GF_DEFAULT_TO_1X_SCALER | Sword1::GF_DEMO };
// check these subdirectories (if present)
@@ -221,7 +221,7 @@
}
_systemVars.showText = ConfMan.getBool("subtitles");
-
+
_systemVars.playSpeech = 1;
_mouseState = 0;
@@ -229,7 +229,7 @@
_objectMan->initialize();
_mouse->initialize();
_control = new Control(_saveFileMan, _resMan, _objectMan, _system, _mouse, _sound, _music);
-
+
return 0;
}
@@ -257,7 +257,7 @@
"The file \"%s\" is missing and the game doesn't work without it.\n"
"Please copy it from CD %d and try starting the game again.\n"
"The Readme file also contains further information.",
-
+
"%d important files are missing, the game can't start without them.\n"
"Please copy these files from their corresponding CDs:\n",
@@ -361,7 +361,7 @@
if (((_features & GF_DEMO) == 0) != isFullVersion) // shouldn't happen...
warning("Your Broken Sword 1 version looks like a %s version but you are starting it as a %s version", isFullVersion ? "full" : "demo", (_features & GF_DEMO) ? "demo" : "full");
-
+
if (foundTypes[TYPE_SPEECH1]) // we found some kind of speech1 file (.clu, .cl3, .clv)
missingTypes[TYPE_SPEECH1] = false; // so we don't care if there's a different kind missing
if (foundTypes[TYPE_SPEECH2]) // same for speech2
@@ -384,7 +384,7 @@
if (missingTypes[flagCnt] && ((_cdFileList[fileCnt].flags & (1 << flagCnt)) != 0))
fileExists[fileCnt] = false; // this is one of the files we were looking for
}
- if (missingTypes[TYPE_IMMED]) {
+ if (missingTypes[TYPE_IMMED]) {
// important files missing, can't start the game without them
showFileErrorMsg(TYPE_IMMED, fileExists);
} else if ((!missingTypes[TYPE_CD1]) && !cd2FilesFound) {
@@ -462,7 +462,7 @@
_systemVars.controlPanelMode = CP_NORMAL;
}
}
-
+
return 0;
}
@@ -475,7 +475,7 @@
_control->askForCd();
} // else: there is already a cd inserted and we don't care if it's cd1 or cd2.
} else if (needCd != _systemVars.currentCD) { // we need a different CD than the one in drive.
- _music->startMusic(0, 0); //
+ _music->startMusic(0, 0); //
_sound->closeCowSystem(); // close music and sound files before changing CDs
_systemVars.currentCD = needCd; // askForCd will ask the player to insert _systemVars.currentCd,
_control->askForCd(); // so it has to be updated before calling it.
@@ -500,7 +500,7 @@
_logic->newScreen(Logic::_scriptVars[NEW_SCREEN]);
_sound->newScreen(Logic::_scriptVars[NEW_SCREEN]);
Logic::_scriptVars[SCREEN] = Logic::_scriptVars[NEW_SCREEN];
-
+
do {
uint32 newTime;
bool scrollFrameShown = false;
@@ -524,7 +524,7 @@
newTime = _system->getMillis();
if ((newTime - frameTime < 1000 / FRAME_RATE) || (!scrollFrameShown))
_screen->updateScreen();
- delay((1000 / FRAME_RATE) - (_system->getMillis() - frameTime));
+ delay((1000 / FRAME_RATE) - (_system->getMillis() - frameTime));
_mouse->engine( _mouseX, _mouseY, _mouseState);
Index: sworddefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sworddefs.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sworddefs.h 10 Jan 2005 22:43:21 -0000 1.19
+++ sworddefs.h 30 Jul 2005 21:11:45 -0000 1.20
@@ -1601,5 +1601,5 @@
#define SCR_icon_combine_script (0*0x10000 + 25)
} // End of namespace Sword1
-
+
#endif //SWORDDEFS_H
Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/text.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- text.cpp 24 Jun 2005 15:23:51 -0000 1.13
+++ text.cpp 30 Jul 2005 21:11:45 -0000 1.14
@@ -76,7 +76,7 @@
void Text::makeTextSprite(uint8 slot, uint8 *text, uint16 maxWidth, uint8 pen) {
LineInfo lines[MAX_LINES];
uint16 numLines = analyzeSentence(text, maxWidth, lines);
-
+
uint16 sprWidth = 0;
uint16 lineCnt;
for (lineCnt = 0; lineCnt < numLines; lineCnt++)
Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/text.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- text.h 1 Jan 2005 16:09:25 -0000 1.6
+++ text.h 30 Jul 2005 21:11:45 -0000 1.7
@@ -59,6 +59,6 @@
uint32 _fontId;
};
-} // End of namespace Sword1
+} // End of namespace Sword1
#endif //BSTEXT_H
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound audiocd.cpp,1.21,1.22 audiostream.cpp,1.74,1.75 audiostream.h,1.47,1.48 flac.cpp,1.10,1.11 fmopl.cpp,1.31,1.32 fmopl.h,1.16,1.17 mididrv.cpp,1.64,1.65 mididrv.h,1.48,1.49 midiparser_xmidi.cpp,1.21,1.22 mixer.cpp,1.193,1.194 mixer.h,1.107,1.108 mp3.cpp,1.23,1.24 mpu401.cpp,1.31,1.32 rate.cpp,1.40,1.41 vorbis.cpp,1.26,1.27 wave.cpp,1.7,1.8
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/missing _stdio.cpp,1.13,1.14 _stdlib.cpp,1.10,1.11 _string.cpp,1.7,1.8 _time.cpp,1.6,1.7 _unistd.cpp,1.6,1.7 memory.h,1.3,1.4 stdio.h,1.7,1.8 unistd.h,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list