libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 10:17:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- changed Cnv to use a single large buffer for frames instead of small chunks of memory, to simplify loading by Disk.

Browse Source 
- added a new constructor with parameters to Cnv

svn-id: r26318
This commit is contained in:
Nicola Mettifogo 2007-03-29 19:03:51 +00:00
parent 711865ef63
commit 31eb34c98f
3 changed files with 56 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engines/parallaction/defs.h
View File

@ -88,34 +88,32 @@ struct StaticCnv {
};
struct Cnv {
class Cnv {
uint16 _count; // # of frames
uint16 _width; //
uint16 _height; //
byte** field_8; // unused
uint16 _count; // # of frames
byte** _array; // frames data
byte* _data;
public:
Cnv() {
_width = _height = _count = 0;
_array = NULL;
_data = NULL;
}
Cnv(uint16 numFrames, uint16 width, uint16 height, byte* data) : _count(numFrames), _width(width), _height(height), _data(data) {
}
~Cnv() {
if (_count == 0 || _array == NULL) return;
for (uint16 _si = 0; _si < _count; _si++) {
if (_array[_si])
free(_array[_si]);
}
free(_array);
if (_count == 0 || _data == NULL) return;
free(_data);
}
byte* getFramePtr(uint16 index) {
if (index >= _count)
return NULL;
return _array[index];
return &_data[index * _width * _height];
}
};

121
engines/parallaction/disk.cpp
View File

@ -120,7 +120,7 @@ uint16 DosDisk::decompressChunk(byte *src, byte *dst, uint16 size) {
//
// loads a cnv from an external file
//
void DosDisk::loadExternalCnv(const char *filename, Cnv *cnv) {
Cnv* DosDisk::loadExternalCnv(const char *filename) {
// printf("Gfx::loadExternalCnv(%s)...", filename);
char path[PATH_LEN];
@ -132,22 +132,15 @@ void DosDisk::loadExternalCnv(const char *filename, Cnv *cnv) {
if (!stream.open(path))
errorFileNotFound(path);
cnv->_count = stream.readByte();
cnv->_width = stream.readByte();
cnv->_height = stream.readByte();
uint16 numFrames = stream.readByte();
uint16 width = stream.readByte();
uint16 height = stream.readByte();
cnv->_array = (byte**)malloc(cnv->_count * sizeof(byte*));
uint32 decsize = numFrames * width * height;
byte *data = (byte*)malloc(decsize);
stream.read(data, decsize);
uint16 size = cnv->_width*cnv->_height;
for (uint16 i = 0; i < cnv->_count; i++) {
cnv->_array[i] = (byte*)malloc(size);
stream.read(cnv->_array[i], size);
}
// printf("done\n");
return;
return new Cnv(numFrames, width, height, data);
}
void DosDisk::loadExternalStaticCnv(const char *filename, StaticCnv *cnv) {
@ -175,7 +168,7 @@ void DosDisk::loadExternalStaticCnv(const char *filename, StaticCnv *cnv) {
return;
}
void DosDisk::loadCnv(const char *filename, Cnv *cnv) {
Cnv* DosDisk::loadCnv(const char *filename) {
// printf("Gfx::loadCnv(%s)\n", filename);
char path[PATH_LEN];
@ -187,69 +180,50 @@ void DosDisk::loadCnv(const char *filename, Cnv *cnv) {
errorFileNotFound(path);
}
cnv->_count = _archive.readByte();
cnv->_width = _archive.readByte();
cnv->_height = _archive.readByte();
uint16 numFrames = _archive.readByte();
uint16 width = _archive.readByte();
uint16 height = _archive.readByte();
uint16 framesize = cnv->_width*cnv->_height;
uint32 rawsize = _archive.size() - 3;
byte *buf = (byte*)malloc(rawsize);
_archive.read(buf, rawsize);
cnv->_array = (byte**)malloc(cnv->_count * sizeof(byte*));
uint32 decsize = numFrames * width * height;
byte *data = (byte*)malloc(decsize);
decompressChunk(buf, data, decsize);
uint32 size = _archive.size() - 3;
byte *buf = (byte*)malloc(size);
_archive.read(buf, size);
byte *s = buf;
for (uint16 i = 0; i < cnv->_count; i++) {
cnv->_array[i] = (byte*)malloc(framesize);
uint16 read = decompressChunk(s, cnv->_array[i], framesize);
// printf("frame %i decompressed: %i --> %i\n", i, read, framesize);
s += read;
}
free(buf);
return;
return new Cnv(numFrames, width, height, data);
}
Cnv* DosDisk::loadTalk(const char *name) {
Cnv *cnv = new Cnv;
const char *ext = strstr(name, ".talk");
if (ext != NULL) {
// npc talk
loadCnv(name, cnv);
} else {
// character talk
/*
if (scumm_stricmp(name, _doughName) &&
scumm_stricmp(name, _dinoName) &&
scumm_stricmp(name, _donnaName) &&
scumm_stricmp(name, _drkiName)) return;
*/
char v20[PATH_LEN];
char *v24 = const_cast<char*>(name);
if (IS_MINI_CHARACTER(v24)) {
v24+=4;
}
if (_engineFlags & kEngineTransformedDonna) {
sprintf(v20, "%stta", v24);
} else {
sprintf(v20, "%stal", v24);
}
loadExternalCnv(v20, cnv);
return loadCnv(name);
}
return cnv;
// character talk
/*
if (scumm_stricmp(name, _doughName) &&
scumm_stricmp(name, _dinoName) &&
scumm_stricmp(name, _donnaName) &&
scumm_stricmp(name, _drkiName)) return;
*/
char v20[PATH_LEN];
char *v24 = const_cast<char*>(name);
if (IS_MINI_CHARACTER(v24)) {
v24+=4;
}
if (_engineFlags & kEngineTransformedDonna) {
sprintf(v20, "%stta", v24);
} else {
sprintf(v20, "%stal", v24);
}
return loadExternalCnv(v20);
}
Script* DosDisk::loadLocation(const char *name) {
@ -334,12 +308,8 @@ StaticCnv* DosDisk::loadPointer() {
Cnv* DosDisk::loadFont(const char* name) {
char path[PATH_LEN];
sprintf(path, "%scnv", name);
Cnv* cnv = new Cnv;
loadExternalCnv(path, cnv);
return cnv;
return loadExternalCnv(path);
}
// loads character's icons set
@ -352,10 +322,7 @@ Cnv* DosDisk::loadObjects(const char *name) {
char path[PATH_LEN];
sprintf(path, "%sobj", name);
Cnv* cnv = new Cnv;
loadExternalCnv(path, cnv);
return cnv;
return loadExternalCnv(path);
}
@ -391,9 +358,7 @@ StaticCnv* DosDisk::loadStatic(const char* name) {
}
Cnv* DosDisk::loadFrames(const char* name) {
Cnv* cnv = new Cnv;
loadCnv(name, cnv);
return cnv;
return loadCnv(name);
}
//

4
engines/parallaction/disk.h
View File

@ -111,8 +111,8 @@ class DosDisk : public Disk {
private:
uint16 decompressChunk(byte *src, byte *dst, uint16 size);
void unpackBackgroundScanline(byte *src, byte *screen, byte *mask, byte *path);
void loadExternalCnv(const char *filename, Cnv *cnv);
void loadCnv(const char *filename, Cnv *cnv);
Cnv* loadExternalCnv(const char *filename);
Cnv* loadCnv(const char *filename);
void loadExternalStaticCnv(const char *filename, StaticCnv *cnv);
void loadBackground(const char *filename);
void loadMaskAndPath(const char *name);