diff options
author | Robert Göffringmann | 2003-12-30 23:08:51 +0000 |
---|---|---|
committer | Robert Göffringmann | 2003-12-30 23:08:51 +0000 |
commit | e669103b5d20a4983250f8e10ed67925d989a549 (patch) | |
tree | 9f54962022174df6c960c8e23ad0464ec29ecc0c /sword1 | |
parent | c06b1af619dbdf8e6ead166b3059447d82c5438d (diff) | |
download | scummvm-rg350-e669103b5d20a4983250f8e10ed67925d989a549.tar.gz scummvm-rg350-e669103b5d20a4983250f8e10ed67925d989a549.tar.bz2 scummvm-rg350-e669103b5d20a4983250f8e10ed67925d989a549.zip |
removed old, useless stuff
svn-id: r12045
Diffstat (limited to 'sword1')
-rw-r--r-- | sword1/resman.cpp | 30 | ||||
-rw-r--r-- | sword1/resman.h | 2 |
2 files changed, 1 insertions, 31 deletions
diff --git a/sword1/resman.cpp b/sword1/resman.cpp index 1b3c589056..d95055e0b4 100644 --- a/sword1/resman.cpp +++ b/sword1/resman.cpp @@ -227,13 +227,11 @@ FrameHeader *ResMan::fetchFrame(void *resourceData, uint32 frameNo) { File *ResMan::openClusterFile(uint32 id) { File *clusFile = new File(); - char fullPath[MAX_PATH_LEN]; char fileName[15]; - makePathToCluster(fullPath); sprintf(fileName, "%s.CLU", _prj.clu[(id >> 24)-1]->label); clusFile->open(fileName); if (!clusFile->isOpen()) - error("Can't open cluster file %s in directory: %s\n", fileName, fullPath); + error("Can't open cluster file %s", fileName); return clusFile; } @@ -264,32 +262,6 @@ uint32 ResMan::resOffset(uint32 id) { return _prj.clu[cluster]->grp[group]->offset[id & 0xFFFF]; } -void ResMan::makePathToCluster(char *str) { - *str = '\0'; - // todo: add search stuff, cd1, cd2, etc. -} - -void *ResMan::mouseResOpen(uint32 id) { - BsMemHandle *memHandle = resHandle(id); - if (memHandle->cond == MEM_FREED) { - resOpen(id); - uint16 *head = (uint16*)memHandle->data; -#ifdef SCUMM_BIG_ENDIAN - for (uint8 endCnt = 0; endCnt < 5; endCnt++) - head[endCnt] = READ_LE_UINT16(head + endCnt); -#endif - // fix transparency: - uint8 *rawData = (uint8*)memHandle->data; - uint32 size = head[0] * head[1] * head[2]; - rawData += 0x3A; - for (uint32 cnt = 0; cnt < size; cnt++) - if (rawData[cnt] == 0) - rawData[cnt] = 255; - return memHandle->data; - } else - return openFetchRes(id); -} - void ResMan::openCptResourceBigEndian(uint32 id) { resOpen(id); BsMemHandle *handle = resHandle(id); diff --git a/sword1/resman.h b/sword1/resman.h index 830f4be672..a65840a0f0 100644 --- a/sword1/resman.h +++ b/sword1/resman.h @@ -57,7 +57,6 @@ public: void dumpRes(uint32 id); void *openFetchRes(uint32 id); void *cptResOpen(uint32 id); - void *mouseResOpen(uint32 id); Header *lockScript(uint32 scrID); void unlockScript(uint32 scrID); FrameHeader *fetchFrame(void *resourceData, uint32 frameNo); @@ -70,7 +69,6 @@ private: void openScriptResourceBigEndian(uint32 id); File *openClusterFile(uint32 id); - void makePathToCluster(char *str); void loadCluDescript(const char *fileName); void freeCluDescript(void); BsPrj _prj; |