summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-10-22 22:09:28 -0500
committerColin Noga <Tempus@chronometry.ca>2012-10-22 22:09:28 -0500
commiteea011371eee3bd9e6d9660b5f43b80b1a0c336d (patch)
tree90b5021ead8c34f724e8bf6caaedf59e11b81540
parent3f0195755f33e3cb0357f4ba36ef7470467df32d (diff)
parentf7e35d66b903263b7e31010114cafffd9b8e5055 (diff)
downloadkamek-eea011371eee3bd9e6d9660b5f43b80b1a0c336d.tar.gz
kamek-eea011371eee3bd9e6d9660b5f43b80b1a0c336d.zip
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to '')
-rw-r--r--src/koopatlas/pathmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp
index 032d40b..abcfd76 100644
--- a/src/koopatlas/pathmanager.cpp
+++ b/src/koopatlas/pathmanager.cpp
@@ -657,12 +657,12 @@ void dWMPathManager_c::moveThroughPath() {
OSReport("Activating world change %d\n", to->worldID);
const dKPWorldDef_s *world = dScKoopatlas_c::instance->mapData.findWorldDef(to->worldID);
if (world) {
- if (strncmp(save->newerWorldName, world->name, 36) == 0) {
+ if (strncmp(save->newerWorldName, world->name, 32) == 0) {
OSReport("Already here\n");
} else {
OSReport("Found!\n");
- strncpy(save->newerWorldName, world->name, 36);
- save->newerWorldName[35] = 0;
+ strncpy(save->newerWorldName, world->name, 32);
+ save->newerWorldName[31] = 0;
save->newerWorldID = world->worldID;
save->currentMapMusic = world->trackID;