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

Merge branch 'master' into antipodes

Browse Source 
Conflicts:
	code/freespace2/freespace.cpp
	code/graphics/2d.cpp
	code/network/stand_gui-unix.cpp
	projects/MSVC_2012/Fred2.vcxproj
	projects/MSVC_2012/Freespace2.vcxproj
	projects/MSVC_2013/code.vcxproj
	projects/MSVC_2013/code.vcxproj.filters
	projects/MSVC_2015/Fred2.vcxproj
	projects/MSVC_2015/Freespace2.vcxproj
	projects/MSVC_2015/code.vcxproj
This commit is contained in:
asarium committed 2015-07-03 19:15:43 +02:00
2 parents 3180a38ae7 a47ac6c5ee
commit 1d93fdea2e
116 files changed
+2332 -1535
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/scripting.cpp
+9 -1
View File
@@ -83,7 +83,10 @@ 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 Afterburner Engage", CHA_AFTERBURNSTART, 0 },
{ "On Afterburner Stop", CHA_AFTERBURNEND, 0 },
{ "On Beam Fire", CHA_BEAMFIRE, 0 }
};
int Num_script_actions = sizeof(Script_actions)/sizeof(flag_def_list);
@@ -428,6 +431,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