thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup.

Browse source 
svn-id: r19690
This commit is contained in:
Torbjörn Andersson 2005-11-22 13:17:08 +00:00
parent d1cbf8f275
commit 5e63b90bc1
2 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gob/dataio.cpp
View file

@ -26,32 +26,28 @@
namespace Gob {
int16 file_write(int16 handle, char *buf, int16 size) {
return filesHandles[handle].write(buf, size);
Common::File *file_getHandle(int16 handle) {
return &filesHandles[handle];
}
int16 file_open(const char *path, Common::File::AccessMode mode) {
int16 i;
for (i = 0; i < MAX_FILES; i++) {
if (!filesHandles[i].isOpen())
if (!file_getHandle(i)->isOpen())
break;
}
if (i == MAX_FILES)
return -1;
filesHandles[i].open(path, mode);
file_getHandle(i)->open(path, mode);
if (filesHandles[i].isOpen())
if (file_getHandle(i)->isOpen())
return i;
return -1;
}
Common::File *file_getHandle(int16 handle) {
return &filesHandles[handle];
}
int16 data_getChunk(const char *chunkName) {
int16 file;
int16 slot;
@ -364,8 +360,4 @@ char *data_getData(const char *path) {
return data;
}
char *data_getSmallData(const char *path) {
return data_getData(path);
}
} // End of namespace Gob

4
gob/map.cpp
View file

@ -453,7 +453,7 @@ void map_loadMapObjects(char *avjFile) {
if (handle >= 0) {
map_loadFromAvo = 1;
data_closeData(handle);
map_avoDataPtr = data_getSmallData(avoName);
map_avoDataPtr = data_getData(avoName);
dataBuf = map_avoDataPtr;
map_loadDataFromAvo((char *)map_passMap, 28 * 26);
@ -471,7 +471,7 @@ void map_loadMapObjects(char *avjFile) {
map_loadDataFromAvo((char *)map_itemPoses, szMap_ItemPos * 20);
} else {
map_loadFromAvo = 0;
map_avoDataPtr = data_getSmallData(avjFile);
map_avoDataPtr = data_getData(avjFile);
dataBuf = map_avoDataPtr;
}