libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CGE2: Implement loadUser() and loadPos().

Browse Source 
Revise File I/O a bit to do so.
This commit is contained in:
uruk 2014-05-26 15:58:07 +02:00
parent 8fa31d1168
commit 75546134c8
4 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/cge2/cge2.h
View File

@ -135,6 +135,7 @@ public:
void loadUser();
void checkSaySwitch();
void qGame();
void loadPos();
void setEye(V3D &e);
void setEye(const V2D& e2, int z = -kScrWidth);

35
engines/cge2/cge2_main.cpp
View File

@ -556,7 +556,35 @@ void CGE2Engine::runGame() {
}
void CGE2Engine::loadUser() {
warning("STUB: CGE2Engine::loadUser()");
// set scene
if (_mode == 0) { // user .SVG file found
warning("STUB: CGE2Engine::loadUser()");
// Missing loading from save file. TODO: Implement it with the saving/loading!
} else if (_mode == 1) {
loadScript("CGE.INI");
loadPos();
// Missing saving to save file. TODO: Implement it with the saving/loading!
}
}
void CGE2Engine::loadPos() {
if (_resman->exist("CGE.HXY")) {
for (int cav = 0; cav < kCaveMax; cav++)
_heroTab[1]->_posTab[cav] = new V2D(this, 180, 10);
EncryptedStream file(this, "CGE.HXY");
for (int cav = 0; cav < kCaveMax; cav++) {
_heroTab[0]->_posTab[cav]->x = file.readSint16LE();
_heroTab[0]->_posTab[cav]->y = file.readSint16LE();
}
for (int cav = 0; cav < 41; cav++) { // (564 - 400) / 4 = 41
_heroTab[1]->_posTab[cav]->x = file.readSint16LE();
_heroTab[1]->_posTab[cav]->y = file.readSint16LE();
}
} else
error("Missing file: CGE.HXY");
}
void CGE2Engine::checkSaySwitch() {
@ -575,11 +603,10 @@ void CGE2Engine::loadTab() {
if (_resman->exist(kTabName)) {
EncryptedStream f(this, kTabName);
Common::File output;
for (int i = 0; i < kCaveMax; i++) {
for (int j = 0; j < 3; j++) {
signed b = f.readSigned();
unsigned a = f.readUnsigned();
signed b = f.readSint16BE();
unsigned a = f.readUint16BE();
uint16 round = uint16((long(a) << 16) / 100);
if (round > 0x7FFF)

8
engines/cge2/fileio.cpp
View File

@ -216,14 +216,18 @@ uint32 EncryptedStream::read(byte *dataPtr, uint32 dataSize) {
return _readStream->read(dataPtr, dataSize);
}
unsigned EncryptedStream::readUnsigned() {
unsigned EncryptedStream::readUint16BE() {
return _readStream->readUint16BE();
}
signed EncryptedStream::readSigned() {
signed EncryptedStream::readSint16BE() {
return _readStream->readSint16BE();
}
signed EncryptedStream::readSint16LE() {
return _readStream->readSint16LE();
}
bool EncryptedStream::err() {
return (_error & _readStream->err());
}

5
engines/cge2/fileio.h
View File

@ -121,8 +121,9 @@ public:
int32 pos();
int32 size();
uint32 read(byte *dataPtr, uint32 dataSize);
unsigned readUnsigned();
signed readSigned();
unsigned readUint16BE();
signed readSint16BE();
signed readSint16LE();
Common::String readLine();
int getLineCount() { return _lineCount; }