summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2013-06-02 23:28:26 +0200
committerTreeki <treeki@gmail.com>2013-06-02 23:28:26 +0200
commit60e99868bebccd520f29284c34f90fcb22c036b9 (patch)
treef87048c436804518ba61139a69d2e67e9122ea7d /src
parent59224f4e86b57638965422808878332fb775c00a (diff)
downloadkamek-60e99868bebccd520f29284c34f90fcb22c036b9.tar.gz
kamek-60e99868bebccd520f29284c34f90fcb22c036b9.zip
change a couple of wrong player id vars
Diffstat (limited to '')
-rw-r--r--src/endingMgr.cpp2
-rw-r--r--src/poweruphax.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/endingMgr.cpp b/src/endingMgr.cpp
index 09dfc3c..984b497 100644
--- a/src/endingMgr.cpp
+++ b/src/endingMgr.cpp
@@ -273,7 +273,7 @@ void dEndingMgr_c::executeState_ThanksPeach() {
SE_VOC_KO2_SAVE_PRINCESS
};
dPlayerModelHandler_c *pmh = (dPlayerModelHandler_c*)(((u32)player) + 0x2A60);
- int voc = vocs[pmh->mdlClass->player_id_1];
+ int voc = vocs[pmh->mdlClass->player_id_2];
nw4r::snd::SoundHandle handle;
PlaySoundWithFunctionB4(SoundRelatedClass, &handle, voc, 1);
diff --git a/src/poweruphax.cpp b/src/poweruphax.cpp
index 1bb5dc8..9eb3682 100644
--- a/src/poweruphax.cpp
+++ b/src/poweruphax.cpp
@@ -53,7 +53,7 @@ void dHammerSuitRenderer_c::setup(dPlayerModelHandler_c *handler, int sceneID) {
const char *shellNames[] = {
"shell", "shell", "shell", "shell", "shell"
};
- shell.setup(rf.GetResMdl(shellNames[victim->player_id_1]), &allocator, 0, 1, 0);
+ shell.setup(rf.GetResMdl(shellNames[victim->player_id_2]), &allocator, 0, 1, 0);
SetupTextures_MapObj(&shell, sceneID);
allocator.unlink();