scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-12 19:06:09 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

trunk sync r7363

Browse Source
This commit is contained in:
The_E committed 2011-07-20 18:07:56 +00:00
1 parent a115bdf287
commit 08063525c7
19 files changed
+265 -331
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/scripting.cpp
+4 -12
View File
@@ -398,10 +398,8 @@ bool ConditionedHook::Run(script_state *sys, int action, char format, void *data
Assert(sys != NULL);
//Do the actions
script_action *sap;
for(uint i = 0; i < Actions.size(); i++)
for(SCP_vector<script_action>::iterator sap = Actions.begin(); sap != Actions.end(); sap++)
{
sap = &Actions[i];
if(sap->action_type == action)
sys->RunBytecode(sap->hook, format, data);
}
@@ -415,10 +413,8 @@ bool ConditionedHook::IsOverride(script_state *sys, int action)
//bool b = false;
//Do the actions
script_action *sap;
for(uint i = 0; i < Actions.size(); i++)
for(SCP_vector<script_action>::iterator sap = Actions.begin(); sap != Actions.end(); sap++)
{
sap = &Actions[i];
if(sap->action_type == action)
{
if(sys->IsOverride(sap->hook))
@@ -805,11 +801,9 @@ int script_state::RunBytecode(script_hook &hd, char format, void *data)
int script_state::RunCondition(int action, char format, void *data, object *objp)
{
ConditionedHook *chp = NULL;
int num = 0;
for(uint i= 0; i < ConditionalHooks.size(); i++)
for(SCP_vector<ConditionedHook>::iterator chp = ConditionalHooks.begin(); chp != ConditionalHooks.end(); chp++)
{
chp = &ConditionalHooks[i];
if(chp->ConditionsValid(action, objp))
{
chp->Run(this, action, format, data);
@@ -821,11 +815,9 @@ int script_state::RunCondition(int action, char format, void *data, object *objp
bool script_state::IsConditionOverride(int action, object *objp)
{
ConditionedHook *chp = NULL;
//bool b = false;
for(uint i= 0; i < ConditionalHooks.size(); i++)
for(SCP_vector<ConditionedHook>::iterator chp = ConditionalHooks.begin(); chp != ConditionalHooks.end(); chp++)
{
chp = &ConditionalHooks[i];
if(chp->ConditionsValid(action, objp))
{
if(chp->IsOverride(this, action))