diff options
Diffstat (limited to 'src/T2DLL/T2Equip.cpp')
| -rw-r--r-- | src/T2DLL/T2Equip.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/T2DLL/T2Equip.cpp b/src/T2DLL/T2Equip.cpp index ebebcda..d42cf4e 100644 --- a/src/T2DLL/T2Equip.cpp +++ b/src/T2DLL/T2Equip.cpp @@ -115,6 +115,7 @@ void T2Equip::ReplaceCEID(unsigned int oldID, unsigned int newID) { T2Object::LoadSelf(archive, towerDoc); if (IsUsed()) { +#pragma var_order(uc, s, us) unsigned short us; short s; unsigned char uc; @@ -147,6 +148,7 @@ void T2Equip::ReplaceCEID(unsigned int oldID, unsigned int newID) { T2Object::SaveSelf(archive); if (IsUsed()) { +#pragma var_order(uc, s, us) unsigned short us; short s; unsigned char uc; @@ -179,22 +181,22 @@ void T2Equip::ReplaceCEID(unsigned int oldID, unsigned int newID) { return GetEquipDef()->ShowInfoDialog(towerDoc, this); } -/*virtual*/ void T2Equip::PlaySound(T2TowerDoc* towerDoc, int id, unsigned int inMask, unsigned int inFlags) const { - if (towerDoc->towerDoc_vf15C(mArea)) { +/*virtual*/ void T2Equip::PlaySound(T2TowerDoc* inDoc, int id, unsigned int inMask, unsigned int inFlags) const { + if (inDoc->towerDoc_vf15C(mArea)) { T2EquipDef *equipDef = GetEquipDef(); - T2SoundPlayer *soundPlayer = towerDoc->towerDoc_vf134(); + T2SoundPlayer *soundPlayer = inDoc->towerDoc_vf134(); if (equipDef && soundPlayer) { - CRect rect; - GetEquipArea(rect); - CPoint pt = rect.CenterPoint(); - CString name = equipDef->CalcSoundID(id); + CRect theArea; + GetEquipArea(theArea); + CPoint pt = theArea.CenterPoint(); + CString theName = equipDef->CalcSoundID(id); soundPlayer->Play( - name, - inMask, - inFlags, - &pt, - PlayMode_0, - 100 + theName, + inMask, + inFlags, + &pt, + PlayMode_0, + 100 ); } } |