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 - r6655

Browse Source
This commit is contained in:
chief1983 committed 2010-10-21 18:16:58 +00:00
1 parent 8bd65baa06
commit 089fd2fafe
2 files changed
+6 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/scripting.cpp
+4 -4
View File
@@ -298,9 +298,9 @@ bool ConditionedHook::ConditionsValid(int action, object *objp)
break;
case CHA_ONWPEQUIPPED: {
bool equipped = false;
for(int i = 0; i < 3; i++) {
for(int j = 0; j < 3; j++) {
if (!equipped) {
if ( !stricmp(Weapon_info[shipp->weapons.primary_bank_weapons[i]].name, scp->data.name) )
if ( !stricmp(Weapon_info[shipp->weapons.primary_bank_weapons[j]].name, scp->data.name) )
equipped = false;
else {
equipped = true;
@@ -310,9 +310,9 @@ bool ConditionedHook::ConditionsValid(int action, object *objp)
}
if (!equipped) {
for(int i = 0; i < 4; i++) {
for(int j = 0; j < 4; j++) {
if (!equipped) {
if ( !stricmp(Weapon_info[shipp->weapons.primary_bank_weapons[i]].name, scp->data.name) )
if ( !stricmp(Weapon_info[shipp->weapons.secondary_bank_weapons[j]].name, scp->data.name) )
equipped = false;
else {
equipped = true;