summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2019-08-15 04:27:38 +0200
committerFire-Head <Fire-Head@users.noreply.github.com>2019-08-15 04:27:38 +0200
commit437a8175052284983c88356e528a59343f2cc2c2 (patch)
tree53c3fb8df01552a4742ef96f418d469677409a9c /src/control/Script.cpp
parentMerge branch 'master' into master (diff)
downloadre3-437a8175052284983c88356e528a59343f2cc2c2.tar
re3-437a8175052284983c88356e528a59343f2cc2c2.tar.gz
re3-437a8175052284983c88356e528a59343f2cc2c2.tar.bz2
re3-437a8175052284983c88356e528a59343f2cc2c2.tar.lz
re3-437a8175052284983c88356e528a59343f2cc2c2.tar.xz
re3-437a8175052284983c88356e528a59343f2cc2c2.tar.zst
re3-437a8175052284983c88356e528a59343f2cc2c2.zip
Diffstat (limited to 'src/control/Script.cpp')
-rw-r--r--src/control/Script.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index c3c3a154..c81cd050 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -3494,9 +3494,9 @@ int8 CRunningScript::ProcessCommandsFrom300To399(int32 command)
break;
}
cAudioScriptObject* obj = new cAudioScriptObject();
- obj->m_vecPos = *(CVector*)&ScriptParams[0];
- obj->m_wSound = ScriptParams[3];
- obj->m_nAudioEntityId = -5;
+ obj->Posn = *(CVector*)&ScriptParams[0];
+ obj->AudioId = ScriptParams[3];
+ obj->AudioEntity = AEHANDLE_NONE;
/* BUG: if audio is not initialized, this object will not be freed. */
/* Issue needs to be addressed in CreateOneShotScriptObject. */
DMAudio.CreateOneShotScriptObject(obj);
@@ -3506,9 +3506,9 @@ int8 CRunningScript::ProcessCommandsFrom300To399(int32 command)
{
CollectParameters(&m_nIp, 4);
cAudioScriptObject* obj = new cAudioScriptObject();
- obj->m_vecPos = *(CVector*)&ScriptParams[0];
- obj->m_wSound = ScriptParams[3];
- obj->m_nAudioEntityId = DMAudio.CreateLoopingScriptObject(obj);
+ obj->Posn = *(CVector*)&ScriptParams[0];
+ obj->AudioId = ScriptParams[3];
+ obj->AudioEntity = DMAudio.CreateLoopingScriptObject(obj);
ScriptParams[0] = CPools::GetAudioScriptObjectPool()->GetIndex(obj);
StoreParameters(&m_nIp, 1);
return 0;
@@ -3521,7 +3521,7 @@ int8 CRunningScript::ProcessCommandsFrom300To399(int32 command)
debug("REMOVE_SOUND - Sound doesn't exist\n");
return 0;
}
- DMAudio.DestroyLoopingScriptObject(obj->m_nAudioEntityId);
+ DMAudio.DestroyLoopingScriptObject(obj->AudioEntity);
delete obj;
return 0;
}