diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-08-29 13:22:48 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-08-29 13:22:48 -0500 |
| commit | 5d5eb65d2dc63f4fe4297972b4259cf5ab08ecaa (patch) | |
| tree | c9453a1214c1f6f080378bec4fa4d817a7f8374d | |
| parent | 642c99cff7810bc979ade719d4b88e2941fa1461 (diff) | |
| parent | 6ab00abe653f502e4b07f5054d7b7f7512ce7ab1 (diff) | |
| download | kamek-5d5eb65d2dc63f4fe4297972b4259cf5ab08ecaa.tar.gz kamek-5d5eb65d2dc63f4fe4297972b4259cf5ab08ecaa.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
| -rw-r--r-- | src/koopatlas/mapdata.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/koopatlas/mapdata.cpp b/src/koopatlas/mapdata.cpp index 1857b18..ab8ef3a 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) { |