TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 15:14:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'gg/development-3.6' into development

Browse source 
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
This commit is contained in:
Daniel Buckmaster 2015-01-29 21:17:38 +11:00
commit 014b566014
29 changed files with 252 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Templates/Full/game/scripts/server/aiPlayer.cs
View file

@ -212,7 +212,10 @@ function AIPlayer::singleShot(%this)
// The shooting delay is used to pulse the trigger
%this.setImageTrigger(0, true);
%this.setImageTrigger(0, false);
%this.trigger = %this.schedule(%this.shootingDelay, singleShot);
%delay = %this.getDataBlock().shootingDelay;
if (%delay $= "")
%delay = 1000;
%this.trigger = %this.schedule(%delay, singleShot);
}
//-----------------------------------------------------------------------------