- Update scripting branch to latest version of trunk.

SVN r3767 (scripting)
This commit is contained in:
Randy Heit 2012-07-17 02:53:53 +00:00
commit d85604da19
22 changed files with 99 additions and 105 deletions

View file

@ -145,8 +145,8 @@ DEFINE_ACTION_FUNCTION(AActor, A_FiredChase)
if (self->threshold) self->threshold--;
// Float up and down
self->z += FloatBobOffsets[weaveindex];
self->special1 = (weaveindex+2)&63;
self->z += finesine[weaveindex << BOBTOFINESHIFT] * 8;
self->special1 = (weaveindex + 2) & 63;
// Ensure it stays above certain height
if (self->z < self->floorz + (64*FRACUNIT))