diff options
| author | Treeki <treeki@gmail.com> | 2012-09-22 05:00:31 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-09-22 05:00:31 +0200 |
| commit | 69e333ae495048f991495b86faa7c7c137a92078 (patch) | |
| tree | a98565ec0bee67e0db2e819cb90b4ec74e4bdc93 /src/koopatlas/mapdata.cpp | |
| parent | 955831a5bad45d39dfceb4a1741095b5d109b079 (diff) | |
| parent | 2d516c7c77158eb2125ff4f53d5051762df5959d (diff) | |
| download | kamek-69e333ae495048f991495b86faa7c7c137a92078.tar.gz kamek-69e333ae495048f991495b86faa7c7c137a92078.zip | |
Merge branch 'level-select' into new-hud
Diffstat (limited to '')
| -rw-r--r-- | src/koopatlas/mapdata.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/koopatlas/mapdata.cpp b/src/koopatlas/mapdata.cpp index ab8ef3a..52a7937 100644 --- a/src/koopatlas/mapdata.cpp +++ b/src/koopatlas/mapdata.cpp @@ -152,7 +152,7 @@ bool dKPMapData_c::load(const char *filename) { fixup(); bool didLoadTilesets = loadTilesets(); - bool didLoadBG = (bgLoader.load("/Maps/Water.brres") != 0); + bool didLoadBG = (bgLoader.load(data->backgroundName) != 0); return didLoadTilesets && didLoadBG; } @@ -203,6 +203,8 @@ void dKPMapData_c::fixup() { fixRef(data->layers); fixRef(data->tilesets); fixRef(data->unlockData); + fixRef(data->sectors); + fixRef(data->backgroundName); for (int iLayer = 0; iLayer < data->layerCount; iLayer++) { dKPLayer_s *layer = fixRef(data->layers[iLayer]); |