summaryrefslogtreecommitdiff
path: root/src/koopatlas
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-08-28 04:44:49 +0200
committerTreeki <treeki@gmail.com>2012-08-28 04:44:49 +0200
commit2dc6dc90e21d12186bb1a88b81fd8f74baea4fbe (patch)
tree5edd508799edeeb02993f0b9f7bf38aa0291954b /src/koopatlas
parent80a9d3f3ab5a08447bbbde669e7a077ffc3f1178 (diff)
downloadkamek-2dc6dc90e21d12186bb1a88b81fd8f74baea4fbe.tar.gz
kamek-2dc6dc90e21d12186bb1a88b81fd8f74baea4fbe.zip
hammer suit model
Diffstat (limited to 'src/koopatlas')
-rw-r--r--src/koopatlas/player.cpp3
-rw-r--r--src/koopatlas/player.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/koopatlas/player.cpp b/src/koopatlas/player.cpp
index 5531301..51470da 100644
--- a/src/koopatlas/player.cpp
+++ b/src/koopatlas/player.cpp
@@ -11,6 +11,8 @@ int daWMPlayer_c::onCreate() {
this->modelHandler->setSRT((Vec){0.0,100.0,-100.0}, (S16Vec){0,0,0}, (Vec){2.0,2.0,2.0});
this->modelHandler->draw();
+ hammerSuit.setup(this->modelHandler);
+
pos = (Vec){0.0f,0.0f,3000.0f};
rot = (S16Vec){0,0,0};
scale = (Vec){1.6f,1.6f,1.6f};
@@ -61,6 +63,7 @@ int daWMPlayer_c::onExecute() {
int daWMPlayer_c::onDraw() {
this->modelHandler->draw();
+ hammerSuit.draw();
return true;
}
diff --git a/src/koopatlas/player.h b/src/koopatlas/player.h
index 6e98e4e..6fbbf5a 100644
--- a/src/koopatlas/player.h
+++ b/src/koopatlas/player.h
@@ -2,6 +2,7 @@
#define __KOOPATLAS_PLAYER_H
#include "koopatlas/core.h"
+#include "poweruphax.h"
enum PlayerAnim {
wait = 0,
@@ -211,6 +212,7 @@ class daWMPlayer_c : public dActor_c {
float jumpOffset;
mEf::es2 effect;
+ dHammerSuitRenderer_c hammerSuit;
void startAnimation(int id, float frame, float unk, float updateRate);