summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2013-05-22 21:18:52 +0200
committerTreeki <treeki@gmail.com>2013-05-22 21:18:52 +0200
commitf525c40321d24bbc83d8dcfdbcd63e89c368917f (patch)
treece0ea692dde8dcaac6dcc17d6bfd1b7c1a493fa8 /src
parent483ebc6f00a35e972ef90fd81dbda39d114960e4 (diff)
downloadkamek-f525c40321d24bbc83d8dcfdbcd63e89c368917f.tar.gz
kamek-f525c40321d24bbc83d8dcfdbcd63e89c368917f.zip
hammer suit model fixes
Diffstat (limited to '')
-rw-r--r--src/poweruphax.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/poweruphax.cpp b/src/poweruphax.cpp
index f2895de..1bb5dc8 100644
--- a/src/poweruphax.cpp
+++ b/src/poweruphax.cpp
@@ -45,8 +45,8 @@ void dHammerSuitRenderer_c::setup(dPlayerModelHandler_c *handler, int sceneID) {
nw4r::g3d::ResFile rf(getResource("hammerM", "g3d/suit.brres"));
- if (victim->player_id_1 <= 1) {
- helmet.setup(rf.GetResMdl((victim->player_id_1 == 0) ? "marioHelmet" : "luigiHelmet"), &allocator, 0, 1, 0);
+ if (victim->player_id_2 <= 1) {
+ helmet.setup(rf.GetResMdl((victim->player_id_2 == 0) ? "marioHelmet" : "luigiHelmet"), &allocator, 0, 1, 0);
SetupTextures_MapObj(&helmet, sceneID);
}
@@ -64,7 +64,7 @@ void dHammerSuitRenderer_c::setup(dPlayerModelHandler_c *handler, int sceneID) {
(nw4r::g3d::ResMdl*)(((u32)victimModel->scnObj) + 0xE8);
//headNodeID = playerResMdl->GetResNode("player_head").GetID();
- if (victim->player_id_1 <= 1)
+ if (victim->player_id_2 <= 1)
headNodeID = playerResMdl->GetResNode("face_1").GetID();
rootNodeID = playerResMdl->GetResNode("skl_root").GetID();
}
@@ -73,7 +73,7 @@ void dHammerSuitRenderer_c::draw() {
if (victim->powerup_id != 7)
return;
- if (victim->player_id_1 <= 1) {
+ if (victim->player_id_2 <= 1) {
// Materials: 2=hair 3=hat; Modes: BACK=visible ALL=invisible
SetCullModeForMaterial(&victim->getCurrentModel()->head, 3, GX_CULL_ALL);