From d4ea6b5dcd28351769bdd1d1f0215d72aef44e06 Mon Sep 17 00:00:00 2001 From: q3rally Date: Sun, 17 Jul 2011 03:25:05 +0000 Subject: [PATCH] Small change. Nothing really important. --- engine/code/game/g_rally_scripted_objects.c | 4 +- q3rallycode.ppr | 92 +++------------------ 2 files changed, 12 insertions(+), 84 deletions(-) diff --git a/engine/code/game/g_rally_scripted_objects.c b/engine/code/game/g_rally_scripted_objects.c index a5283cdb..d92e3dc3 100644 --- a/engine/code/game/g_rally_scripted_objects.c +++ b/engine/code/game/g_rally_scripted_objects.c @@ -372,8 +372,8 @@ qboolean G_ScriptedObject_ApplyCollision( gentity_t *self, vec3_t at, vec3_t nor return qtrue; } +// enabled for testing -/* qboolean G_TraceIntersect( trace_t *tr, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int passEntityNum, int contentmask, vec3_t intersect ) { vec3_t dir; @@ -622,8 +622,8 @@ void G_ScriptedObject_TracePhysics( gentity_t *self, float time ) VectorMA( self->netForce, -dot, tr.plane.normal, self->netForce ); } } -*/ +// End Enabled // Traces a cone at the current position and angles. int G_TraceCone( trace_t *tr, vec3_t origin, vec3_t angles, vec3_t mins, vec3_t maxs, int passEntityNum, int contentmask ) diff --git a/q3rallycode.ppr b/q3rallycode.ppr index f3846ea1..053ffbbe 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -27,7 +27,7 @@ q3rallycode engine\code\asm\qasm.h engine\code\asm\snapvectora.s engine\code\asm\snd_mixa.s - -botlib + +botlib engine\code\botlib\aasfile.h engine\code\botlib\be_aas.h engine\code\botlib\be_aas_bsp.h @@ -483,7 +483,7 @@ q3rallycode engine\code\q3_ui\ui_team.c engine\code\q3_ui\ui_teamorders.c engine\code\q3_ui\ui_video.c - +qcommon + -qcommon engine\code\qcommon\cm_load.c engine\code\qcommon\cm_local.h engine\code\qcommon\cm_patch.c @@ -853,86 +853,14 @@ q3rallycode engine\TODO engine\voip-readme.txt [Open project files] -0=engine\code\client\cl_main.c -1=engine\code\q3_ui\ui_atoms.c -2=engine\code\q3_ui\ui_cdkey.c -3=engine\code\q3_ui\ui_setup.c -4=engine\code\botlib\be_aas_debug.c -5=engine\code\cgame\cg_atmospheric.c -6=engine\code\cgame\cg_local.h -7=engine\code\cgame\cg_event.c -8=engine\code\cgame\cg_weapons.c -9=engine\code\cgame\cg_main.c -10=engine\code\renderer\tr_animation.c -11=engine\code\renderer\tr_scene.c -12=engine\code\renderer\tr_main.c -13=engine\code\renderer\tr_shadows.c -14=engine\code\renderer\tr_surface.c -15=engine\code\renderer\tr_world.c -16=engine\code\renderer\tr_local.h -17=engine\code\qcommon\q_shared.h -18=engine\code\qcommon\qcommon.h -19=engine\code\qcommon\qfiles.h +0=engine\code\game\g_rally_scripted_objects.c +1=engine\code\botlib\be_ai_move.c [Selected Project Files] Main= -Selected=engine\code\qcommon\qfiles.h -[engine\code\client\cl_main.c] -TopLine=1546 -Caret=1,1560 -[engine\code\q3_ui\ui_atoms.c] -TopLine=998 -Caret=1,1012 -[engine\code\q3_ui\ui_cdkey.c] -TopLine=27 -Caret=1,27 -[engine\code\q3_ui\ui_setup.c] -TopLine=243 -Caret=102,261 -[engine\code\botlib\be_aas_debug.c] -TopLine=32 -Caret=1,46 -[engine\code\cgame\cg_atmospheric.c] -TopLine=81 -Caret=1,95 -[engine\code\cgame\cg_local.h] -TopLine=120 -Caret=1,134 -[engine\code\cgame\cg_event.c] -TopLine=1084 -Caret=1,1098 -[engine\code\cgame\cg_weapons.c] -TopLine=1941 -Caret=34,1956 -[engine\code\cgame\cg_main.c] -TopLine=897 -Caret=1,911 -[engine\code\renderer\tr_animation.c] -TopLine=402 -Caret=1,416 -[engine\code\renderer\tr_scene.c] -TopLine=243 -Caret=1,33 -[engine\code\renderer\tr_main.c] -TopLine=19 +Selected=engine\code\botlib\be_ai_move.c +[engine\code\game\g_rally_scripted_objects.c] +TopLine=799 +Caret=5,815 +[engine\code\botlib\be_ai_move.c] +TopLine=85 Caret=1,1 -[engine\code\renderer\tr_shadows.c] -TopLine=21 -Caret=1,1 -[engine\code\renderer\tr_surface.c] -TopLine=37 -Caret=55,31 -[engine\code\renderer\tr_world.c] -TopLine=1 -Caret=1,1 -[engine\code\renderer\tr_local.h] -TopLine=9 -Caret=41,51 -[engine\code\qcommon\q_shared.h] -TopLine=1 -Caret=35,47 -[engine\code\qcommon\qcommon.h] -TopLine=51 -Caret=1,1 -[engine\code\qcommon\qfiles.h] -TopLine=73 -Caret=32,85