[Scummvm-cvs-logs] SF.net SVN: scummvm:[51936] scummvm/trunk/engines/cruise
sev at users.sourceforge.net
sev at users.sourceforge.net
Mon Aug 9 12:30:42 CEST 2010
Revision: 51936
http://scummvm.svn.sourceforge.net/scummvm/?rev=51936&view=rev
Author: sev
Date: 2010-08-09 10:30:40 +0000 (Mon, 09 Aug 2010)
Log Message:
-----------
CRUISE: Eliminate global constructors
Modified Paths:
--------------
scummvm/trunk/engines/cruise/actor.cpp
scummvm/trunk/engines/cruise/cruise.cpp
scummvm/trunk/engines/cruise/cruise.h
scummvm/trunk/engines/cruise/cruise_main.cpp
scummvm/trunk/engines/cruise/ctp.cpp
scummvm/trunk/engines/cruise/ctp.h
scummvm/trunk/engines/cruise/gfxModule.cpp
scummvm/trunk/engines/cruise/perso.cpp
scummvm/trunk/engines/cruise/saveload.cpp
scummvm/trunk/engines/cruise/vars.cpp
scummvm/trunk/engines/cruise/vars.h
scummvm/trunk/engines/cruise/volume.cpp
Modified: scummvm/trunk/engines/cruise/actor.cpp
===================================================================
--- scummvm/trunk/engines/cruise/actor.cpp 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/actor.cpp 2010-08-09 10:30:40 UTC (rev 51936)
@@ -74,8 +74,8 @@
void getPixel(int x, int y) {
- for (uint i = 0; i < polyStructs->size(); ++i) {
- CtStruct &ct = (*polyStructs)[i];
+ for (uint i = 0; i < _vm->_polyStructs->size(); ++i) {
+ CtStruct &ct = (*_vm->_polyStructs)[i];
numPoly = ct.num;
if (walkboxState[numPoly] == 0 && ct.bounds.contains(x, y)) {
@@ -293,7 +293,7 @@
int x1, y1, i, x, y, p;
int d1 = 1000;
- polyStructs = &polyStructNorm;
+ _vm->_polyStructs = &_vm->_polyStructNorm;
if (nclick_noeud == 1) {
x = x_mouse;
@@ -301,19 +301,19 @@
x1 = table_ptselect[0][0];
y1 = table_ptselect[0][1];
- polyStructs = &polyStructExp;
+ _vm->_polyStructs = &_vm->_polyStructExp;
getPixel(x, y);
if (!flag_obstacle) {
- polyStructs = &polyStructNorm;
+ _vm->_polyStructs = &_vm->_polyStructNorm;
getPixel(x, y);
if (flag_obstacle) {
polydroite(x1, y1, x, y);
}
- polyStructs = &polyStructExp;
+ _vm->_polyStructs = &_vm->_polyStructExp;
}
if (!flag_obstacle) { /* dans flag_obstacle --> couleur du point */
x1 = table_ptselect[0][0];
@@ -325,7 +325,7 @@
y_mouse = Y;
}
}
- polyStructs = &polyStructNorm;
+ _vm->_polyStructs = &_vm->_polyStructNorm;
p = -1;
for (i = 0; i < ctp_routeCoordCount; i++) {
@@ -453,7 +453,7 @@
table_ptselect[*nclick][0] = x_mouse;
table_ptselect[*nclick][1] = y_mouse;
(*nclick)++;
- polyStructs = &polyStructNorm;
+ _vm->_polyStructs = &_vm->_polyStructNorm;
if (*nclick == 2) { // second point
x1 = table_ptselect[0][0];
@@ -464,7 +464,7 @@
return;
}
flag_aff_chemin = 1;
- polyStructs = &polyStructExp;
+ _vm->_polyStructs = &_vm->_polyStructExp;
// can we go there directly ?
polydroite(x1, y1, x2, y2);
@@ -472,7 +472,7 @@
if (!flag_obstacle) {
solution0[0][0] = x1;
solution0[0][1] = y1;
- polyStructs = &polyStructExp;
+ _vm->_polyStructs = &_vm->_polyStructExp;
poly2(x2, y2, ctp_routeCoords[select_noeud[1]][0],
ctp_routeCoords[select_noeud[1]][1]);
@@ -516,7 +516,7 @@
solution0[++i][1] =
ctp_routeCoords[p1][1];
}
- polyStructs = &polyStructExp;
+ _vm->_polyStructs = &_vm->_polyStructExp;
poly2(x2, y2,
ctp_routeCoords[select_noeud[1]][0],
ctp_routeCoords[select_noeud[1]][1]);
@@ -541,7 +541,7 @@
while (flag_obstacle && i != d) {
x2 = solution0[i][0];
y2 = solution0[i][1];
- polyStructs = &polyStructExp;
+ _vm->_polyStructs = &_vm->_polyStructExp;
polydroite(x1, y1, x2, y2);
i--;
}
@@ -569,7 +569,7 @@
persoStruct *perso;
int num;
- if (!polyStruct) {
+ if (!_vm->_polyStruct) {
moveInfo.x = -1;
moveInfo.y = -1;
@@ -621,7 +621,7 @@
}
nclick_noeud = 0;
- polyStructs = &polyStructNorm;
+ _vm->_polyStructs = &_vm->_polyStructNorm;
flag_aff_chemin = 0;
if (x == destX && y == destY) {
Modified: scummvm/trunk/engines/cruise/cruise.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise.cpp 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/cruise.cpp 2010-08-09 10:30:40 UTC (rev 51936)
@@ -133,8 +133,8 @@
}
void CruiseEngine::deinitialise() {
- polyStructNorm.clear();
- polyStructExp.clear();
+ _vm->_polyStructNorm.clear();
+ _vm->_polyStructExp.clear();
// Clear any backgrounds
for (int i = 0; i < 8; ++i) {
Modified: scummvm/trunk/engines/cruise/cruise.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise.h 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/cruise.h 2010-08-09 10:30:40 UTC (rev 51936)
@@ -40,10 +40,10 @@
/**
* This is the namespace of the Cruise engine.
*
- * Status of this engine: ???
+ * Status of this engine: Game is completable, engine needs objectifying
*
* Supported games:
- * - ???
+ * - Cruise for a Corpse
*/
namespace Cruise {
@@ -112,6 +112,22 @@
void initAllData();
Common::RandomSource _rnd;
+
+ Common::List<byte *> _memList;
+
+ typedef Common::List<Common::Rect> RectList;
+
+ RectList _dirtyRects;
+ RectList _priorFrameRects;
+
+ Common::File _currentVolumeFile;
+
+ Common::Array<CtStruct> _polyStructNorm;
+ Common::Array<CtStruct> _polyStructExp;
+ Common::Array<CtStruct> *_polyStructs;
+ Common::Array<CtStruct> *_polyStruct;
+
+ Common::File _PAL_file;
};
extern CruiseEngine *_vm;
Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp 2010-08-09 10:30:40 UTC (rev 51936)
@@ -42,13 +42,11 @@
gfxEntryStruct* linkedMsgList = NULL;
-Common::List<byte *> memList;
-
void MemoryList() {
- if (!memList.empty()) {
+ if (!_vm->_memList.empty()) {
printf("Current list of un-freed memory blocks:\n");
Common::List<byte *>::iterator i;
- for (i = memList.begin(); i != memList.end(); ++i) {
+ for (i = _vm->_memList.begin(); i != _vm->_memList.end(); ++i) {
byte *v = *i;
printf("%s - %d\n", (const char *)(v - 68), *((int32 *)(v - 72)));
}
@@ -73,7 +71,7 @@
// Add the block to the memory list
result = v + 64 + 8;
- memList.push_back(result);
+ _vm->_memList.push_back(result);
} else
result = (byte *)malloc(size);
@@ -91,7 +89,7 @@
byte *p = (byte *)v;
assert(*((uint32 *) (p - 4)) == 0x41424344);
- memList.remove(p);
+ _vm->_memList.remove(p);
free(p - 8 - 64);
} else
free(v);
@@ -105,8 +103,8 @@
void loadPackedFileToMem(int fileIdx, uint8 *buffer) {
changeCursor(CURSOR_DISK);
- currentVolumeFile.seek(volumePtrToFileDescriptor[fileIdx].offset, SEEK_SET);
- currentVolumeFile.read(buffer, volumePtrToFileDescriptor[fileIdx].size);
+ _vm->_currentVolumeFile.seek(volumePtrToFileDescriptor[fileIdx].offset, SEEK_SET);
+ _vm->_currentVolumeFile.read(buffer, volumePtrToFileDescriptor[fileIdx].size);
}
int getNumObjectsByClass(int scriptIdx, int param) {
Modified: scummvm/trunk/engines/cruise/ctp.cpp
===================================================================
--- scummvm/trunk/engines/cruise/ctp.cpp 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/ctp.cpp 2010-08-09 10:30:40 UTC (rev 51936)
@@ -23,6 +23,7 @@
*
*/
+#include "cruise/cruise.h"
#include "cruise/cruise_main.h"
#include "common/endian.h"
#include "common/util.h"
@@ -31,11 +32,6 @@
uint8 *ctpVar17;
-Common::Array<CtStruct> polyStructNorm;
-Common::Array<CtStruct> polyStructExp;
-Common::Array<CtStruct> *polyStructs = NULL;
-Common::Array<CtStruct> *polyStruct = NULL;
-
int currentWalkBoxCenterX;
int currentWalkBoxCenterY;
int currentWalkBoxCenterXBis;
@@ -324,16 +320,16 @@
// Load the polyStructNorm list
for (int i = numberOfWalkboxes - 1; i >= 0; i--) {
- makeCtStruct(polyStructNorm, ctp_walkboxTable, i, 0);
+ makeCtStruct(_vm->_polyStructNorm, ctp_walkboxTable, i, 0);
}
// Load the polyStructExp list
for (int i = numberOfWalkboxes - 1; i >= 0; i--) {
- makeCtStruct(polyStructExp, ctp_walkboxTable, i, walkboxZoom[i] * 20);
+ makeCtStruct(_vm->_polyStructExp, ctp_walkboxTable, i, walkboxZoom[i] * 20);
}
- polyStruct = polyStructs = &polyStructNorm;
+ _vm->_polyStruct = _vm->_polyStructs = &_vm->_polyStructNorm;
return (1);
}
Modified: scummvm/trunk/engines/cruise/ctp.h
===================================================================
--- scummvm/trunk/engines/cruise/ctp.h 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/ctp.h 2010-08-09 10:30:40 UTC (rev 51936)
@@ -64,11 +64,6 @@
extern uint8 *ctpVar17;
-extern Common::Array<CtStruct> polyStructNorm;
-extern Common::Array<CtStruct> polyStructExp;
-extern Common::Array<CtStruct> *polyStructs;
-extern Common::Array<CtStruct> *polyStruct;
-
int initCt(const char * ctpName);
int computeDistance(int varX, int varY, int paramX, int paramY);
Modified: scummvm/trunk/engines/cruise/gfxModule.cpp
===================================================================
--- scummvm/trunk/engines/cruise/gfxModule.cpp 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/gfxModule.cpp 2010-08-09 10:30:40 UTC (rev 51936)
@@ -43,10 +43,6 @@
int palDirtyMin = 256;
int palDirtyMax = -1;
-typedef Common::List<Common::Rect> RectList;
-RectList _dirtyRects;
-RectList _priorFrameRects;
-
bool _dirtyRectScreen = false;
gfxModuleDataStruct gfxModuleData = {
@@ -238,7 +234,7 @@
}
void gfxModuleData_addDirtyRect(const Common::Rect &r) {
- _dirtyRects.push_back(Common::Rect( MAX(r.left, (int16)0), MAX(r.top, (int16)0),
+ _vm->_dirtyRects.push_back(Common::Rect( MAX(r.left, (int16)0), MAX(r.top, (int16)0),
MIN(r.right, (int16)320), MIN(r.bottom, (int16)200)));
}
@@ -255,11 +251,11 @@
}
static void mergeClipRects() {
- RectList::iterator rOuter, rInner;
+ CruiseEngine::RectList::iterator rOuter, rInner;
- for (rOuter = _dirtyRects.begin(); rOuter != _dirtyRects.end(); ++rOuter) {
+ for (rOuter = _vm->_dirtyRects.begin(); rOuter != _vm->_dirtyRects.end(); ++rOuter) {
rInner = rOuter;
- while (++rInner != _dirtyRects.end()) {
+ while (++rInner != _vm->_dirtyRects.end()) {
if ((*rOuter).intersects(*rInner)) {
// these two rectangles overlap, so translate it to a bigger rectangle
@@ -267,7 +263,7 @@
unionRectangle(*rOuter, *rOuter, *rInner);
// remove the inner rect from the list
- _dirtyRects.erase(rInner);
+ _vm->_dirtyRects.erase(rInner);
// move back to beginning of list
rInner = rOuter;
@@ -298,32 +294,32 @@
}
void flip() {
- RectList::iterator dr;
+ CruiseEngine::RectList::iterator dr;
// Update the palette
gfxModuleData_updatePalette();
// Make a copy of the prior frame's dirty rects, and then backup the current frame's rects
- RectList tempList = _priorFrameRects;
- _priorFrameRects = _dirtyRects;
+ CruiseEngine::RectList tempList = _vm->_priorFrameRects;
+ _vm->_priorFrameRects = _vm->_dirtyRects;
// Merge the prior frame's dirty rects into the current frame's list
for (dr = tempList.begin(); dr != tempList.end(); ++dr) {
Common::Rect &r = *dr;
- _dirtyRects.push_back(Common::Rect(r.left, r.top, r.right, r.bottom));
+ _vm->_dirtyRects.push_back(Common::Rect(r.left, r.top, r.right, r.bottom));
}
// Merge any overlapping rects to simplify the drawing process
mergeClipRects();
// Copy any modified areas
- for (dr = _dirtyRects.begin(); dr != _dirtyRects.end(); ++dr) {
+ for (dr = _vm->_dirtyRects.begin(); dr != _vm->_dirtyRects.end(); ++dr) {
Common::Rect &r = *dr;
g_system->copyRectToScreen(globalScreen + 320 * r.top + r.left, 320,
r.left, r.top, r.width(), r.height());
}
- _dirtyRects.clear();
+ _vm->_dirtyRects.clear();
// Allow the screen to update
g_system->updateScreen();
Modified: scummvm/trunk/engines/cruise/perso.cpp
===================================================================
--- scummvm/trunk/engines/cruise/perso.cpp 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/perso.cpp 2010-08-09 10:30:40 UTC (rev 51936)
@@ -23,6 +23,7 @@
*
*/
+#include "cruise/cruise.h"
#include "cruise/cruise_main.h"
#include "common/util.h"
@@ -45,14 +46,14 @@
freePerso(i);
}
- if (polyStruct) {
- polyStructNorm.clear();
- polyStructExp.clear();
- polyStruct = NULL;
+ if (_vm->_polyStruct) {
+ _vm->_polyStructNorm.clear();
+ _vm->_polyStructExp.clear();
+ _vm->_polyStruct = NULL;
}
ctpVar17 = NULL;
- polyStruct = NULL;
+ _vm->_polyStruct = NULL;
strcpy((char *)currentCtpName, "");
}
Modified: scummvm/trunk/engines/cruise/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cruise/saveload.cpp 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/saveload.cpp 2010-08-09 10:30:40 UTC (rev 51936)
@@ -579,10 +579,10 @@
}
static void syncCT(Common::Serializer &s) {
- int v = (polyStruct) ? 1 : 0;
+ int v = (_vm->_polyStruct) ? 1 : 0;
s.syncAsSint32LE(v);
if (s.isLoading())
- polyStruct = (v != 0) ? &polyStructNorm : NULL;
+ _vm->_polyStruct = (v != 0) ? &_vm->_polyStructNorm : NULL;
if (v == 0)
// There is no further data to load or save
Modified: scummvm/trunk/engines/cruise/vars.cpp
===================================================================
--- scummvm/trunk/engines/cruise/vars.cpp 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/vars.cpp 2010-08-09 10:30:40 UTC (rev 51936)
@@ -64,8 +64,6 @@
int16 currentDiskNumber = 1;
-Common::File currentVolumeFile;
-
int16 volumeNumEntry;
fileEntry *volumePtrToFileDescriptor = NULL;
Modified: scummvm/trunk/engines/cruise/vars.h
===================================================================
--- scummvm/trunk/engines/cruise/vars.h 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/vars.h 2010-08-09 10:30:40 UTC (rev 51936)
@@ -167,8 +167,6 @@
extern int16 currentDiskNumber;
-extern Common::File currentVolumeFile;
-
extern int16 volumeNumEntry;
extern fileEntry *volumePtrToFileDescriptor;
Modified: scummvm/trunk/engines/cruise/volume.cpp
===================================================================
--- scummvm/trunk/engines/cruise/volume.cpp 2010-08-09 06:55:25 UTC (rev 51935)
+++ scummvm/trunk/engines/cruise/volume.cpp 2010-08-09 10:30:40 UTC (rev 51936)
@@ -23,11 +23,11 @@
*
*/
+#include "cruise/cruise.h"
#include "cruise/cruise_main.h"
namespace Cruise {
-Common::File PAL_file;
uint8 *PAL_ptr = NULL;
int16 numLoadedPal;
@@ -40,25 +40,25 @@
#if 0
char name[20];
- if (PAL_file.isOpen())
- PAL_file.close();
+ if (_vm->_PAL_file.isOpen())
+ _vm->_PAL_file.close();
removeExtention(entry->ident, name);
strcat(name, ".PAL");
- if (!PAL_file.open(name))
+ if (!_vm->_PAL_file.open(name))
return;
- numLoadedPal = PAL_file.readSint16BE();
- fileData2 = PAL_file.readSint16BE();
+ numLoadedPal = _vm->_PAL_file.readSint16BE();
+ fileData2 = _vm->_PAL_file.readSint16BE();
PAL_ptr = (uint8 *)MemAlloc(numLoadedPal * fileData2);
#endif
}
void closePal() {
- if (PAL_file.isOpen()) {
- PAL_file.close();
+ if (_vm->_PAL_file.isOpen()) {
+ _vm->_PAL_file.close();
MemFree(PAL_ptr);
PAL_ptr = NULL;
@@ -69,15 +69,15 @@
}
int closeBase() {
- if (currentVolumeFile.isOpen()) {
- currentVolumeFile.close();
+ if (_vm->_currentVolumeFile.isOpen()) {
+ _vm->_currentVolumeFile.close();
MemFree(volumePtrToFileDescriptor);
strcpy(currentBaseName, "");
}
- if (PAL_file.isOpen()) {
+ if (_vm->_PAL_file.isOpen()) {
closePal();
}
@@ -91,7 +91,7 @@
volumeNumEntry = 0;
volumeNumberOfEntry = 0;
- if (currentVolumeFile.isOpen()) {
+ if (_vm->_currentVolumeFile.isOpen()) {
freeDisk();
}
@@ -99,16 +99,16 @@
strcpy(buffer, entry->ident);
- currentVolumeFile.open(buffer);
+ _vm->_currentVolumeFile.open(buffer);
- if (!currentVolumeFile.isOpen()) {
+ if (!_vm->_currentVolumeFile.isOpen()) {
return (-14);
}
changeCursor(CURSOR_DISK);
- volumeNumberOfEntry = currentVolumeFile.readSint16BE();
- volumeSizeOfEntry = currentVolumeFile.readSint16BE();
+ volumeNumberOfEntry = _vm->_currentVolumeFile.readSint16BE();
+ volumeSizeOfEntry = _vm->_currentVolumeFile.readSint16BE();
volumeNumEntry = volumeNumberOfEntry;
@@ -125,11 +125,11 @@
}
for (i = 0; i < volumeNumEntry; i++) {
- currentVolumeFile.read(&volumePtrToFileDescriptor[i].name, 14);
- volumePtrToFileDescriptor[i].offset = currentVolumeFile.readSint32BE();
- volumePtrToFileDescriptor[i].size = currentVolumeFile.readSint32BE();
- volumePtrToFileDescriptor[i].extSize = currentVolumeFile.readSint32BE();
- volumePtrToFileDescriptor[i].unk3 = currentVolumeFile.readSint32BE();
+ _vm->_currentVolumeFile.read(&volumePtrToFileDescriptor[i].name, 14);
+ volumePtrToFileDescriptor[i].offset = _vm->_currentVolumeFile.readSint32BE();
+ volumePtrToFileDescriptor[i].size = _vm->_currentVolumeFile.readSint32BE();
+ volumePtrToFileDescriptor[i].extSize = _vm->_currentVolumeFile.readSint32BE();
+ volumePtrToFileDescriptor[i].unk3 = _vm->_currentVolumeFile.readSint32BE();
}
strcpy(currentBaseName, entry->ident);
@@ -178,8 +178,8 @@
}
void freeDisk() {
- if (currentVolumeFile.isOpen()) {
- currentVolumeFile.close();
+ if (_vm->_currentVolumeFile.isOpen()) {
+ _vm->_currentVolumeFile.close();
MemFree(volumePtrToFileDescriptor);
}
@@ -194,7 +194,7 @@
int16 findFileInList(char *fileName) {
int i;
- if (!currentVolumeFile.isOpen()) {
+ if (!_vm->_currentVolumeFile.isOpen()) {
return (-1);
}
@@ -248,7 +248,7 @@
if (!volumeDataLoaded) {
debug(1, "CNF wasn't loaded, reading now...");
- if (currentVolumeFile.isOpen()) {
+ if (_vm->_currentVolumeFile.isOpen()) {
askDisk(-1);
freeDisk();
}
@@ -257,7 +257,7 @@
readVolCnf();
}
- if (currentVolumeFile.isOpen()) {
+ if (_vm->_currentVolumeFile.isOpen()) {
askDisk(-1);
}
@@ -274,7 +274,7 @@
debug(1, "File found on disk %d", disk);
- if (currentVolumeFile.isOpen()) {
+ if (_vm->_currentVolumeFile.isOpen()) {
askDisk(-1);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list