[Scummvm-cvs-logs] CVS: scummvm/sword1 debug.h,1.1,1.2 eventman.cpp,1.1,1.2 logic.cpp,1.13,1.14 memman.cpp,1.1,1.2 mouse.cpp,1.7,1.8 mouse.h,1.4,1.5 objectman.h,1.1,1.2 resman.cpp,1.5,1.6 resman.h,1.2,1.3 router.cpp,1.5,1.6 router.h,1.3,1.4 screen.cpp,1.10,1.11 screen.h,1.4,1.5 sound.cpp,1.8,1.9 sword1.cpp,1.12,1.13 sword1.h,1.3,1.4 sworddefs.h,1.7,1.8
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Fri Dec 19 06:08:01 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.56,1.57 graphics.h,1.47,1.48 logic.cpp,1.135,1.136 queen.cpp,1.56,1.57 queen.h,1.20,1.21 xref.txt,1.48,1.49
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 logic.cpp,1.14,1.15 router.cpp,1.6,1.7 screen.cpp,1.11,1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv16602
Modified Files:
debug.h eventman.cpp logic.cpp memman.cpp mouse.cpp mouse.h
objectman.h resman.cpp resman.h router.cpp router.h screen.cpp
screen.h sound.cpp sword1.cpp sword1.h sworddefs.h
Log Message:
Whitespace changes
Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/debug.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug.h 16 Dec 2003 02:09:24 -0000 1.1
+++ debug.h 19 Dec 2003 14:07:12 -0000 1.2
@@ -26,7 +26,7 @@
class SwordDebug {
public:
- static void interpretScript(uint32 id, uint32 level, uint32 script, uint32 pc);
+ static void interpretScript(uint32 id, uint32 level, uint32 script, uint32 pc);
static void callMCode(uint32 mcodeNum, uint32 paramCount, int32 a, int32 b, int32 c, int32 d, int32 e, int32 f);
private:
Index: eventman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/eventman.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- eventman.cpp 16 Dec 2003 02:09:24 -0000 1.1
+++ eventman.cpp 19 Dec 2003 14:07:12 -0000 1.2
@@ -65,7 +65,7 @@
if (pause) {
cpt->o_pause = pause;
cpt->o_logic = LOGIC_pause_for_event;
- return SCRIPT_STOP;
+ return SCRIPT_STOP;
}
for (uint8 objCnt = 0; objCnt < O_TOTAL_EVENTS; objCnt++) {
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- logic.cpp 18 Dec 2003 14:16:08 -0000 1.13
+++ logic.cpp 19 Dec 2003 14:07:12 -0000 1.14
@@ -184,7 +184,7 @@
logicRet=1;
break;
case LOGIC_bookmark:
- memcpy(&(compact->o_tree.o_script_level), &(compact->o_bookmark.o_script_level), sizeof(ScriptTree));
+ memcpy(&(compact->o_tree.o_script_level), &(compact->o_bookmark.o_script_level), sizeof(ScriptTree));
compact->o_logic = LOGIC_script;
logicRet = 1;
break;
@@ -395,7 +395,7 @@
} else
compact->o_tree.o_script_pc[level] = ret;
} while (!ret);
- return 1;
+ return 1;
//Logic continues - but the script must have changed logic mode
//this is a radical change from S2.0 where once a script finished there
//was no more processing for that object on that cycle - the Logic_engine terminated.
@@ -549,7 +549,7 @@
debug(9, "IT_SCRIPTEND");
return 0;
case IT_POPVAR: // pop a variable
- debug(9, "IT_POPVAR: ScriptVars[%d] = %d", scriptCode[pc], stack[stackIdx-1]);
+ debug(9, "IT_POPVAR: ScriptVars[%d] = %d", scriptCode[pc], stack[stackIdx-1]);
_scriptVars[scriptCode[pc++]] = stack[--stackIdx];
break;
case IT_POPLONGOFFSET:
@@ -788,7 +788,7 @@
cpt->o_logic = LOGIC_anim;
cpt->o_anim_pc = 0;
cpt->o_sync = 0;
- return SCRIPT_STOP;
+ return SCRIPT_STOP;
}
int SwordLogic::fnSetFrame(BsObject *cpt, int32 id, int32 cdt, int32 spr, int32 frameNo, int32 f, int32 z, int32 x) {
@@ -1067,7 +1067,7 @@
_speechRunning = _sound->startSpeech(textNo >> 16, textNo & 0xFFFF);
else
_speechRunning = false;
- _speechFinished = false;
+ _speechFinished = false;
if (SwordEngine::_systemVars.showText || (!_speechRunning)) {
_textRunning = true;
@@ -1125,7 +1125,7 @@
target->o_ins1 = param1;
target->o_ins2 = param2;
target->o_ins3 = param3;
- return SCRIPT_CONT;
+ return SCRIPT_CONT;
}
//send an instruction to mega we're talking to and wait
@@ -1176,7 +1176,7 @@
int SwordLogic::fnCheckForTextLine(BsObject *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) {
_scriptVars[RETURN_VALUE] = _objMan->fnCheckForTextLine(id);
- return SCRIPT_CONT;
+ return SCRIPT_CONT;
}
int SwordLogic::fnAddTalkWaitStatusBit(BsObject *cpt, int32 id, int32 c, int32 d, int32 e, int32 f, int32 z, int32 x) {
@@ -1306,7 +1306,7 @@
BsObject *floorCpt = _objMan->fetchObject(floor);
cpt->o_scale_a = floorCpt->o_scale_a;
cpt->o_scale_b = floorCpt->o_scale_b;
- return SCRIPT_CONT;
+ return SCRIPT_CONT;
}
int SwordLogic::fnWalk(BsObject *cpt, int32 id, int32 x, int32 y, int32 dir, int32 stance, int32 a, int32 b) {
@@ -1350,7 +1350,7 @@
cpt->o_down_flag = 1; // pretend it was successful
else
cpt->o_down_flag = 0; // 0 means error
-
+
return SCRIPT_CONT;
}
@@ -1446,7 +1446,7 @@
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;
- return SCRIPT_STOP;
+ return SCRIPT_STOP;
}
int SwordLogic::fnGetToError(BsObject *cpt, int32 id, int32 a, int32 b, int32 c, int32 d, int32 z, int32 x) {
Index: memman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/memman.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- memman.cpp 16 Dec 2003 02:09:24 -0000 1.1
+++ memman.cpp 19 Dec 2003 14:07:12 -0000 1.2
@@ -42,7 +42,7 @@
warning("%d Bytes alloced as FREEABLE.", pSize); // why should one want to alloc mem if it can be freed?
addToFreeList(bsMem);
} else if (bsMem->next || bsMem->prev) // it's in our _freeAble list, remove it from there
- removeFromFreeList(bsMem);
+ removeFromFreeList(bsMem);
checkMemoryUsage();
}
Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mouse.cpp 18 Dec 2003 14:38:17 -0000 1.7
+++ mouse.cpp 19 Dec 2003 14:07:12 -0000 1.8
@@ -197,7 +197,7 @@
_specialPtrId = resId;
_specialPtr = (MousePtr*)_resMan->mouseResOpen(resId);
}
- animate();
+ animate();
_system->show_mouse(true);
}
}
@@ -249,7 +249,7 @@
}
void SwordMouse::fnUnlockMouse(void) {
- _mouseStatus &= 1;
+ _mouseStatus &= 1;
}
void SwordMouse::giveCoords(uint16 *x, uint16 *y) {
Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/mouse.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mouse.h 18 Dec 2003 14:38:17 -0000 1.4
+++ mouse.h 19 Dec 2003 14:07:12 -0000 1.5
@@ -67,8 +67,8 @@
class SwordMouse {
public:
SwordMouse(OSystem *system, ResMan *pResMan, ObjectMan *pObjMan);
- void addToList(int id, BsObject *compact);
- void useLogicAndMenu(SwordLogic *pLogic, SwordMenu *pMenu);
+ void addToList(int id, BsObject *compact);
+ void useLogicAndMenu(SwordLogic *pLogic, SwordMenu *pMenu);
void setLuggage(uint32 resID, uint32 rate);
void setPointer(uint32 resID, uint32 rate);
void animate(void);
Index: objectman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/objectman.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- objectman.h 16 Dec 2003 02:09:25 -0000 1.1
+++ objectman.h 19 Dec 2003 14:07:12 -0000 1.2
@@ -44,7 +44,7 @@
void unlockText(uint32 textId);
uint32 lastTextNumber(int section);
- void closeSection(uint32 screen);
+ void closeSection(uint32 screen);
private:
ResMan *_resMan;
static const uint32 _objectList[TOTAL_SECTIONS]; //a table of pointers to object files
Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/resman.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- resman.cpp 18 Dec 2003 01:15:15 -0000 1.5
+++ resman.cpp 19 Dec 2003 14:07:12 -0000 1.6
@@ -85,7 +85,7 @@
_memMan->initHandle(group->resHandle + resCnt);
}
}
- free(resIdIdx);
+ free(resIdIdx);
} else
cluster->grp[grpCnt] = NULL;
free(grpIndex);
@@ -200,7 +200,7 @@
FrameHeader *ResMan::fetchFrame(void *resourceData, uint32 frameNo) {
uint8 *frameFile = (uint8*)resourceData;
- uint8 *idxData = frameFile + sizeof(Header);
+ uint8 *idxData = frameFile + sizeof(Header);
if (frameNo >= READ_LE_UINT32(idxData))
error("fetchFrame:: frame %d doesn't exist in resource.", frameNo);
frameFile += READ_LE_UINT32(idxData + (frameNo+1) * 4);
Index: resman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/resman.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- resman.h 17 Dec 2003 01:47:47 -0000 1.2
+++ resman.h 19 Dec 2003 14:07:12 -0000 1.3
@@ -68,7 +68,7 @@
void openCptResourceBigEndian(uint32 id);
void openScriptResourceBigEndian(uint32 id);
- File *openClusterFile(uint32 id);
+ File *openClusterFile(uint32 id);
void makePathToCluster(char *str);
void loadCluDescript(const char *fileName);
void freeCluDescript(void);
Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/router.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- router.cpp 18 Dec 2003 12:15:59 -0000 1.5
+++ router.cpp 19 Dec 2003 14:07:12 -0000 1.6
@@ -326,7 +326,7 @@
* steps taken between two points to the shrunken step size
*
*/
- int32 p;
+ int32 p;
int32 dirS;
int32 dirD;
int32 dS;
@@ -345,12 +345,12 @@
int32 steps;
int32 option;
[...1427 lines suppressed...]
int32 dir;
@@ -2554,12 +2552,12 @@
routeLength = routeLength - 1;
// okay the route exists as a series point now put in some directions
- p = 0;
- do
- {
- #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
+ p = 0;
+ do
+ {
+#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
dx = route[p+1].x - route[p].x;
dy = route[p+1].y - route[p].y;
dirx = 1;
Index: router.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/router.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- router.h 17 Dec 2003 01:18:03 -0000 1.3
+++ router.h 19 Dec 2003 14:07:12 -0000 1.4
@@ -177,7 +177,7 @@
int32 SmoothestPath();
int32 SmoothCheck(int32 best, int32 p, int32 dirS, int32 dirD);
- int32 SolidPath();
+ int32 SolidPath();
int32 SolidWalkAnimator(WalkData *walkAnim);
void RouteLine(int32 x1,int32 y1,int32 x2,int32 y2 ,int32 colour);
void BresenhamLine(int32 x1,int32 y1,int32 x2,int32 y2, uint8 *screen, int32 width, int32 height, int32 colour);
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- screen.cpp 18 Dec 2003 01:00:42 -0000 1.10
+++ screen.cpp 19 Dec 2003 14:07:12 -0000 1.11
@@ -292,7 +292,7 @@
for (uint8 cnt = 0; cnt < _sortLength - 1; cnt++)
for (uint8 sCnt = 0; sCnt < _sortLength - 1; sCnt++)
if (_sortList[sCnt].y > _sortList[sCnt + 1].y) {
- temp = _sortList[sCnt];
+ temp = _sortList[sCnt];
_sortList[sCnt] = _sortList[sCnt + 1];
_sortList[sCnt + 1] = temp;
}
@@ -422,7 +422,7 @@
for (uint16 blky = 0; blky < bHeight; blky++) {
if (*grid) {
uint8 *blkData = _layerBlocks[level + 1] + (READ_LE_UINT16(grid) - 1) * 128;
- blitBlockClear(x + blkx, y + blky, blkData);
+ blitBlockClear(x + blkx, y + blky, blkData);
}
grid += lGridSizeX;
}
@@ -460,7 +460,7 @@
if (doSkip <= remain)
remain -= doSkip;
else {
- xPos = doSkip - remain;
+ xPos = doSkip - remain;
dest += xPos;
remain = 0;
}
@@ -528,7 +528,7 @@
uint32 newRow = step >> 1;
uint32 oldRow = 0;
- uint8 *destPos = dest;
+ uint8 *destPos = dest;
for (uint16 lnCnt = 0; lnCnt < resHeight; lnCnt++) {
while (oldRow < (newRow >> 8)) {
oldRow++;
@@ -681,7 +681,7 @@
sprH = _scrnSizeY - sprY;
if (sprX + sprW > _scrnSizeX)
sprW = _scrnSizeX - sprX;
-
+
if (sprH < 0)
*pSprHeight = 0;
else
@@ -742,48 +742,48 @@
}
void SwordScreen::hline(uint16 x1, uint16 x2, uint16 y) {
- for (uint16 cntx = x1; cntx <= x2; cntx++)
+ for (uint16 cntx = x1; cntx <= x2; cntx++)
_screenBuf[y * _scrnSizeX + cntx] = 0;
}
void SwordScreen::bsubline_1(uint16 x1, uint16 y1, uint16 x2, uint16 y2) {
int x, y, ddx, ddy, e;
- ddx = abs(x2 - x1);
- ddy = abs(y2 - y1) << 1;
- e = ddx - ddy;
- ddx <<= 1;
-
- if (x1 > x2) {
+ ddx = abs(x2 - x1);
+ ddy = abs(y2 - y1) << 1;
+ e = ddx - ddy;
+ ddx <<= 1;
+
+ if (x1 > x2) {
uint16 tmp;
tmp = x1; x1 = x2; x2 = tmp;
tmp = y1; y1 = y2; y2 = tmp;
- }
-
- for (x = x1, y = y1; x <= x2; x++) {
+ }
+
+ for (x = x1, y = y1; x <= x2; x++) {
_screenBuf[y * _scrnSizeX + x] = 0;
if (e < 0) {
- y++;
- e += ddx - ddy;
+ y++;
+ e += ddx - ddy;
} else {
- e -= ddy;
+ e -= ddy;
}
- }
+ }
}
void SwordScreen::bsubline_2(uint16 x1, uint16 y1, uint16 x2, uint16 y2) {
int x, y, ddx, ddy, e;
- ddx = abs(x2 - x1) << 1;
- ddy = abs(y2 - y1);
- e = ddy - ddx;
- ddy <<= 1;
-
- if (y1 > y2) {
+ ddx = abs(x2 - x1) << 1;
+ ddy = abs(y2 - y1);
+ e = ddy - ddx;
+ ddy <<= 1;
+
+ if (y1 > y2) {
uint16 tmp;
tmp = x1; x1 = x2; x2 = tmp;
tmp = y1; y1 = y2; y2 = tmp;
- }
-
- for (y = y1, x = x1; y <= y2; y++) {
+ }
+
+ for (y = y1, x = x1; y <= y2; y++) {
_screenBuf[y * _scrnSizeX + x] = 0;
if (e < 0) {
x++;
@@ -791,80 +791,80 @@
} else {
e -= ddx;
}
- }
+ }
}
void SwordScreen::bsubline_3(uint16 x1, uint16 y1, uint16 x2, uint16 y2) {
int x, y, ddx, ddy, e;
- ddx = abs(x1 - x2) << 1;
- ddy = abs(y2 - y1);
- e = ddy - ddx;
- ddy <<= 1;
-
- if (y1 > y2) {
+ ddx = abs(x1 - x2) << 1;
+ ddy = abs(y2 - y1);
+ e = ddy - ddx;
+ ddy <<= 1;
+
+ if (y1 > y2) {
uint16 tmp;
tmp = x1; x1 = x2; x2 = tmp;
tmp = y1; y1 = y2; y2 = tmp;
- }
+ }
- for (y = y1, x = x1; y <= y2; y++) {
+ for (y = y1, x = x1; y <= y2; y++) {
_screenBuf[y * _scrnSizeX + x] = 0;
if (e < 0) {
x--;
- e += ddy - ddx;
+ e += ddy - ddx;
} else {
e -= ddx;
}
- }
+ }
}
void SwordScreen::bsubline_4(uint16 x1, uint16 y1, uint16 x2, uint16 y2) {
int x, y, ddx, ddy, e;
- ddy = abs(y2 - y1) << 1;
- ddx = abs(x1 - x2);
- e = ddx - ddy;
- ddx <<= 1;
-
- if (x1 > x2) {
+ ddy = abs(y2 - y1) << 1;
+ ddx = abs(x1 - x2);
+ e = ddx - ddy;
+ ddx <<= 1;
+
+ if (x1 > x2) {
uint16 tmp;
tmp = x1; x1 = x2; x2 = tmp;
tmp = y1; y1 = y2; y2 = tmp;
- }
-
- for (x = x1, y = y1; x <= x2; x++) {
+ }
+
+ for (x = x1, y = y1; x <= x2; x++) {
_screenBuf[y * _scrnSizeX + x] = 0;
if (e < 0) {
- y--;
- e += ddx - ddy;
+ y--;
+ e += ddx - ddy;
} else {
- e -= ddy;
+ e -= ddy;
}
- }
+ }
}
void SwordScreen::drawLine(uint16 x1, uint16 y1, uint16 x2, uint16 y2) {
if ((x1 == x2) && (y1 == y2)) {
_screenBuf[x1 + y1 * _scrnSizeX] = 0;
}
- if (x1 == x2) {
+ if (x1 == x2) {
vline(x1, MIN(y1, y2), MAX(y1, y2));
return;
- }
-
- if (y1 == y2) {
+ }
+
+ if (y1 == y2) {
hline(MIN(x1, x2), MAX(x1, x2), y1);
return;
- }
+ }
- float k = float(y2 - y1) / float(x2 - x1);
-
- if ((k >= 0) && (k <= 1)) {
+ float k = float(y2 - y1) / float(x2 - x1);
+
+ if ((k >= 0) && (k <= 1)) {
bsubline_1(x1, y1, x2, y2);
- } else if (k > 1) {
+ } else if (k > 1) {
bsubline_2(x1, y1, x2, y2);
- } else if ((k < 0) && (k >= -1)) {
+ } else if ((k < 0) && (k >= -1)) {
bsubline_4(x1, y1, x2, y2);
- } else {
+ } else {
bsubline_3(x1, y1, x2, y2);
- }
+ }
}
Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- screen.h 17 Dec 2003 07:33:00 -0000 1.4
+++ screen.h 19 Dec 2003 14:07:12 -0000 1.5
@@ -119,7 +119,7 @@
ObjectMan *_objMan;
SwordText *_textMan;
- uint16 _currentScreen;
+ uint16 _currentScreen;
uint8 *_screenBuf;
uint8 *_screenGrid;
uint16 *_layerGrid[4];
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sound.cpp 19 Dec 2003 06:51:32 -0000 1.8
+++ sound.cpp 19 Dec 2003 14:07:12 -0000 1.9
@@ -95,7 +95,7 @@
if (_fxQueue[cnt].id == (uint32)fxNo) {
if (!_fxQueue[cnt].delay) // sound was started
_resMan->resClose(_fxList[_fxQueue[cnt].id].sampleId);
- if (cnt != _endOfQueue-1)
+ if (cnt != _endOfQueue-1)
_fxQueue[cnt] = _fxQueue[_endOfQueue-1];
_endOfQueue--;
return ;
@@ -118,7 +118,7 @@
bool SwordSound::speechFinished(void) {
//warning("stub: SwordSound::speechFinished()");
//return true;
- return (_speechHandle == 0);
+ return (_speechHandle == 0);
}
void SwordSound::newScreen(uint16 screen) {
@@ -171,7 +171,7 @@
uint8 *buf = (uint8*)malloc(sampleSize);
_cowFile.read(buf, sampleSize);
uint8 *smpBuf = (uint8*)malloc(uncompressedSize(buf));
- uint32 size = expandSpeech(buf, smpBuf, sampleSize);
+ uint32 size = expandSpeech(buf, smpBuf, sampleSize);
free(buf);
if (!size) {
free(smpBuf);
Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sword1.cpp 17 Dec 2003 23:41:14 -0000 1.12
+++ sword1.cpp 19 Dec 2003 14:07:12 -0000 1.13
@@ -1010,7 +1010,7 @@
initialize();
// check if we have savegames. if we do, show control panel, else start intro.
do {
- mainLoop();
+ mainLoop();
// mainLoop was left, show control panel
} while (true);
}
@@ -1081,7 +1081,7 @@
_screen->quitScreen(); // close graphic resources
_objectMan->closeSection(SwordLogic::_scriptVars[SCREEN]); // close the section that PLAYER has just left, if it's empty now
- // todo: stop sfx, clear sfx queue, free sfx memory
+ // todo: stop sfx, clear sfx queue, free sfx memory
} while (_systemVars.saveGameFlag < 2);
}
Index: sword1.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sword1.h 17 Dec 2003 11:54:48 -0000 1.3
+++ sword1.h 19 Dec 2003 14:07:12 -0000 1.4
@@ -57,7 +57,7 @@
//uint8 framesPerSecond; // toggles one frame pre second mode on "1"
//uint8 writingPCXs; // writing a PCX every frame on "f"
//int16 parallaxOn; I think we don't need this.
- uint8 language;
+ uint8 language;
int32 currentMusic;
//uint32 gameCycle;
};
Index: sworddefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sworddefs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sworddefs.h 17 Dec 2003 23:41:14 -0000 1.7
+++ sworddefs.h 19 Dec 2003 14:07:12 -0000 1.8
@@ -85,7 +85,7 @@
char type[16];
uint16 sizeX;
uint16 sizeY;
- uint32 lineIndexes[2]; //2 is arbitrary number
+ uint32 lineIndexes[2]; //2 is arbitrary number
} GCC_PACK;
struct AnimUnit {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen graphics.cpp,1.56,1.57 graphics.h,1.47,1.48 logic.cpp,1.135,1.136 queen.cpp,1.56,1.57 queen.h,1.20,1.21 xref.txt,1.48,1.49
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 logic.cpp,1.14,1.15 router.cpp,1.6,1.7 screen.cpp,1.11,1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list