walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Tell fighters not to separate from EF_NON_SOLID objects.

This commit is contained in:
Steve 2016-04-20 09:38:54 +01:00
parent a3be44a000
commit d4b791ed17
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle/fighters.c
View File

@ -348,7 +348,7 @@ static void separate(void)
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i]) for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
{ {
if (e->flags & EF_TAKES_DAMAGE) if ((e->flags & EF_TAKES_DAMAGE) && (!(e->flags & EF_NON_SOLID)))
{ {
distance = getDistance(e->x, e->y, self->x, self->y); distance = getDistance(e->x, e->y, self->x, self->y);

2
src/battle/jumpgate.c
View File

@ -47,7 +47,7 @@ Entity *spawnJumpgate(int side, long flags)
jumpgate->action = think; jumpgate->action = think;
jumpgate->draw = draw; jumpgate->draw = draw;
jumpgate->side = side; jumpgate->side = side;
jumpgate->flags = EF_NO_MT_BOX+EF_IMMORTAL+EF_AI_IGNORE; jumpgate->flags = EF_NO_MT_BOX+EF_IMMORTAL+EF_AI_IGNORE+EF_NON_SOLID;
if (flags != -1 && flags & EF_DISABLED) if (flags != -1 && flags & EF_DISABLED)
{ {
jumpgate->flags |= EF_DISABLED; jumpgate->flags |= EF_DISABLED;

4
src/battle/mine.c
View File

@ -49,7 +49,7 @@ Entity *spawnMine(int type)
mine->texture = (type == ET_MINE) ? mineNormal : shadowMine; mine->texture = (type == ET_MINE) ? mineNormal : shadowMine;
mine->action = think; mine->action = think;
mine->die = die; mine->die = die;
mine->flags = EF_TAKES_DAMAGE+EF_NO_PLAYER_TARGET+EF_SHORT_RADAR_RANGE; mine->flags = EF_TAKES_DAMAGE+EF_NO_PLAYER_TARGET+EF_SHORT_RADAR_RANGE+EF_NON_SOLID;
if (type == ET_SHADOW_MINE) if (type == ET_SHADOW_MINE)
{ {
@ -213,7 +213,7 @@ static void doSplashDamage(void)
percent /= DAMAGE_RANGE; percent /= DAMAGE_RANGE;
percent = 1 - percent; percent = 1 - percent;
damage = 100; damage = 255;
damage *= percent; damage *= percent;
if (e->type == ET_FIGHTER) if (e->type == ET_FIGHTER)

1
src/defs.h
View File

@ -103,6 +103,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define EF_SHORT_RADAR_RANGE (2 << 17) #define EF_SHORT_RADAR_RANGE (2 << 17)
#define EF_NO_PLAYER_TARGET (2 << 18) #define EF_NO_PLAYER_TARGET (2 << 18)
#define EF_AI_IGNORE (2 << 19) #define EF_AI_IGNORE (2 << 19)
#define EF_NON_SOLID (2 << 20)
#define AIF_NONE 0 #define AIF_NONE 0
#define AIF_FOLLOWS_PLAYER (2 << 0) #define AIF_FOLLOWS_PLAYER (2 << 0)