zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Blue-Shadow/zdoom

This commit is contained in:
unknown 2015-01-04 18:07:49 +01:00
parent 86986446a5 ba3988290c
commit d0ec3180c8
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/thingdef/thingdef_codeptr.cpp
View File

@ -2613,7 +2613,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckSight)
// Useful for maps with many multi-actor special effects. // Useful for maps with many multi-actor special effects.
// //
//=========================================================================== //===========================================================================
static bool DoCheckSightOrRange(AActor *self, AActor *camera, double range) static bool DoCheckSightOrRange(AActor *self, AActor *camera, double range, bool twodi)
{ {
if (camera == NULL) if (camera == NULL)
{ {
@ -2636,8 +2636,9 @@ static bool DoCheckSightOrRange(AActor *self, AActor *camera, double range)
{ {
dz = 0; dz = 0;
} }
if ((dx*dx) + (dy*dy) + (dz*dz) <= range) double distance = (dx * dx) + (dy * dy) + (twodi == 0? (dz * dz) : 0);
{ // Within range if (distance <= range){
// Within range
return true; return true;
} }
@ -2651,9 +2652,10 @@ static bool DoCheckSightOrRange(AActor *self, AActor *camera, double range)
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckSightOrRange) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckSightOrRange)
{ {
ACTION_PARAM_START(2); ACTION_PARAM_START(3);
double range = EvalExpressionF(ParameterIndex+0, self); double range = EvalExpressionF(ParameterIndex+0, self);
ACTION_PARAM_STATE(jump, 1); ACTION_PARAM_STATE(jump, 1);
ACTION_PARAM_BOOL(twodi, 2);
ACTION_SET_RESULT(false); // Jumps should never set the result for inventory state chains! ACTION_SET_RESULT(false); // Jumps should never set the result for inventory state chains!
@ -2663,13 +2665,13 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckSightOrRange)
if (playeringame[i]) if (playeringame[i])
{ {
// Always check from each player. // Always check from each player.
if (DoCheckSightOrRange(self, players[i].mo, range)) if (DoCheckSightOrRange(self, players[i].mo, range, twodi))
{ {
return; return;
} }
// If a player is viewing from a non-player, check that too. // If a player is viewing from a non-player, check that too.
if (players[i].camera != NULL && players[i].camera->player == NULL && if (players[i].camera != NULL && players[i].camera->player == NULL &&
DoCheckSightOrRange(self, players[i].camera, range)) DoCheckSightOrRange(self, players[i].camera, range, twodi))
{ {
return; return;
} }
@ -2684,7 +2686,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckSightOrRange)
// Jumps if this actor is out of range of all players. // Jumps if this actor is out of range of all players.
// //
//=========================================================================== //===========================================================================
static bool DoCheckRange(AActor *self, AActor *camera, double range) static bool DoCheckRange(AActor *self, AActor *camera, double range, bool twodi)
{ {
if (camera == NULL) if (camera == NULL)
{ {
@ -2704,7 +2706,8 @@ static bool DoCheckRange(AActor *self, AActor *camera, double range)
else{ else{
dz = 0; dz = 0;
} }
if ((dx*dx) + (dy*dy) + (dz*dz) <= range){ double distance = (dx * dx) + (dy * dy) + (twodi == 0? (dz * dz) : 0);
if (distance <= range){
// Within range // Within range
return true; return true;
} }
@ -2713,9 +2716,10 @@ static bool DoCheckRange(AActor *self, AActor *camera, double range)
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckRange) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckRange)
{ {
ACTION_PARAM_START(2); ACTION_PARAM_START(3);
double range = EvalExpressionF(ParameterIndex+0, self); double range = EvalExpressionF(ParameterIndex+0, self);
ACTION_PARAM_STATE(jump, 1); ACTION_PARAM_STATE(jump, 1);
ACTION_PARAM_BOOL(twodi, 2);
ACTION_SET_RESULT(false); // Jumps should never set the result for inventory state chains! ACTION_SET_RESULT(false); // Jumps should never set the result for inventory state chains!
@ -2725,13 +2729,13 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckRange)
if (playeringame[i]) if (playeringame[i])
{ {
// Always check from each player. // Always check from each player.
if (DoCheckRange(self, players[i].mo, range)) if (DoCheckRange(self, players[i].mo, range, twodi))
{ {
return; return;
} }
// If a player is viewing from a non-player, check that too. // If a player is viewing from a non-player, check that too.
if (players[i].camera != NULL && players[i].camera->player == NULL && if (players[i].camera != NULL && players[i].camera->player == NULL &&
DoCheckRange(self, players[i].camera, range)) DoCheckRange(self, players[i].camera, range, twodi))
{ {
return; return;
} }

4
wadsrc/static/actors/actor.txt
View File

@ -328,8 +328,8 @@ ACTOR Actor native //: Thinker
action native A_SetRipMin(int min); action native A_SetRipMin(int min);
action native A_SetRipMax(int max); action native A_SetRipMax(int max);
action native A_CheckSightOrRange(float distance, state label); action native A_CheckSightOrRange(float distance, state label, bool two_dimension = false);
action native A_CheckRange(float distance, state label); action native A_CheckRange(float distance, state label, bool two_dimension = false);
action native A_RearrangePointers(int newtarget, int newmaster = AAPTR_DEFAULT, int newtracer = AAPTR_DEFAULT, int flags=0); action native A_RearrangePointers(int newtarget, int newmaster = AAPTR_DEFAULT, int newtracer = AAPTR_DEFAULT, int flags=0);
action native A_TransferPointer(int ptr_source, int ptr_recepient, int sourcefield, int recepientfield=AAPTR_DEFAULT, int flags=0); action native A_TransferPointer(int ptr_source, int ptr_recepient, int sourcefield, int recepientfield=AAPTR_DEFAULT, int flags=0);