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/camera.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/camera.cpp')
| -rw-r--r-- | src/koopatlas/camera.cpp | 8 |
1 files changed, 6 insertions, 2 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(); |