diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-07-27 10:51:24 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-07-27 10:51:24 -0500 |
| commit | 38080e820d68f3c9111e3662268b00c345b7eead (patch) | |
| tree | 4d872b5fd950e90d7af3b907853e6805b84c2315 | |
| parent | e80220cf6e73a5f4c9ed9948e8164cb23e152898 (diff) | |
| parent | 908363a9f3546fc785e3e099ad8a31e618de703e (diff) | |
| download | kamek-38080e820d68f3c9111e3662268b00c345b7eead.tar.gz kamek-38080e820d68f3c9111e3662268b00c345b7eead.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
| -rw-r--r-- | src/koopatlas/camera.cpp | 4 | ||||
| -rw-r--r-- | src/koopatlas/pathmanager.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/koopatlas/camera.cpp b/src/koopatlas/camera.cpp index 1347c93..95cffd3 100644 --- a/src/koopatlas/camera.cpp +++ b/src/koopatlas/camera.cpp @@ -26,8 +26,8 @@ dWorldCamera_c::dWorldCamera_c() { camPos = (Vec){0.0, 0.0, 1.0}; camUp = (Vec){0.0, 1.0, 0.0}; - projection2d.near = 1.0; - projection2d.far = 20000.0; + projection2d.near = -20000.0f; + projection2d.far = 20000.0f; currentX = 416; currentY = -224; diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp index 2d4d836..1b20ebf 100644 --- a/src/koopatlas/pathmanager.cpp +++ b/src/koopatlas/pathmanager.cpp @@ -537,7 +537,7 @@ void dWMPathManager_c::activatePoint() { int w = currentNode->levelNumber[0] - 1; int l = currentNode->levelNumber[1] - 1; - if (l == 0) { + if (l == 2) { dWMShop_c::instance->LoadShopForWorld(w); dScKoopatlas_c::instance->state.setState(&dScKoopatlas_c::instance->StateID_ShopWait); return; |