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

Stylistical coherence..

This commit is contained in:
Teemu Piippo 2015-09-12 14:07:40 +03:00
parent 67a7f48ca3
commit 69fd0e6eb4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/am_map.cpp
View File

@ -2247,7 +2247,7 @@ bool AM_checkSectorActions (sector_t *sector, bool (*function)(int, int *), int
// [TP] Check whether there's a boundary on the provided line for a special that satisfies the provided function. // [TP] Check whether there's a boundary on the provided line for a special that satisfies the provided function.
// It's a boundary if the line can activate the special or the line's bordering sectors can activate it. // It's a boundary if the line can activate the special or the line's bordering sectors can activate it.
// If found, specialptr and argsptr will be filled with special and args if given. // If found, specialptr and argsptr will be filled with special and args if given.
bool AM_checkSpecialBoundary (line_t &line, bool (*function)(int, int*), int *specialptr = NULL, int **argsptr = NULL) bool AM_checkSpecialBoundary (line_t &line, bool (*function)(int, int *), int *specialptr = NULL, int **argsptr = NULL)
{ {
if (specialptr == NULL) if (specialptr == NULL)
{ {
@ -2257,7 +2257,7 @@ bool AM_checkSpecialBoundary (line_t &line, bool (*function)(int, int*), int *sp
if (argsptr == NULL) if (argsptr == NULL)
{ {
static int* sink; static int *sink;
argsptr = &sink; argsptr = &sink;
} }
@ -2279,7 +2279,7 @@ bool AM_checkSpecialBoundary (line_t &line, bool (*function)(int, int*), int *sp
return (line.backsector && AM_checkSectorActions(line.backsector, function, specialptr, argsptr, false)); return (line.backsector && AM_checkSectorActions(line.backsector, function, specialptr, argsptr, false));
} }
bool AM_isTeleportSpecial (int special, int*) bool AM_isTeleportSpecial (int special, int *)
{ {
return (special == Teleport || return (special == Teleport ||
special == Teleport_NoFog || special == Teleport_NoFog ||
@ -2287,12 +2287,12 @@ bool AM_isTeleportSpecial (int special, int*)
special == Teleport_Line); special == Teleport_Line);
} }
bool AM_isTeleportBoundary (line_t& line) bool AM_isTeleportBoundary (line_t &line)
{ {
return AM_checkSpecialBoundary(line, &AM_isTeleportSpecial); return AM_checkSpecialBoundary(line, &AM_isTeleportSpecial);
} }
bool AM_isExitSpecial (int special, int*) bool AM_isExitSpecial (int special, int *)
{ {
return (special == Teleport_NewMap || return (special == Teleport_NewMap ||
special == Teleport_EndGame || special == Teleport_EndGame ||
@ -2305,7 +2305,7 @@ bool AM_isExitBoundary (line_t& line)
return AM_checkSpecialBoundary(line, &AM_isExitSpecial); return AM_checkSpecialBoundary(line, &AM_isExitSpecial);
} }
bool AM_isTriggerSpecial (int special, int*) bool AM_isTriggerSpecial (int special, int *)
{ {
return special != 0 return special != 0
&& special != Door_Open && special != Door_Open
@ -2316,7 +2316,7 @@ bool AM_isTriggerSpecial (int special, int*)
&& special != Generic_Door; && special != Generic_Door;
} }
bool AM_isTriggerBoundary (line_t& line) bool AM_isTriggerBoundary (line_t &line)
{ {
return AM_checkSpecialBoundary(line, &AM_isTriggerSpecial); return AM_checkSpecialBoundary(line, &AM_isTriggerSpecial);
} }