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

Trunk Sync r7724

Browse Source
This commit is contained in:
Zacam committed 2011-09-14 19:12:08 +00:00
1 parent 9b4bd56b18
commit 662938705e
2 files changed
+56 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/scripting.cpp
+5
View File
@@ -329,6 +329,11 @@ bool ConditionedHook::ConditionsValid(int action, object *objp)
break;
}
case CHA_ONWPFIRED: {
if (! (stricmp(Weapon_info[shipp->weapons.primary_bank_weapons[shipp->weapons.current_primary_bank]].name, scp->data.name) == 0 || (stricmp(Weapon_info[shipp->weapons.secondary_bank_weapons[shipp->weapons.current_secondary_bank]].name, scp->data.name) == 0)))
return false;
}
}
} // case CHC_WEAPONCLASS
break;