mirror of https://github.com/yquake2/rogue.git
Eine Makefile für rogue
This commit is contained in:
Yamagi Burmeister
parent
ae4db9289f
commit
00467e1c25
|
|
@ -0,0 +1,342 @@
|
|||
# ------------------------------------------------------ #
|
||||
# Makefile for the "Ground Zero Missionpack" #
|
||||
# #
|
||||
# Platforms: #
|
||||
# - Linux #
|
||||
# - FreeBSD #
|
||||
# - Maybe any other POSIX compliant system #
|
||||
# supported by SDL 1.2 #
|
||||
# ------------------------------------------------------ #
|
||||
|
||||
# Check the OS type
|
||||
OSTYPE := $(shell uname -s)
|
||||
|
||||
ifneq ($(OSTYPE),Linux)
|
||||
ifneq ($(OSTYPE),FreeBSD)
|
||||
#$(error $(OSTYPE) is currently not supported by this Client.)
|
||||
endif
|
||||
endif
|
||||
|
||||
# ----------
|
||||
|
||||
ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/amd64/x86_64/)
|
||||
|
||||
ifneq ($(ARCH),i386)
|
||||
ifneq ($(ARCH),x86_64)
|
||||
$(error arch $(ARCH) is currently not supported)
|
||||
endif
|
||||
endif
|
||||
|
||||
# ----------
|
||||
|
||||
# The compiler and compiler flags
|
||||
|
||||
CC = gcc
|
||||
|
||||
ifeq ($(ARCH),i386)
|
||||
CFLAGS = -O2 -ffast-math -funroll-loops -falign-loops=2 \
|
||||
-falign-jumps=2 -falign-functions=2 -fno-strict-aliasing \
|
||||
-Wall -pipe -fPIC -g
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),x86_64)
|
||||
CFLAGS = -O2 -ffast-math -funroll-loops -fomit-frame-pointer \
|
||||
-fexpensive-optimizations -fno-strict-aliasing \
|
||||
-Wall -pipe -fPIC -g
|
||||
endif
|
||||
|
||||
# Optimizations
|
||||
# ~25% - 30% perfomance gain, but may not
|
||||
# work on all CPUs. Adjust to your needs
|
||||
# CFLAFS_BASE += -mmmx -msse -msse2 -msse3 -m3dnow
|
||||
|
||||
# ----------
|
||||
|
||||
# The linker and linkerflags
|
||||
|
||||
# Linux
|
||||
ifeq ($(OSTYPE),Linux)
|
||||
LDFLAGS=-lm -ldl -shared
|
||||
endif
|
||||
|
||||
# FreeBSD
|
||||
ifeq ($(OSTYPE),FreeBSD)
|
||||
LDFLAGS=-lm -shared
|
||||
endif
|
||||
|
||||
# ----------
|
||||
|
||||
# Targets
|
||||
|
||||
all: rogue
|
||||
|
||||
rogue:
|
||||
@-mkdir -p build \
|
||||
release
|
||||
$(MAKE) release/game.so
|
||||
|
||||
clean:
|
||||
@-rm -Rf build release
|
||||
|
||||
# ----------
|
||||
|
||||
# Quake II - Ground Zero Object
|
||||
ROGUE_OBJS = \
|
||||
build/dm_ball.o \
|
||||
build/dm_tag.o \
|
||||
build/g_ai.o \
|
||||
build/g_chase.o \
|
||||
build/g_cmds.o \
|
||||
build/g_combat.o \
|
||||
build/g_func.o \
|
||||
build/g_items.o \
|
||||
build/g_main.o \
|
||||
build/g_misc.o \
|
||||
build/g_monster.o \
|
||||
build/g_newai.o \
|
||||
build/g_newdm.o \
|
||||
build/g_newfnc.o \
|
||||
build/g_newtarg.o \
|
||||
build/g_newtrig.o \
|
||||
build/g_newweap.o \
|
||||
build/g_phys.o \
|
||||
build/g_save.o \
|
||||
build/g_spawn.o \
|
||||
build/g_sphere.o \
|
||||
build/g_svcmds.o \
|
||||
build/g_target.o \
|
||||
build/g_trigger.o \
|
||||
build/g_turret.o \
|
||||
build/g_utils.o \
|
||||
build/g_weapon.o \
|
||||
build/m_actor.o \
|
||||
build/m_berserk.o \
|
||||
build/m_boss2.o \
|
||||
build/m_boss3.o \
|
||||
build/m_boss31.o \
|
||||
build/m_boss32.o \
|
||||
build/m_brain.o \
|
||||
build/m_carrier.o \
|
||||
build/m_chick.o \
|
||||
build/m_flash.o \
|
||||
build/m_flipper.o \
|
||||
build/m_float.o \
|
||||
build/m_flyer.o \
|
||||
build/m_gladiator.o \
|
||||
build/m_gunner.o \
|
||||
build/m_hover.o \
|
||||
build/m_infantry.o \
|
||||
build/m_insane.o \
|
||||
build/m_medic.o \
|
||||
build/m_move.o \
|
||||
build/m_mutant.o \
|
||||
build/m_parasite.o \
|
||||
build/m_soldier.o \
|
||||
build/m_stalker.o \
|
||||
build/m_supertank.o \
|
||||
build/m_tank.o \
|
||||
build/m_turret.o \
|
||||
build/m_widow.o \
|
||||
build/m_widow2.o \
|
||||
build/p_client.o \
|
||||
build/p_hud.o \
|
||||
build/p_trail.o \
|
||||
build/p_view.o \
|
||||
build/p_weapon.o \
|
||||
build/q_shared.o
|
||||
|
||||
# ----------
|
||||
|
||||
# Rogue build
|
||||
build/dm_ball.o: src/dm_ball.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/dm_tag.o: src/dm_tag.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_ai.o: src/g_ai.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_chase.o: src/g_chase.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_cmds.o: src/g_cmds.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_combat.o: src/g_combat.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_func.o: src/g_func.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_items.o: src/g_items.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_main.o: src/g_main.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_misc.o: src/g_misc.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_monster.o: src/g_monster.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_newai.o: src/g_newai.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_newdm.o: src/g_newdm.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_newfnc.o: src/g_newfnc.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_newtarg.o: src/g_newtarg.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_newtrig.o: src/g_newtrig.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_newweap.o: src/g_newweap.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_phys.o: src/g_phys.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_save.o: src/g_save.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_sphere.o: src/g_sphere.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_spawn.o: src/g_spawn.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_svcmds.o: src/g_svcmds.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_target.o: src/g_target.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_trigger.o: src/g_trigger.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_turret.o: src/g_turret.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_utils.o: src/g_utils.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/g_weapon.o: src/g_weapon.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_actor.o: src/m_actor.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_berserk.o: src/m_berserk.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_boss2.o: src/m_boss2.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_boss3.o: src/m_boss3.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_boss31.o: src/m_boss31.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_boss32.o: src/m_boss32.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_brain.o: src/m_brain.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_carrier.o: src/m_carrier.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_chick.o: src/m_chick.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_flash.o: src/m_flash.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_flipper.o: src/m_flipper.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_float.o: src/m_float.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_flyer.o: src/m_flyer.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_gladiator.o: src/m_gladiator.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_gunner.o: src/m_gunner.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_hover.o: src/m_hover.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_infantry.o: src/m_infantry.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_insane.o: src/m_insane.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_medic.o: src/m_medic.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_move.o: src/m_move.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_mutant.o: src/m_mutant.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_parasite.o: src/m_parasite.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_soldier.o: src/m_soldier.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_stalker.o: src/m_stalker.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_supertank.o: src/m_supertank.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_tank.o: src/m_tank.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_turret.o: src/m_turret.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_widow.o: src/m_widow.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/m_widow2.o: src/m_widow2.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/p_client.o: src/p_client.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/p_hud.o: src/p_hud.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/p_trail.o: src/p_trail.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/p_view.o: src/p_view.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/p_weapon.o: src/p_weapon.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
build/q_shared.o: src/q_shared.c
|
||||
$(CC) $(CFLAGS) -o $@ -c $<
|
||||
|
||||
# ----------
|
||||
|
||||
# Quake II - Ground Zero
|
||||
release/game.so : $(ROGUE_OBJS)
|
||||
$(CC) $(CFLAGS) -o $@ $(ROGUE_OBJS) $(LDFLAGS)
|
||||
|
||||
735
src/m_move2.c
735
src/m_move2.c
|
|
@ -1,735 +0,0 @@
|
|||
// m_move.c -- monster movement
|
||||
|
||||
#include "g_local.h"
|
||||
|
||||
#define STEPSIZE 18
|
||||
|
||||
// this is used for communications out of sv_movestep to say what entity
|
||||
// is blocking us
|
||||
edict_t *new_bad; //pmm
|
||||
|
||||
/*
|
||||
=============
|
||||
M_CheckBottom
|
||||
|
||||
Returns false if any part of the bottom of the entity is off an edge that
|
||||
is not a staircase.
|
||||
|
||||
=============
|
||||
*/
|
||||
int c_yes, c_no;
|
||||
|
||||
qboolean M_CheckBottom (edict_t *ent)
|
||||
{
|
||||
vec3_t mins, maxs, start, stop;
|
||||
trace_t trace;
|
||||
int x, y;
|
||||
float mid, bottom;
|
||||
|
||||
VectorAdd (ent->s.origin, ent->mins, mins);
|
||||
VectorAdd (ent->s.origin, ent->maxs, maxs);
|
||||
|
||||
// if all of the points under the corners are solid world, don't bother
|
||||
// with the tougher checks
|
||||
// the corners must be within 16 of the midpoint
|
||||
|
||||
//PGM
|
||||
#ifdef ROGUE_GRAVITY
|
||||
// FIXME - this will only handle 0,0,1 and 0,0,-1 gravity vectors
|
||||
start[2] = mins[2] - 1;
|
||||
if(ent->gravityVector[2] > 0)
|
||||
start[2] = maxs[2] + 1;
|
||||
#else
|
||||
start[2] = mins[2] - 1;
|
||||
#endif
|
||||
//PGM
|
||||
|
||||
for (x=0 ; x<=1 ; x++)
|
||||
for (y=0 ; y<=1 ; y++)
|
||||
{
|
||||
start[0] = x ? maxs[0] : mins[0];
|
||||
start[1] = y ? maxs[1] : mins[1];
|
||||
if (gi.pointcontents (start) != CONTENTS_SOLID)
|
||||
goto realcheck;
|
||||
}
|
||||
|
||||
c_yes++;
|
||||
return true; // we got out easy
|
||||
|
||||
realcheck:
|
||||
c_no++;
|
||||
//
|
||||
// check it for real...
|
||||
//
|
||||
start[2] = mins[2];
|
||||
|
||||
// the midpoint must be within 16 of the bottom
|
||||
start[0] = stop[0] = (mins[0] + maxs[0])*0.5;
|
||||
start[1] = stop[1] = (mins[1] + maxs[1])*0.5;
|
||||
|
||||
//PGM
|
||||
#ifdef ROGUE_GRAVITY
|
||||
if(ent->gravityVector[2] < 0)
|
||||
{
|
||||
start[2] = mins[2];
|
||||
stop[2] = start[2] - STEPSIZE - STEPSIZE;
|
||||
}
|
||||
else
|
||||
{
|
||||
start[2] = maxs[2];
|
||||
stop[2] = start[2] + STEPSIZE + STEPSIZE;
|
||||
}
|
||||
#else
|
||||
stop[2] = start[2] - 2*STEPSIZE;
|
||||
#endif
|
||||
//PGM
|
||||
|
||||
trace = gi.trace (start, vec3_origin, vec3_origin, stop, ent, MASK_MONSTERSOLID);
|
||||
|
||||
if (trace.fraction == 1.0)
|
||||
return false;
|
||||
mid = bottom = trace.endpos[2];
|
||||
|
||||
// the corners must be within 16 of the midpoint
|
||||
for (x=0 ; x<=1 ; x++)
|
||||
for (y=0 ; y<=1 ; y++)
|
||||
{
|
||||
start[0] = stop[0] = x ? maxs[0] : mins[0];
|
||||
start[1] = stop[1] = y ? maxs[1] : mins[1];
|
||||
|
||||
trace = gi.trace (start, vec3_origin, vec3_origin, stop, ent, MASK_MONSTERSOLID);
|
||||
|
||||
//PGM
|
||||
#ifdef ROGUE_GRAVITY
|
||||
// FIXME - this will only handle 0,0,1 and 0,0,-1 gravity vectors
|
||||
if(ent->gravityVector[2] > 0)
|
||||
{
|
||||
if (trace.fraction != 1.0 && trace.endpos[2] < bottom)
|
||||
bottom = trace.endpos[2];
|
||||
if (trace.fraction == 1.0 || trace.endpos[2] - mid > STEPSIZE)
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (trace.fraction != 1.0 && trace.endpos[2] > bottom)
|
||||
bottom = trace.endpos[2];
|
||||
if (trace.fraction == 1.0 || mid - trace.endpos[2] > STEPSIZE)
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
if (trace.fraction != 1.0 && trace.endpos[2] > bottom)
|
||||
bottom = trace.endpos[2];
|
||||
if (trace.fraction == 1.0 || mid - trace.endpos[2] > STEPSIZE)
|
||||
return false;
|
||||
#endif
|
||||
//PGM
|
||||
}
|
||||
|
||||
c_yes++;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
=============
|
||||
SV_movestep
|
||||
|
||||
Called by monster program code.
|
||||
The move will be adjusted for slopes and stairs, but if the move isn't
|
||||
possible, no move is done, false is returned, and
|
||||
pr_global_struct->trace_normal is set to the normal of the blocking wall
|
||||
=============
|
||||
*/
|
||||
//FIXME since we need to test end position contents here, can we avoid doing
|
||||
//it again later in catagorize position?
|
||||
qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink)
|
||||
{
|
||||
float dz;
|
||||
vec3_t oldorg, neworg, end;
|
||||
trace_t trace;
|
||||
int i;
|
||||
float stepsize;
|
||||
vec3_t test;
|
||||
int contents;
|
||||
edict_t *current_bad; // PGM
|
||||
float minheight; // pmm
|
||||
|
||||
//======
|
||||
//PGM
|
||||
current_bad = CheckForBadArea(ent);
|
||||
if(current_bad)
|
||||
{
|
||||
// gi.dprintf("in bad area\n");
|
||||
ent->bad_area = current_bad;
|
||||
|
||||
if(ent->enemy && !strcmp(ent->enemy->classname, "tesla"))
|
||||
{
|
||||
// gi.dprintf("%s -->> ", vtos(move));
|
||||
VectorScale(move, -1, move);
|
||||
// gi.dprintf("%s\n", vtos(move));
|
||||
}
|
||||
}
|
||||
else if(ent->bad_area)
|
||||
{
|
||||
// if we're no longer in a bad area, get back to business.
|
||||
ent->bad_area = NULL;
|
||||
if(ent->oldenemy)// && ent->bad_area->owner == ent->enemy)
|
||||
{
|
||||
// gi.dprintf("resuming being pissed at %s\n", ent->oldenemy->classname);
|
||||
ent->enemy = ent->oldenemy;
|
||||
ent->goalentity = ent->oldenemy;
|
||||
FoundTarget(ent);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
//PGM
|
||||
//======
|
||||
|
||||
// try the move
|
||||
VectorCopy (ent->s.origin, oldorg);
|
||||
VectorAdd (ent->s.origin, move, neworg);
|
||||
|
||||
// flying monsters don't step up
|
||||
if ( ent->flags & (FL_SWIM | FL_FLY) )
|
||||
{
|
||||
// try one move with vertical motion, then one without
|
||||
for (i=0 ; i<2 ; i++)
|
||||
{
|
||||
VectorAdd (ent->s.origin, move, neworg);
|
||||
if (i == 0 && ent->enemy)
|
||||
{
|
||||
if (!ent->goalentity)
|
||||
ent->goalentity = ent->enemy;
|
||||
dz = ent->s.origin[2] - ent->goalentity->s.origin[2];
|
||||
if (ent->goalentity->client)
|
||||
{
|
||||
// we want the carrier to stay a certain distance off the ground, to help prevent him
|
||||
// from shooting his fliers, who spawn in below him
|
||||
//
|
||||
if (!strcmp(ent->classname, "monster_carrier"))
|
||||
minheight = 104;
|
||||
else
|
||||
minheight = 40;
|
||||
// if (dz > 40)
|
||||
if (dz > minheight)
|
||||
// pmm
|
||||
neworg[2] -= 8;
|
||||
if (!((ent->flags & FL_SWIM) && (ent->waterlevel < 2)))
|
||||
if (dz < (minheight - 10))
|
||||
neworg[2] += 8;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (dz > 8)
|
||||
neworg[2] -= 8;
|
||||
else if (dz > 0)
|
||||
neworg[2] -= dz;
|
||||
else if (dz < -8)
|
||||
neworg[2] += 8;
|
||||
else
|
||||
neworg[2] += dz;
|
||||
}
|
||||
}
|
||||
|
||||
trace = gi.trace (ent->s.origin, ent->mins, ent->maxs, neworg, ent, MASK_MONSTERSOLID);
|
||||
|
||||
// fly monsters don't enter water voluntarily
|
||||
if (ent->flags & FL_FLY)
|
||||
{
|
||||
if (!ent->waterlevel)
|
||||
{
|
||||
test[0] = trace.endpos[0];
|
||||
test[1] = trace.endpos[1];
|
||||
test[2] = trace.endpos[2] + ent->mins[2] + 1;
|
||||
contents = gi.pointcontents(test);
|
||||
if (contents & MASK_WATER)
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// swim monsters don't exit water voluntarily
|
||||
if (ent->flags & FL_SWIM)
|
||||
{
|
||||
if (ent->waterlevel < 2)
|
||||
{
|
||||
test[0] = trace.endpos[0];
|
||||
test[1] = trace.endpos[1];
|
||||
test[2] = trace.endpos[2] + ent->mins[2] + 1;
|
||||
contents = gi.pointcontents(test);
|
||||
if (!(contents & MASK_WATER))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// if (trace.fraction == 1)
|
||||
|
||||
// PMM - changed above to this
|
||||
if ((trace.fraction == 1) && (!trace.allsolid) && (!trace.startsolid))
|
||||
{
|
||||
VectorCopy (trace.endpos, ent->s.origin);
|
||||
//=====
|
||||
//PGM
|
||||
if(!current_bad && CheckForBadArea(ent))
|
||||
{
|
||||
// gi.dprintf("Oooh! Bad Area!\n");
|
||||
VectorCopy (oldorg, ent->s.origin);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (relink)
|
||||
{
|
||||
gi.linkentity (ent);
|
||||
G_TouchTriggers (ent);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
//PGM
|
||||
//=====
|
||||
}
|
||||
|
||||
if (!ent->enemy)
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// push down from a step height above the wished position
|
||||
if (!(ent->monsterinfo.aiflags & AI_NOSTEP))
|
||||
stepsize = STEPSIZE;
|
||||
else
|
||||
stepsize = 1;
|
||||
|
||||
//PGM
|
||||
#ifdef ROGUE_GRAVITY
|
||||
// trace from 1 stepsize gravityUp to 2 stepsize gravityDown.
|
||||
VectorMA(neworg, -1 * stepsize, ent->gravityVector, neworg);
|
||||
VectorMA(neworg, 2 * stepsize, ent->gravityVector, end);
|
||||
#else
|
||||
neworg[2] += stepsize;
|
||||
VectorCopy (neworg, end);
|
||||
end[2] -= stepsize*2;
|
||||
#endif
|
||||
//PGM
|
||||
|
||||
trace = gi.trace (neworg, ent->mins, ent->maxs, end, ent, MASK_MONSTERSOLID);
|
||||
|
||||
if (trace.allsolid)
|
||||
return false;
|
||||
|
||||
if (trace.startsolid)
|
||||
{
|
||||
neworg[2] -= stepsize;
|
||||
trace = gi.trace (neworg, ent->mins, ent->maxs, end, ent, MASK_MONSTERSOLID);
|
||||
if (trace.allsolid || trace.startsolid)
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// don't go in to water
|
||||
if (ent->waterlevel == 0)
|
||||
{
|
||||
//PGM
|
||||
#ifdef ROGUE_GRAVITY
|
||||
test[0] = trace.endpos[0];
|
||||
test[1] = trace.endpos[1];
|
||||
if(ent->gravityVector[2] > 0)
|
||||
test[2] = trace.endpos[2] + ent->maxs[2] - 1;
|
||||
else
|
||||
test[2] = trace.endpos[2] + ent->mins[2] + 1;
|
||||
#else
|
||||
test[0] = trace.endpos[0];
|
||||
test[1] = trace.endpos[1];
|
||||
test[2] = trace.endpos[2] + ent->mins[2] + 1;
|
||||
#endif
|
||||
//PGM
|
||||
|
||||
contents = gi.pointcontents(test);
|
||||
|
||||
if (contents & MASK_WATER)
|
||||
return false;
|
||||
}
|
||||
|
||||
if (trace.fraction == 1)
|
||||
{
|
||||
// if monster had the ground pulled out, go ahead and fall
|
||||
if ( ent->flags & FL_PARTIALGROUND )
|
||||
{
|
||||
VectorAdd (ent->s.origin, move, ent->s.origin);
|
||||
if (relink)
|
||||
{
|
||||
gi.linkentity (ent);
|
||||
G_TouchTriggers (ent);
|
||||
}
|
||||
ent->groundentity = NULL;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false; // walked off an edge
|
||||
}
|
||||
|
||||
// check point traces down for dangling corners
|
||||
VectorCopy (trace.endpos, ent->s.origin);
|
||||
|
||||
//PGM
|
||||
new_bad = CheckForBadArea(ent);
|
||||
if(!current_bad && new_bad)
|
||||
{
|
||||
if (new_bad->owner)
|
||||
{
|
||||
if ((g_showlogic) && (g_showlogic->value))
|
||||
gi.dprintf("Blocked -");
|
||||
if (!strcmp(new_bad->owner->classname, "tesla"))
|
||||
{
|
||||
if ((g_showlogic) && (g_showlogic->value))
|
||||
gi.dprintf ("it's a tesla -");
|
||||
if ((!(ent->enemy)) || (!(ent->enemy->inuse)))
|
||||
{
|
||||
if ((g_showlogic) && (g_showlogic->value))
|
||||
gi.dprintf ("I don't have a valid enemy!\n");
|
||||
}
|
||||
else if (!strcmp(ent->enemy->classname, "telsa"))
|
||||
{
|
||||
if ((g_showlogic) && (g_showlogic->value))
|
||||
gi.dprintf ("but we're already mad at a tesla\n");
|
||||
}
|
||||
else if ((ent->enemy) && (ent->enemy->client))
|
||||
{
|
||||
if ((g_showlogic) && (g_showlogic->value))
|
||||
gi.dprintf ("we have a player enemy -");
|
||||
if (visible(ent, ent->enemy))
|
||||
{
|
||||
if ((g_showlogic) && (g_showlogic->value))
|
||||
gi.dprintf ("we can see him -");
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((g_showlogic) && (g_showlogic->value))
|
||||
gi.dprintf ("can't see him, kill the tesla! -");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((g_showlogic) && (g_showlogic->value))
|
||||
gi.dprintf ("the enemy isn't a player -");
|
||||
}
|
||||
}
|
||||
}
|
||||
gi.dprintf ("\n");
|
||||
|
||||
|
||||
VectorCopy (oldorg, ent->s.origin);
|
||||
return false;
|
||||
}
|
||||
//PGM
|
||||
|
||||
if (!M_CheckBottom (ent))
|
||||
{
|
||||
if ( ent->flags & FL_PARTIALGROUND )
|
||||
{ // entity had floor mostly pulled out from underneath it
|
||||
// and is trying to correct
|
||||
if (relink)
|
||||
{
|
||||
gi.linkentity (ent);
|
||||
G_TouchTriggers (ent);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
VectorCopy (oldorg, ent->s.origin);
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( ent->flags & FL_PARTIALGROUND )
|
||||
{
|
||||
ent->flags &= ~FL_PARTIALGROUND;
|
||||
}
|
||||
ent->groundentity = trace.ent;
|
||||
ent->groundentity_linkcount = trace.ent->linkcount;
|
||||
|
||||
// the move is ok
|
||||
if (relink)
|
||||
{
|
||||
gi.linkentity (ent);
|
||||
G_TouchTriggers (ent);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
//============================================================================
|
||||
|
||||
/*
|
||||
===============
|
||||
M_ChangeYaw
|
||||
|
||||
===============
|
||||
*/
|
||||
void M_ChangeYaw (edict_t *ent)
|
||||
{
|
||||
float ideal;
|
||||
float current;
|
||||
float move;
|
||||
float speed;
|
||||
|
||||
current = anglemod(ent->s.angles[YAW]);
|
||||
ideal = ent->ideal_yaw;
|
||||
|
||||
if (current == ideal)
|
||||
return;
|
||||
|
||||
move = ideal - current;
|
||||
speed = ent->yaw_speed;
|
||||
if (ideal > current)
|
||||
{
|
||||
if (move >= 180)
|
||||
move = move - 360;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (move <= -180)
|
||||
move = move + 360;
|
||||
}
|
||||
if (move > 0)
|
||||
{
|
||||
if (move > speed)
|
||||
move = speed;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (move < -speed)
|
||||
move = -speed;
|
||||
}
|
||||
|
||||
ent->s.angles[YAW] = anglemod (current + move);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
======================
|
||||
SV_StepDirection
|
||||
|
||||
Turns to the movement direction, and walks the current distance if
|
||||
facing it.
|
||||
|
||||
======================
|
||||
*/
|
||||
qboolean SV_StepDirection (edict_t *ent, float yaw, float dist)
|
||||
{
|
||||
vec3_t move, oldorigin;
|
||||
float delta;
|
||||
|
||||
if(!ent->inuse) return true; // PGM g_touchtrigger free problem
|
||||
|
||||
ent->ideal_yaw = yaw;
|
||||
M_ChangeYaw (ent);
|
||||
|
||||
yaw = yaw*M_PI*2 / 360;
|
||||
move[0] = cos(yaw)*dist;
|
||||
move[1] = sin(yaw)*dist;
|
||||
move[2] = 0;
|
||||
|
||||
VectorCopy (ent->s.origin, oldorigin);
|
||||
if (SV_movestep (ent, move, false))
|
||||
{
|
||||
if(!ent->inuse) return true; // PGM g_touchtrigger free problem
|
||||
|
||||
delta = ent->s.angles[YAW] - ent->ideal_yaw;
|
||||
if (strncmp(ent->classname, "monster_widow", 13))
|
||||
{
|
||||
if (delta > 45 && delta < 315)
|
||||
{ // not turned far enough, so don't take the step
|
||||
VectorCopy (oldorigin, ent->s.origin);
|
||||
}
|
||||
}
|
||||
gi.linkentity (ent);
|
||||
G_TouchTriggers (ent);
|
||||
return true;
|
||||
}
|
||||
gi.linkentity (ent);
|
||||
G_TouchTriggers (ent);
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
======================
|
||||
SV_FixCheckBottom
|
||||
|
||||
======================
|
||||
*/
|
||||
void SV_FixCheckBottom (edict_t *ent)
|
||||
{
|
||||
ent->flags |= FL_PARTIALGROUND;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
================
|
||||
SV_NewChaseDir
|
||||
|
||||
================
|
||||
*/
|
||||
#define DI_NODIR -1
|
||||
void SV_NewChaseDir (edict_t *actor, edict_t *enemy, float dist)
|
||||
{
|
||||
float deltax,deltay;
|
||||
float d[3];
|
||||
float tdir, olddir, turnaround;
|
||||
|
||||
//FIXME: how did we get here with no enemy
|
||||
if (!enemy)
|
||||
return;
|
||||
|
||||
olddir = anglemod( (int)(actor->ideal_yaw/45)*45 );
|
||||
turnaround = anglemod(olddir - 180);
|
||||
|
||||
deltax = enemy->s.origin[0] - actor->s.origin[0];
|
||||
deltay = enemy->s.origin[1] - actor->s.origin[1];
|
||||
if (deltax>10)
|
||||
d[1]= 0;
|
||||
else if (deltax<-10)
|
||||
d[1]= 180;
|
||||
else
|
||||
d[1]= DI_NODIR;
|
||||
if (deltay<-10)
|
||||
d[2]= 270;
|
||||
else if (deltay>10)
|
||||
d[2]= 90;
|
||||
else
|
||||
d[2]= DI_NODIR;
|
||||
|
||||
// try direct route
|
||||
if (d[1] != DI_NODIR && d[2] != DI_NODIR)
|
||||
{
|
||||
if (d[1] == 0)
|
||||
tdir = d[2] == 90 ? 45 : 315;
|
||||
else
|
||||
tdir = d[2] == 90 ? 135 : 215;
|
||||
|
||||
if (tdir != turnaround && SV_StepDirection(actor, tdir, dist))
|
||||
return;
|
||||
}
|
||||
|
||||
// try other directions
|
||||
if ( ((rand()&3) & 1) || abs(deltay)>abs(deltax))
|
||||
{
|
||||
tdir=d[1];
|
||||
d[1]=d[2];
|
||||
d[2]=tdir;
|
||||
}
|
||||
|
||||
if (d[1]!=DI_NODIR && d[1]!=turnaround
|
||||
&& SV_StepDirection(actor, d[1], dist))
|
||||
return;
|
||||
|
||||
if (d[2]!=DI_NODIR && d[2]!=turnaround
|
||||
&& SV_StepDirection(actor, d[2], dist))
|
||||
return;
|
||||
|
||||
//ROGUE
|
||||
if(actor->monsterinfo.blocked)
|
||||
{
|
||||
if((actor->monsterinfo.blocked)(actor, dist))
|
||||
return;
|
||||
}
|
||||
//ROGUE
|
||||
|
||||
/* there is no direct path to the player, so pick another direction */
|
||||
|
||||
if (olddir!=DI_NODIR && SV_StepDirection(actor, olddir, dist))
|
||||
return;
|
||||
|
||||
if (rand()&1) /*randomly determine direction of search*/
|
||||
{
|
||||
for (tdir=0 ; tdir<=315 ; tdir += 45)
|
||||
if (tdir!=turnaround && SV_StepDirection(actor, tdir, dist) )
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (tdir=315 ; tdir >=0 ; tdir -= 45)
|
||||
if (tdir!=turnaround && SV_StepDirection(actor, tdir, dist) )
|
||||
return;
|
||||
}
|
||||
|
||||
if (turnaround != DI_NODIR && SV_StepDirection(actor, turnaround, dist) )
|
||||
return;
|
||||
|
||||
actor->ideal_yaw = olddir; // can't move
|
||||
|
||||
// if a bridge was pulled out from underneath a monster, it may not have
|
||||
// a valid standing position at all
|
||||
|
||||
if (!M_CheckBottom (actor))
|
||||
SV_FixCheckBottom (actor);
|
||||
}
|
||||
|
||||
/*
|
||||
======================
|
||||
SV_CloseEnough
|
||||
|
||||
======================
|
||||
*/
|
||||
qboolean SV_CloseEnough (edict_t *ent, edict_t *goal, float dist)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i=0 ; i<3 ; i++)
|
||||
{
|
||||
if (goal->absmin[i] > ent->absmax[i] + dist)
|
||||
return false;
|
||||
if (goal->absmax[i] < ent->absmin[i] - dist)
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
======================
|
||||
M_MoveToGoal
|
||||
======================
|
||||
*/
|
||||
void M_MoveToGoal (edict_t *ent, float dist)
|
||||
{
|
||||
edict_t *goal;
|
||||
|
||||
goal = ent->goalentity;
|
||||
|
||||
if (!ent->groundentity && !(ent->flags & (FL_FLY|FL_SWIM)))
|
||||
return;
|
||||
|
||||
// if the next step hits the enemy, return immediately
|
||||
if (ent->enemy && SV_CloseEnough (ent, ent->enemy, dist) )
|
||||
return;
|
||||
|
||||
// bump around...
|
||||
// if ( (rand()&3)==1 || !SV_StepDirection (ent, ent->ideal_yaw, dist))
|
||||
// PMM - charging monsters (AI_CHARGING) don't deflect unless they have to
|
||||
if ( (((rand()&3)==1) && !(ent->monsterinfo.aiflags & AI_CHARGING)) || !SV_StepDirection (ent, ent->ideal_yaw, dist))
|
||||
{
|
||||
if (ent->inuse)
|
||||
SV_NewChaseDir (ent, goal, dist);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
===============
|
||||
M_walkmove
|
||||
===============
|
||||
*/
|
||||
qboolean M_walkmove (edict_t *ent, float yaw, float dist)
|
||||
{
|
||||
vec3_t move;
|
||||
|
||||
if (!ent->groundentity && !(ent->flags & (FL_FLY|FL_SWIM)))
|
||||
return false;
|
||||
|
||||
yaw = yaw*M_PI*2 / 360;
|
||||
|
||||
move[0] = cos(yaw)*dist;
|
||||
move[1] = sin(yaw)*dist;
|
||||
move[2] = 0;
|
||||
|
||||
return SV_movestep(ent, move, true);
|
||||
}
|
||||
Loading…
Reference in New Issue