diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-03-29 11:11:11 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-03-29 11:11:11 -0500 |
| commit | 2e5153002bccc3722dbacaa62b729493d2c2bf89 (patch) | |
| tree | 0d235a689a0d7c831293dff206833f2d8efb277a /src/koopatlas/core.cpp | |
| parent | 128ab59a90b26c54e18f8823adc26d37115fb5f5 (diff) | |
| parent | 7bbab722a388bc63ec195a48c22c7060e3fab999 (diff) | |
| download | kamek-2e5153002bccc3722dbacaa62b729493d2c2bf89.tar.gz kamek-2e5153002bccc3722dbacaa62b729493d2c2bf89.zip | |
merging changes to latest pull
Diffstat (limited to 'src/koopatlas/core.cpp')
| -rw-r--r-- | src/koopatlas/core.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp index f7acf00..5e15d99 100644 --- a/src/koopatlas/core.cpp +++ b/src/koopatlas/core.cpp @@ -175,6 +175,7 @@ bool WMInit_LoadResources2(void *ptr) { wm->mapPath = wm->getMapNameForIndex(wm->currentMapID); if (wm->mapPath == 0) wm->mapPath = wm->getMapNameForIndex(0); + OSReport("Load map: %s\n", wm->mapPath); } return wm->mapData.load(wm->mapPath); @@ -229,7 +230,7 @@ bool WMInit_SetupExtra(void *ptr) { wm->player->modelHandler->mdlClass->startAnimation(0, 1.2f, 10.0f, 0.0f); dKPNode_s *cNode = wm->pathManager.currentNode; - wm->player->pos = (Vec){cNode->x, -cNode->y, wm->player->pos.y}; + wm->player->pos = (Vec){cNode->x, -cNode->y, wm->player->pos.z}; // is last param correct? must check :/ wm->map = (dWMMap_c*)CreateParentedObject(WM_MAP, wm, 0, 0); @@ -857,6 +858,7 @@ u32 dScKoopatlas_c::iterateMapList(u32(*callback)(u32,const char *,int,int), u32 while (true) { u8 chr = *ptr; if (chr == 13) { + *ptr = 0; ++ptr; continue; } |