PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Link CPlasmaBeam 

Former-commit-id: 1c555b36023d702452d39be928f21c3bdc43af81
This commit is contained in:
Luke Street 2023-10-11 18:04:59 -04:00
parent fcca7681cc
commit 873d7539aa
3 changed files with 436 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

842
config/GM8E01_00/symbols.txt
View File

File diff suppressed because it is too large Load Diff

2
configure.py
View File

@ -351,7 +351,7 @@ config.libs = [
Object(NonMatching, "MetroidPrime/ScriptLoader.cpp"), Object(NonMatching, "MetroidPrime/ScriptLoader.cpp"),
Object(NonMatching, "MetroidPrime/CSamusDoll.cpp"), Object(NonMatching, "MetroidPrime/CSamusDoll.cpp"),
Object(NonMatching, "MetroidPrime/Factories/CStateMachineFactory.cpp"), Object(NonMatching, "MetroidPrime/Factories/CStateMachineFactory.cpp"),
Object(NonMatching, "MetroidPrime/Weapons/CPlasmaBeam.cpp"), Object(Matching, "MetroidPrime/Weapons/CPlasmaBeam.cpp"),
Object(NonMatching, "MetroidPrime/Weapons/CPowerBeam.cpp"), Object(NonMatching, "MetroidPrime/Weapons/CPowerBeam.cpp"),
Object(NonMatching, "MetroidPrime/Weapons/CWaveBeam.cpp"), Object(NonMatching, "MetroidPrime/Weapons/CWaveBeam.cpp"),
Object(NonMatching, "MetroidPrime/Weapons/CIceBeam.cpp"), Object(NonMatching, "MetroidPrime/Weapons/CIceBeam.cpp"),

4
src/MetroidPrime/Weapons/CPlasmaBeam.cpp
View File

@ -14,8 +14,8 @@
#include "rstl/math.hpp" #include "rstl/math.hpp"
static CCameraShakeData CameraShaker = CCameraShakeData(0.125f, 0.25f); CCameraShakeData CameraShaker = CCameraShakeData(0.125f, 0.25f);
static ushort kSoundId[2] = {SFXwpn_fire_plasma_normal, SFXwpn_fire_plasma_charged}; static const ushort kSoundId[2] = {SFXwpn_fire_plasma_normal, SFXwpn_fire_plasma_charged};
CPlasmaBeam::CPlasmaBeam(CAssetId characterId, EWeaponType type, TUniqueId playerId, CPlasmaBeam::CPlasmaBeam(CAssetId characterId, EWeaponType type, TUniqueId playerId,
EMaterialTypes playerMaterial, const CVector3f& scale) EMaterialTypes playerMaterial, const CVector3f& scale)