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

Adds On Beam Fire scripting hook

Browse Source
This commit is contained in:
Axem committed 2015-05-31 18:02:36 -05:00
1 parent 859405b62e
commit 61e4f739ce
13 files changed
+13 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/scripting.cpp
+8 -2
View File
@@ -82,7 +82,8 @@ flag_def_list Script_actions[] =
{"On Ship Arrive", CHA_ONSHIPARRIVE, 0},
{"On Beam Collision", CHA_COLLIDEBEAM, 0},
{"On Message Received", CHA_MSGRECEIVED, 0},
{"On HUD Message Received", CHA_HUDMSGRECEIVED, 0}
{"On HUD Message Received", CHA_HUDMSGRECEIVED, 0},
{"On Beam Fire", CHA_BEAMFIRE, 0 }
};
int Num_script_actions = sizeof(Script_actions)/sizeof(flag_def_list);
@@ -318,7 +319,7 @@ bool ConditionedHook::ConditionsValid(int action, object *objp, int more_data)
if (action == CHA_COLLIDEWEAPON) {
if (stricmp(Weapon_info[more_data].name, scp->data.name) != 0)
return false;
} else if (!(action == CHA_ONWPSELECTED || action == CHA_ONWPDESELECTED || action == CHA_ONWPEQUIPPED || action == CHA_ONWPFIRED || action == CHA_ONTURRETFIRED )) {
} else if (!(action == CHA_ONWPSELECTED || action == CHA_ONWPDESELECTED || action == CHA_ONWPEQUIPPED || action == CHA_ONWPFIRED || action == CHA_ONTURRETFIRED || action == CHA_BEAMFIRE)) {
if(objp == NULL || (objp->type != OBJ_WEAPON && objp->type != OBJ_BEAM))
return false;
else if (( objp->type == OBJ_WEAPON) && (stricmp(Weapon_info[Weapons[objp->instance].weapon_info_index].name, scp->data.name) != 0 ))
@@ -427,6 +428,11 @@ bool ConditionedHook::ConditionsValid(int action, object *objp, int more_data)
return false;
break;
}
case CHA_BEAMFIRE: {
if (!(stricmp(Weapon_info[more_data].name, scp->data.name) == 0))
return false;
break;
}
}
} // case CHC_WEAPONCLASS