sync to trunk 10223

git-svn-id: svn://svn.icculus.org/fs2open/branches/antipodes@10228 387891d4-d844-0410-90c0-e4c51a9137d3
This commit is contained in:
The_E authored and niffiwan committed 2014-03-06 19:24:13 +10:00
1 parent 31db49d6fd
commit 09d039fd42
89 files changed
+2295 -4929

No files matched your search

+2 -1
View File
@@ -74,7 +74,8 @@ flag_def_list Script_actions[] =
{"On Gameplay Start", CHA_GAMEPLAYSTART, 0},
{"On Turret Fired", CHA_ONTURRETFIRED, 0},
{"On Primary Fire", CHA_PRIMARYFIRE, 0},
{"On Secondary Fire", CHA_SECONDARYFIRE, 0}
{"On Secondary Fire", CHA_SECONDARYFIRE, 0},
{"On Ship Arrive", CHA_ONSHIPARRIVE, 0}
};
int Num_script_actions = sizeof(Script_actions)/sizeof(flag_def_list);