diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-09-21 20:43:21 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-09-21 20:43:21 -0500 |
| commit | d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806 (patch) | |
| tree | c3f6657118d71abcd1ce3b4584b3e0472841e53f /src/koopatlas/mapdata.cpp | |
| parent | 8d0a306f0a526a76182c8d2b513d7a0441d6f466 (diff) | |
| parent | 5654d5c0a056f9cfc99ac608d16aa0a601b997f5 (diff) | |
| download | kamek-d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806.tar.gz kamek-d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
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]); |