scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-10 17:46:53 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

Trunk sync r9082

Browse Source
This commit is contained in:
The_E committed 2012-08-01 16:43:44 +00:00
1 parent 49ba4f86ff
commit b6bdffd23a
20 files changed
+174 -155
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/scripting.cpp
+13 -8
View File
@@ -217,7 +217,7 @@ bool ConditionedHook::AddAction(script_action sa)
return true;
}
bool ConditionedHook::ConditionsValid(int action, object *objp)
bool ConditionedHook::ConditionsValid(int action, object *objp, int more_data)
{
uint i;
@@ -359,14 +359,19 @@ bool ConditionedHook::ConditionsValid(int action, object *objp)
break;
}
case CHA_ONWPFIRED: {
primary = stricmp(Weapon_info[shipp->weapons.primary_bank_weapons[shipp->weapons.current_primary_bank]].name, scp->data.name) == 0;
secondary = stricmp(Weapon_info[shipp->weapons.secondary_bank_weapons[shipp->weapons.current_secondary_bank]].name, scp->data.name) == 0;
if (more_data == 1) {
primary = stricmp(Weapon_info[shipp->weapons.primary_bank_weapons[shipp->weapons.current_primary_bank]].name, scp->data.name) == 0;
secondary = false;
} else {
primary = false;
secondary = stricmp(Weapon_info[shipp->weapons.secondary_bank_weapons[shipp->weapons.current_secondary_bank]].name, scp->data.name) == 0;
}
if (shipp->flags & SF_PRIMARY_LINKED && primary && Weapon_info[shipp->weapons.primary_bank_weapons[shipp->weapons.current_primary_bank]].wi_flags3 & WIF3_NOLINK)
return false;
if (!(primary || secondary))
return false;
return more_data == 1 ? primary : secondary;
break;
}
case CHA_ONTURRETFIRED: {
@@ -855,12 +860,12 @@ int script_state::RunBytecode(script_hook &hd, char format, void *data)
return 1;
}
int script_state::RunCondition(int action, char format, void *data, object *objp)
int script_state::RunCondition(int action, char format, void *data, object *objp, int more_data)
{
int num = 0;
for(SCP_vector<ConditionedHook>::iterator chp = ConditionalHooks.begin(); chp != ConditionalHooks.end(); ++chp)
{
if(chp->ConditionsValid(action, objp))
if(chp->ConditionsValid(action, objp, more_data))
{
chp->Run(this, action, format, data);
num++;