summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-08-29 20:20:40 +0200
committerTreeki <treeki@gmail.com>2012-08-29 20:20:40 +0200
commit6ab00abe653f502e4b07f5054d7b7f7512ce7ab1 (patch)
treea5f922e3d8531dd1504b2fdff8e830c4e072d4bc
parent8cedd9bfb7d35544c37f15f3f07357e0cc37c173 (diff)
downloadkamek-6ab00abe653f502e4b07f5054d7b7f7512ce7ab1.tar.gz
kamek-6ab00abe653f502e4b07f5054d7b7f7512ce7ab1.zip
fuck me, I removed this change by accident...
-rw-r--r--src/koopatlas/mapdata.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/koopatlas/mapdata.cpp b/src/koopatlas/mapdata.cpp
index ef0a747..44310ea 100644
--- a/src/koopatlas/mapdata.cpp
+++ b/src/koopatlas/mapdata.cpp
@@ -168,7 +168,8 @@ bool dKPMapData_c::loadTilesets() {
for (int i = 0; i < data->tilesetCount; i++) {
char *filename = ((char*)data) + (data->tilesets[i].dummy[3] - 0x10000000);
- result &= (tilesetLoaders[i].load(filename) != 0);
+ void *heap = (i < 9) ? mHeap::gameHeaps[2] : mHeap::archiveHeap;
+ result &= (tilesetLoaders[i].load(filename, 0, heap) != 0);
}
if (result) {