diff --git a/engine/code/game/g_local.h b/engine/code/game/g_local.h index 27349504..9eb576ff 100644 --- a/engine/code/game/g_local.h +++ b/engine/code/game/g_local.h @@ -693,6 +693,7 @@ void CalcMuzzlePoint ( gentity_t *ent, vec3_t forward, vec3_t right, vec3_t up, void SnapVectorTowards( vec3_t v, vec3_t to ); qboolean CheckGauntletAttack( gentity_t *ent ); void TelefragPlayer( gentity_t *player, vec3_t origin ); +void TelefragPlayer_P( gentity_t *player, vec3_t origin ); void weapon_telefrag_fire (gentity_t *ent, vec3_t muzzle, vec3_t forward, vec3_t right, vec3_t up); diff --git a/engine/code/game/g_misc.c b/engine/code/game/g_misc.c index 85b6b102..35fb7a75 100644 --- a/engine/code/game/g_misc.c +++ b/engine/code/game/g_misc.c @@ -138,7 +138,7 @@ void TeleportPlayer( gentity_t *player, vec3_t origin, vec3_t angles ) { // TelefragPlayer //================================================== -void TelefragPlayer( gentity_t *player, vec3_t origin ) { // removed angles +void TelefragPlayer_P( gentity_t *player, vec3_t origin ) { // removed angles gentity_t *tent; // use temp events at source and destination to prevent the effect diff --git a/engine/code/game/g_missile.c b/engine/code/game/g_missile.c index 11719ae7..574f8295 100644 --- a/engine/code/game/g_missile.c +++ b/engine/code/game/g_missile.c @@ -30,7 +30,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA G_HomingMissile ================ */ -void G_HomingMissile( gentity_t *ent ) + +#define ROCKET_SPEED 600 + +void rocket_think( gentity_t *ent ) { gentity_t *target = NULL; gentity_t *rad = NULL; @@ -46,7 +49,7 @@ void G_HomingMissile( gentity_t *ent ) continue; if (rad->client->sess.sessionTeam == TEAM_SPECTATOR) continue; - if ( (g_gametype.integer == GT_TEAM || g_gametype.integer == GT_CTF) && rad->client->sess.sessionTeam == rad->parent->client->sess.sessionTeam) + if ( (g_gametype.integer == GT_TEAM || g_gametype.integer == GT_CTF || g_gametype.integer == GT_DOMINATION ) && rad->client->sess.sessionTeam == rad->parent->client->sess.sessionTeam) continue; if (!visible (ent, rad)) continue; @@ -77,6 +80,7 @@ void G_HomingMissile( gentity_t *ent ) ent->nextthink = level.time + 100; } + /* ================= Missile_Smooth_H @@ -1093,8 +1097,8 @@ gentity_t *fire_homing_rocket (gentity_t *self, vec3_t start, vec3_t dir) { bolt = G_Spawn(); bolt->classname = "rocket"; - bolt->nextthink = level.time + 60; - bolt->think = G_HomingMissile; + bolt->nextthink = level.time + 1; + bolt->think = rocket_think; bolt->s.eType = ET_MISSILE; bolt->r.svFlags = SVF_USE_CURRENT_ORIGIN; bolt->s.weapon = WP_ROCKET_LAUNCHER; @@ -1114,7 +1118,7 @@ gentity_t *fire_homing_rocket (gentity_t *self, vec3_t start, vec3_t dir) { VectorCopy( start, bolt->s.pos.trBase ); // STONELANCE // VectorScale( dir, 900, bolt->s.pos.trDelta ); - VectorScale( dir, 500, bolt->s.pos.trDelta ); + VectorScale( dir, ROCKET_SPEED, bolt->s.pos.trDelta ); // END SnapVector( bolt->s.pos.trDelta ); // save net bandwidth VectorCopy (start, bolt->r.currentOrigin); diff --git a/engine/code/game/g_weapon.c b/engine/code/game/g_weapon.c index 96a30698..74222c3a 100644 --- a/engine/code/game/g_weapon.c +++ b/engine/code/game/g_weapon.c @@ -733,7 +733,7 @@ TELEFRAG GUN - Altfire to Railgun ====================================================================== */ -/* + void TelefragPlayer( gentity_t *player, vec3_t origin ) { gentity_t *tent; @@ -771,7 +771,7 @@ void TelefragPlayer( gentity_t *player, vec3_t origin ) { trap_LinkEntity (player); } } -*/ + void weapon_telefrag_fire (gentity_t *ent,vec3_t muzzle,vec3_t forward,vec3_t right,vec3_t up) { diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index e94c5c92..12648e27 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define BASETA "missionpack" #ifndef PRODUCT_VERSION -#define PRODUCT_VERSION "v0.0.3.0_r396" +#define PRODUCT_VERSION "v0.0.3.0_r399" #endif diff --git a/q3rallycode.ppr b/q3rallycode.ppr index 0a61bb42..1959b85b 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -5,6 +5,7 @@ Compilator.CompileOnBackground=0 Compilator.ProgSaveAll=0 Compilator.ProgRunSelection=0 Compilator.LogType=0 +Compilator.LogEncoding=0 DefaultDir=D:\q3rallysa\engine DefaultCP=0 LogtoEnd=1 @@ -165,7 +166,7 @@ q3rallycode engine\code\client\snd_openal.c engine\code\client\snd_public.h engine\code\client\snd_wavelet.c - -game + +game engine\code\game\ai_chat.c engine\code\game\ai_chat.h engine\code\game\ai_cmd.c @@ -427,7 +428,7 @@ q3rallycode engine\code\null\null_main.c engine\code\null\null_net.c engine\code\null\null_snddma.c - +q3_ui + -q3_ui engine\code\q3_ui\ui.def engine\code\q3_ui\ui_addbots.c engine\code\q3_ui\ui_atoms.c @@ -859,37 +860,21 @@ q3rallycode engine\cross-make-mingw64.sh [Open project files] 0=engine\code\qcommon\q_shared.h -1=engine\code\q3_ui\ui_rally_controls.c -2=engine\code\cgame\cg_weapons.c -3=engine\code\q3_ui\ui_menu.c -4=engine\code\q3_ui\ui_cinematics.c -5=engine\code\q3_ui\ui_loadconfig.c -6=engine\code\cgame\cg_consolecmds.c -7=engine\code\game\g_cmds.c +1=engine\code\game\g_misc.c +2=engine\code\game\g_weapon.c +3=engine\code\game\g_local.h [Selected Project Files] Main= -Selected=engine\code\qcommon\q_shared.h +Selected=engine\code\game\g_misc.c [engine\code\qcommon\q_shared.h] -TopLine=55 +TopLine=57 Caret=39,70 -[engine\code\q3_ui\ui_rally_controls.c] -TopLine=1266 -Caret=1,1277 -[engine\code\cgame\cg_weapons.c] -TopLine=1264 -Caret=1,1279 -[engine\code\q3_ui\ui_menu.c] -TopLine=524 -Caret=45,533 -[engine\code\q3_ui\ui_cinematics.c] -TopLine=126 -Caret=1,141 -[engine\code\q3_ui\ui_loadconfig.c] -TopLine=85 -Caret=1,85 -[engine\code\cgame\cg_consolecmds.c] -TopLine=590 -Caret=1,590 -[engine\code\game\g_cmds.c] -TopLine=2195 -Caret=1,2208 +[engine\code\game\g_misc.c] +TopLine=128 +Caret=22,141 +[engine\code\game\g_weapon.c] +TopLine=736 +Caret=1,737 +[engine\code\game\g_local.h] +TopLine=674 +Caret=22,696