diff options
| author | Treeki <treeki@gmail.com> | 2012-03-27 21:37:54 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-03-27 21:37:54 +0200 |
| commit | e12b1713576544fdda756a3ca8831642562ea921 (patch) | |
| tree | 4d0b9986bc38ba55856bfbb2c04b9db88d151d66 /src | |
| parent | c0884789752ad8d6b4d7d61ada19f28c7790fc9e (diff) | |
| download | kamek-e12b1713576544fdda756a3ca8831642562ea921.tar.gz kamek-e12b1713576544fdda756a3ca8831642562ea921.zip | |
brought Koopatlas engine up to date and compiling
Diffstat (limited to 'src')
| -rw-r--r-- | src/koopatlas/camera.cpp | 8 | ||||
| -rw-r--r-- | src/koopatlas/map.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/koopatlas/camera.cpp b/src/koopatlas/camera.cpp index 47b68a5..c13db56 100644 --- a/src/koopatlas/camera.cpp +++ b/src/koopatlas/camera.cpp @@ -69,7 +69,7 @@ int dWorldCamera_c::onExecute() { int heldButtons = Remocon_GetButtons(GetActiveRemocon()); if (heldButtons & WPAD_MINUS) { bool change = false; - if (heldButtons & WPAD_LEFT) { + /*if (heldButtons & WPAD_LEFT) { currentX -= 8.0f; change = true; } @@ -84,7 +84,7 @@ int dWorldCamera_c::onExecute() { if (heldButtons & WPAD_DOWN) { currentY -= 8.0f; change = true; - } + }*/ if (heldButtons & WPAD_B) { zoomLevel -= 0.10f; change = true; @@ -96,6 +96,10 @@ int dWorldCamera_c::onExecute() { if (change) { } } + daWMPlayer_c *player = daWMPlayer_c::instance; + currentX = player->pos.x; + currentY = player->pos.y; + calculateScreenGeometry(); doStuff(10000.0); generateCameraMatrices(); diff --git a/src/koopatlas/map.cpp b/src/koopatlas/map.cpp index 258cf7c..5e2b813 100644 --- a/src/koopatlas/map.cpp +++ b/src/koopatlas/map.cpp @@ -41,8 +41,6 @@ dWMMap_c::dWMMap_c() { int dWMMap_c::onCreate() { renderer.allocator.setup(GameHeaps[0], 0x20); bool result = renderer.setup(&renderer.allocator); - if (result) - else bgMatrix.translation(1140.0f, -2910.0f, -500.0f); s16 rot = 0x4000; |