[Scummvm-cvs-logs] CVS: scummvm/backends/ps2 DmaPipe.cpp,1.3,1.4 Gs2dScreen.cpp,1.4,1.5 Gs2dScreen.h,1.4,1.5 GsDefs.h,1.3,1.4 asyncfio.cpp,1.4,1.5 fileio.cpp,1.3,1.4 fileio.h,1.4,1.5 icon.cpp,1.2,1.3 ps2input.cpp,1.3,1.4 ps2pad.cpp,1.4,1.5 savefile.cpp,1.5,1.6 sdlkeys.h,1.1,1.2 smushio.cpp,1.1,1.2 systemps2.cpp,1.7,1.8 systemps2.h,1.6,1.7
Eugene Sandulenko
sev at users.sourceforge.net
Sat Jul 30 14:14:58 CEST 2005
Update of /cvsroot/scummvm/scummvm/backends/ps2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/backends/ps2
Modified Files:
DmaPipe.cpp Gs2dScreen.cpp Gs2dScreen.h GsDefs.h asyncfio.cpp
fileio.cpp fileio.h icon.cpp ps2input.cpp ps2pad.cpp
savefile.cpp sdlkeys.h smushio.cpp systemps2.cpp systemps2.h
Log Message:
Remove trailing whitespaces.
Index: DmaPipe.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/DmaPipe.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DmaPipe.cpp 5 May 2005 03:06:31 -0000 1.3
+++ DmaPipe.cpp 30 Jul 2005 21:10:54 -0000 1.4
@@ -82,7 +82,7 @@
_pipes[_curPipe]->setReg( GPR_TRXPOS, GS_SET_DEST_TRXPOS(destOfsX, destOfsY));
_pipes[_curPipe]->setReg( GPR_TRXREG, GS_SET_TRXREG(width, height));
_pipes[_curPipe]->setReg( GPR_TRXDIR, 0);
-
+
checkSpace(15);
uint32 numq = width * height;
switch (pixelFmt) {
Index: Gs2dScreen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/Gs2dScreen.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Gs2dScreen.cpp 11 May 2005 07:31:43 -0000 1.4
+++ Gs2dScreen.cpp 30 Jul 2005 21:10:54 -0000 1.5
@@ -149,7 +149,7 @@
_texCoords[0].v = SCALE(1);
_texCoords[1].u = SCALE(_width);
_texCoords[1].v = SCALE(_height);
-
+
uint32 tvFrameSize = _tvWidth * _tvHeight * 4; // 32 bits per pixel
// setup frame buffer pointers
@@ -204,9 +204,9 @@
_dmaPipe->flush();
_clutChanged = _screenChanged = _overlayChanged = true;
-
+
updateScreen();
-
+
createAnimTextures();
createAnimThread(this);
}
@@ -248,7 +248,7 @@
_width = width;
_height = height;
_pitch = (width + 127) & ~127;
-
+
// malloc new buffers
free(_screenBuf);
free(_overlayBuf);
@@ -417,7 +417,7 @@
memcpy(buf, src, _width * 2);
buf += pitch;
src += _width;
- }
+ }
}
void Gs2dScreen::setMouseOverlay(const uint8 *buf, uint16 width, uint16 height, uint16 hotSpotX, uint16 hotSpotY, uint8 transpCol) {
@@ -520,7 +520,7 @@
for (int coord = 0; coord < 4; coord++) {
z[coord] = rotCos * x[coord];
x[coord] = rotSin * x[coord];
-
+
nodes[coord].z = 0;
nodes[coord].x = (uint16)(((V * x[coord]) / (z[coord] + V + Z_TRANSL)) * 16);
nodes[coord].y = (uint16)(((V * y[coord]) / (z[coord] + V + Z_TRANSL)) * 16);
@@ -533,7 +533,7 @@
_dmaPipe->setTex(_texPtrs[TEXT], 128, 7, 4, GS_PSMT4HL, _clutPtrs[TEXT], 0, 64, GS_PSMCT32);
else
_dmaPipe->setTex(_texPtrs[TEXT], 128, 7, 4, GS_PSMT4HH, _clutPtrs[TEXT], 0, 64, GS_PSMCT32);
-
+
_dmaPipe->textureRect(nodes + 0, nodes + 1, nodes + 2, nodes + 3,
texNodes + 0, texNodes + 1, texNodes + 2, texNodes + 3, GS_RGBA(0x80, 0x80, 0x80, 0x80));
@@ -591,7 +591,7 @@
0xD992, 0x344B, 0xA592, 0x110D,
0x9234, 0x2326, 0x5199, 0xC8A6,
0x4D29, 0x18B0, 0xA5AA, 0x2949,
- 0x6DB3, 0xB2AA, 0x64A4, 0x3329
+ 0x6DB3, 0xB2AA, 0x64A4, 0x3329
};
const uint32 Gs2dScreen::_binaryClut[16] __attribute__((aligned(64))) = {
Index: Gs2dScreen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/Gs2dScreen.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Gs2dScreen.h 11 May 2005 07:31:44 -0000 1.4
+++ Gs2dScreen.h 30 Jul 2005 21:10:54 -0000 1.5
@@ -63,13 +63,13 @@
void wantAnim(bool runIt);
private:
void createAnimTextures(void);
-
+
DmaPipe *_dmaPipe;
uint8 _videoMode;
uint16 _tvWidth, _tvHeight;
GsVertex _blitCoords[2];
TexVertex _texCoords[2];
-
+
uint8 _curDrawBuf;
uint32 _frameBufPtr[2]; //
uint32 _clutPtrs[3]; // vram pointers
Index: GsDefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/GsDefs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- GsDefs.h 5 May 2005 03:06:31 -0000 1.3
+++ GsDefs.h 30 Jul 2005 21:10:54 -0000 1.4
@@ -71,10 +71,10 @@
GPR_CLAMP_1, // ...
GPR_CLAMP_2, // ...
GPR_FOG, // ...
-
+
GPR_XYZF3 = 0x0C, // ...
GPR_XYZ3, // ...
-
+
GPR_TEX1_1 = 0x14, // ...
GPR_TEX1_2, // ...
GPR_TEX2_1, // ...
@@ -84,16 +84,16 @@
GPR_PRMODECONT, // ...
GPR_PRMODE, // ...
GPR_TEXCLUT, // ...
-
+
GPR_SCANMSK = 0x22, // ...
-
+
GPR_MIPTBP1_1 = 0x34, // ...
GPR_MIPTBP1_2, // ...
GPR_MIPTBP2_1, // ...
GPR_MIPTBP2_2, // ...
-
+
GPR_TEXA = 0x3b, // ...
-
+
GPR_FOGCOL = 0x3d, // ...
GPR_TEXFLUSH = 0x3f,// Write to this register before using newly loaded texture
@@ -118,7 +118,7 @@
GPR_TRXREG, // Setup Image Transfer Size
GPR_TRXDIR, // Set Image Transfer Directon + Start Transfer
GPR_HWREG,
-
+
GPR_SIGNAL = 0x60,
GPR_FINISH,
GPR_LABEL
Index: asyncfio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/asyncfio.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- asyncfio.cpp 11 May 2005 07:31:44 -0000 1.4
+++ asyncfio.cpp 30 Jul 2005 21:10:54 -0000 1.5
@@ -117,7 +117,7 @@
int res;
WaitSema(_ioSema);
checkSync();
- fileXioDopen(name);
+ fileXioDopen(name);
fileXioWaitAsync(FXIO_WAIT, &res);
SignalSema(_ioSema);
return res;
Index: fileio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/fileio.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fileio.cpp 5 May 2005 03:06:31 -0000 1.3
+++ fileio.cpp 30 Jul 2005 21:10:54 -0000 1.4
@@ -193,7 +193,7 @@
sioprintf("cache seek error: seek to %d instead of %d, fs = %d", _physFilePos, cachePosEnd, _fileSize);
return;
}
- }
+ }
uint32 cacheDest = (_cacheOfs + _bytesInCache) % CACHE_SIZE;
uint32 cacheRead = CACHE_SIZE - _bytesInCache;
@@ -247,7 +247,7 @@
_readBytesBlock = 0; // reset cache hit count
if (fio.seek(_fd, _filePos, SEEK_SET) == _filePos)
- _physFilePos = _filePos;
+ _physFilePos = _filePos;
else
break; // read beyond EOF
}
Index: fileio.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/fileio.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fileio.h 24 Jun 2005 15:22:32 -0000 1.4
+++ fileio.h 30 Jul 2005 21:10:54 -0000 1.5
@@ -60,7 +60,7 @@
int ps2_fflush(FILE *stream);
int ps2_fseek(FILE *stream, long offset, int origin);
uint32 ps2_ftell(FILE *stream);
-int ps2_feof(FILE *stream);
+int ps2_feof(FILE *stream);
uint32 ps2_fsize(FILE *stream);
size_t ps2_fread(void *buf, size_t r, size_t n, FILE *stream);
Index: icon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/icon.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- icon.cpp 31 Mar 2005 07:50:32 -0000 1.2
+++ icon.cpp 30 Jul 2005 21:10:54 -0000 1.3
@@ -49,882 +49,882 @@
// Length: 14018 / 0x000036C2 (bytes)
const uint8 Ps2SaveFileManager::_rleIcoData[14018] = {
- 0xCC, 0x41, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x80, 0x3F, 0x24, 0x00, 0x00, 0x00, 0x00, 0xDC, 0x00, 0xF7, 0x00, 0xFE,
- 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0E, 0x7F, 0x7F,
- 0x7F, 0x80, 0x00, 0x24, 0x00, 0xC1, 0x00, 0xFE, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0,
- 0x00, 0x04, 0x00, 0x10, 0x00, 0x02, 0x7F, 0x7F, 0x7F, 0x80, 0x00, 0xDC, 0x00, 0xC1, 0x00, 0xFE,
- 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x7F, 0x7F,
- 0x7F, 0x80, 0x00, 0x24, 0x00, 0xC1, 0x00, 0xFE, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0,
- 0x00, 0x04, 0x00, 0x10, 0x00, 0x02, 0x7F, 0x7F, 0x7F, 0x80, 0x00, 0xDC, 0x00, 0xF7, 0x00, 0xFE,
[...1727 lines suppressed...]
+ 0xB9, 0x63, 0xB9, 0x63, 0xB8, 0x5F, 0x71, 0x3B, 0x09, 0x13, 0xC3, 0x02, 0xA0, 0x02, 0xA1, 0x02,
+ 0x82, 0x02, 0x82, 0x02, 0x62, 0x02, 0x63, 0x02, 0x43, 0x02, 0x63, 0x02, 0x62, 0x02, 0x42, 0x02,
+ 0x42, 0x02, 0x42, 0x02, 0x42, 0x02, 0x22, 0x02, 0x22, 0x02, 0x22, 0x02, 0x42, 0x02, 0x42, 0x02,
+ 0x42, 0x02, 0x42, 0x02, 0x42, 0x02, 0x62, 0x02, 0x60, 0x02, 0x60, 0x02, 0xA2, 0x02, 0x0A, 0x17,
+ 0x52, 0x3F, 0xB9, 0x5F, 0xB9, 0x63, 0xB9, 0x63, 0xB9, 0x63, 0xDB, 0x6B, 0xFE, 0x77, 0x5C, 0x00,
+ 0x1E, 0x00, 0xB7, 0x57, 0x4F, 0x2B, 0xE7, 0x06, 0xC4, 0x06, 0xC5, 0x06, 0xC6, 0x06, 0xA6, 0x06,
+ 0xA6, 0x06, 0x87, 0x06, 0x87, 0x06, 0x87, 0x06, 0x87, 0x06, 0x87, 0x06, 0x87, 0x06, 0x87, 0x06,
+ 0x87, 0x06, 0x87, 0x06, 0x87, 0x06, 0x87, 0x06, 0x87, 0x06, 0x87, 0x06, 0x87, 0x06, 0x86, 0x06,
+ 0x86, 0x06, 0xA6, 0x06, 0xA4, 0x06, 0xA3, 0x06, 0xE7, 0x0A, 0x4F, 0x2F, 0xB8, 0x5B, 0x62, 0x00,
+ 0x1E, 0x00, 0xDB, 0x6B, 0x95, 0x4B, 0x4F, 0x2F, 0x2D, 0x2F, 0x2E, 0x2F, 0x2F, 0x2F, 0x2F, 0x2F,
+ 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F,
+ 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F, 0x0F, 0x2F,
+ 0x0F, 0x2F, 0x0E, 0x2F, 0x0D, 0x2F, 0x0C, 0x2F, 0x4F, 0x33, 0x95, 0x4F, 0xDC, 0x6F, 0x62, 0x00,
+ 0x1E, 0x00, 0xFE, 0x77, 0xDB, 0x67, 0xB8, 0x5F, 0xB7, 0x5F, 0xB8, 0x5F, 0xB8, 0x5F, 0x98, 0x5F,
+ 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F,
+ 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F, 0x98, 0x5F,
+ 0x98, 0x5F, 0x98, 0x5F, 0x97, 0x5F, 0x97, 0x5F, 0xB8, 0x5F, 0xDB, 0x6B, 0xFE, 0x7B, 0x3F, 0x08,
0x00, 0x00
};
Index: ps2input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/ps2input.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ps2input.cpp 5 May 2005 03:06:31 -0000 1.3
+++ ps2input.cpp 30 Jul 2005 21:10:54 -0000 1.4
@@ -124,7 +124,7 @@
if (change & (PS2MOUSE_BTN1 | PS2MOUSE_BTN2)) {
if (change & PS2MOUSE_BTN1)
event->type = (_mButtons & PS2MOUSE_BTN1) ? OSystem::EVENT_LBUTTONDOWN : OSystem::EVENT_LBUTTONUP;
- else
+ else
event->type = (_mButtons & PS2MOUSE_BTN2) ? OSystem::EVENT_RBUTTONDOWN : OSystem::EVENT_RBUTTONUP;
event->mouse.x = _posX;
event->mouse.y = _posY;
@@ -171,10 +171,10 @@
int16 joyh, joyv;
_pad->readPad(&buttons, &joyh, &joyv);
uint16 btnChange = buttons ^ _padLastButtons;
-
+
if (checkPadMouse) {
if (btnChange & (PAD_CROSS | PAD_CIRCLE)) {
- if (btnChange & PAD_CROSS)
+ if (btnChange & PAD_CROSS)
event->type = (buttons & PAD_CROSS) ? OSystem::EVENT_LBUTTONDOWN : OSystem::EVENT_LBUTTONUP;
else
event->type = (buttons & PAD_CIRCLE) ? OSystem::EVENT_RBUTTONDOWN : OSystem::EVENT_RBUTTONUP;
@@ -505,7 +505,7 @@
/* FF */ 0
};
-const int Ps2Input::_keyCodes[16] = {
+const int Ps2Input::_keyCodes[16] = {
49, // '1' - Select
0, // - L3
0, // - R3
@@ -524,7 +524,7 @@
0, // - Square
};
-const uint16 Ps2Input::_asciiCodes[16] = {
+const uint16 Ps2Input::_asciiCodes[16] = {
49, // '1' - Select
0, // - L3
0, // - R3
Index: ps2pad.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/ps2pad.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ps2pad.cpp 11 May 2005 07:31:44 -0000 1.4
+++ ps2pad.cpp 30 Jul 2005 21:10:54 -0000 1.5
@@ -29,7 +29,7 @@
_system = system;
_padBuf = (uint8*)memalign(64, 256);
_padStatus = STAT_NONE;
-
+
padInit(0); // initialize library
_port = _slot = 0; // first controller, no multitap
initPad();
Index: savefile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/savefile.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- savefile.cpp 24 Jun 2005 15:22:32 -0000 1.5
+++ savefile.cpp 30 Jul 2005 21:10:54 -0000 1.6
@@ -235,7 +235,7 @@
int mcType, mcFree, mcFormat, mcResult;
mcGetInfo(0, 0, &mcType, &mcFree, &mcFormat);
mcSync(0, NULL, &mcResult);
-
+
memset(marks, false, num * sizeof(bool));
if ((mcResult == 0) || (mcResult == -1)) {
@@ -258,7 +258,7 @@
int numEntries;
mcGetDir(0, 0, mcSearchStr, 0, MAX_MC_ENTRIES, mcEntries);
mcSync(0, NULL, &numEntries);
-
+
int searchLen = strlen(ext);
for (int i = 0; i < numEntries; i++)
if ((((char*)mcEntries[i].name)[0] != '.') && stricmp((char*)mcEntries[i].name, "icon.sys")) {
@@ -361,7 +361,7 @@
printf("Invalid savegame %s\n", filename);
_ioFailed = true;
}
- fio.close(fd);
+ fio.close(fd);
}
}
Index: sdlkeys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/sdlkeys.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sdlkeys.h 31 Mar 2005 05:35:04 -0000 1.1
+++ sdlkeys.h 30 Jul 2005 21:10:54 -0000 1.2
@@ -44,7 +44,7 @@
SDLK_GREATER = 62,
SDLK_QUESTION = 63,
SDLK_AT = 64,
- /*
+ /*
Skip uppercase letters
*/
SDLK_LEFTBRACKET = 91,
Index: smushio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/smushio.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- smushio.cpp 5 May 2005 03:06:32 -0000 1.1
+++ smushio.cpp 30 Jul 2005 21:10:54 -0000 1.2
@@ -20,7 +20,7 @@
*/
/*
- The Smush player uses at least two handles for accessing the same SMUSH file,
+ The Smush player uses at least two handles for accessing the same SMUSH file,
to avoid threading issues. One handle for video, one for audio apparently.
Each of the handles always skips the data that the other one read before
(or will read later).
@@ -145,12 +145,12 @@
_bytesInCache += rdRes;
_cacheOp = false;
}
- } else if (!sync) {
+ } else if (!sync) {
if (_cacheFilePos + _bytesInCache == _fileSize)
return;
uint32 rdPos = MIN(_lastRead[0], _lastRead[1]);
-
+
int cacheOfs = (rdPos - _cacheFilePos) & ~0xF; // we'd like to keep the buffer aligned to 16 bytes
if (cacheOfs < 0) {
sioprintf("ERROR: smush cache too far ahead!");
@@ -237,7 +237,7 @@
} while (len && rdRes);
fio.seek(_fd, _cacheFilePos + _bytesInCache, SEEK_SET);
break;
- }
+ }
}
processCache(false);
SignalSema(_sema);
Index: systemps2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/systemps2.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- systemps2.cpp 24 Jun 2005 15:22:32 -0000 1.7
+++ systemps2.cpp 30 Jul 2005 21:10:54 -0000 1.8
@@ -92,7 +92,7 @@
OSystem *OSystem_PS2_create(void) {
if (!g_systemPs2)
- g_systemPs2 = new OSystem_PS2();
+ g_systemPs2 = new OSystem_PS2();
return g_systemPs2;
}
@@ -183,7 +183,7 @@
_scummSoundParam = NULL;
_screen = new Gs2dScreen(320, 200, TV_DONT_CARE);
- _width = 320;
+ _width = 320;
_height = 200;
sioprintf("Initializing timer\n");
@@ -198,7 +198,7 @@
sioprintf("Initializing SjPCM");
if (SjPCM_Init(0) < 0)
fatalError("SjPCM Bind failed");
-
+
if (CDVD_Init() != 0)
fatalError("CDVD_Init failed");
@@ -212,7 +212,7 @@
fatalError("Can't init fileXio");
fileXioSetBlockMode(FXIO_NOWAIT);
-
+
sioprintf("Starting SavefileManager");
_saveManager = new Ps2SaveFileManager(this, _screen);
@@ -308,7 +308,7 @@
else
bufferedSamples -= 480;
cycles++;
-
+
WaitSema(_soundSema);
if (_scummSoundProc) {
if (bufferedSamples <= 8 * SMP_PER_BLOCK) {
@@ -441,7 +441,7 @@
}
void OSystem_PS2::updateScreen(void) {
- _screen->updateScreen();
+ _screen->updateScreen();
}
uint32 OSystem_PS2::getMillis(void) {
@@ -456,7 +456,7 @@
if (tid == _soundTid) {
sioprintf("ERROR: delayMillis() from sound thread!");
return;
- }
+ }
if (tid == _timerTid) {
g_TimerWakeUp = (int32)msecs;
@@ -721,7 +721,7 @@
g_timeSecs = (uint32)timeSecs;
}
- sioprintf("Time: %d:%02d:%02d - %d.%d.%4d", g_timeSecs / (60 * 60), (g_timeSecs / 60) % 60, g_timeSecs % 60,
+ sioprintf("Time: %d:%02d:%02d - %d.%d.%4d", g_timeSecs / (60 * 60), (g_timeSecs / 60) % 60, g_timeSecs % 60,
g_day, g_month, g_year + 2000);
}
@@ -749,6 +749,6 @@
retStruct.tm_mday = g_day;
retStruct.tm_mon = g_month;
// tm_wday, tm_yday and tm_isdst are zero for now
- return &retStruct;
+ return &retStruct;
}
Index: systemps2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/systemps2.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- systemps2.h 24 Jun 2005 15:22:32 -0000 1.6
+++ systemps2.h 30 Jul 2005 21:10:54 -0000 1.7
@@ -40,7 +40,7 @@
virtual void setPalette(const byte *colors, uint start, uint num);
virtual void grabPalette(byte *colors, uint start, uint num);
virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
-
+
virtual void updateScreen();
virtual void setShakePos(int shakeOffset);
More information about the Scummvm-git-logs
mailing list