mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-11-21 19:41:36 +00:00
did a little workaround for the grenade launcher
still wip
This commit is contained in:
q3rally
parent
a69dfd5687
commit
57d3c2b6b2
4 changed files with 54 additions and 18 deletions
|
|
@ -872,7 +872,7 @@ gentity_t *fire_grenade (gentity_t *self, vec3_t start, vec3_t dir) {
|
|||
|
||||
bolt = G_Spawn();
|
||||
bolt->classname = "grenade";
|
||||
bolt->nextthink = level.time + 500;
|
||||
bolt->nextthink = level.time + 2500;
|
||||
bolt->think = G_ExplodeMissile;
|
||||
bolt->s.eType = ET_MISSILE;
|
||||
bolt->r.svFlags = SVF_USE_CURRENT_ORIGIN;
|
||||
|
|
@ -893,7 +893,7 @@ gentity_t *fire_grenade (gentity_t *self, vec3_t start, vec3_t dir) {
|
|||
bolt->s.pos.trType = TR_GRAVITY;
|
||||
bolt->s.pos.trTime = level.time - MISSILE_PRESTEP_TIME; // move a bit on the very first frame
|
||||
VectorCopy( start, bolt->s.pos.trBase );
|
||||
VectorScale( dir, 1200, bolt->s.pos.trDelta );
|
||||
VectorScale( dir, 800, bolt->s.pos.trDelta );
|
||||
SnapVector( bolt->s.pos.trDelta ); // save net bandwidth
|
||||
|
||||
VectorCopy (start, bolt->r.currentOrigin);
|
||||
|
|
|
|||
|
|
@ -439,14 +439,14 @@ void weapon_grenadelauncher_fire (gentity_t *ent) {
|
|||
gentity_t *m;
|
||||
|
||||
// extra vertical velocity
|
||||
forward[2] += 0.0f;
|
||||
forward[2] += -0.2f;
|
||||
VectorNormalize( forward );
|
||||
|
||||
m = fire_grenade (ent, muzzle, forward);
|
||||
m->damage *= s_quadFactor;
|
||||
m->splashDamage *= s_quadFactor;
|
||||
|
||||
VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta ); // "real" physics
|
||||
// VectorAdd( m->s.pos.trDelta, ent->client->ps.velocity, m->s.pos.trDelta ); // "real" physics
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|||
#endif
|
||||
|
||||
// Heartbeat for dpmaster protocol. You shouldn't change this unless you know what you're doing
|
||||
#define HEARTBEAT_FOR_MASTER "Q3Rally"
|
||||
#define HEARTBEAT_FOR_MASTER "DarkPlaces"
|
||||
|
||||
// When com_gamename is LEGACY_MASTER_GAMENAME, use quake3 master protocol.
|
||||
// You shouldn't change this unless you know what you're doing
|
||||
|
|
@ -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_r297"
|
||||
#define PRODUCT_VERSION "v0.0.3.0_r298"
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -165,7 +165,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
|
||||
|
|
@ -876,6 +876,15 @@ q3rallycode
|
|||
15=engine\code\q3_ui\ui_rally_servers.c
|
||||
16=engine\code\qcommon\qcommon.h
|
||||
17=engine\code\q3_ui\ui_serverinfo.c
|
||||
18=engine\code\server\sv_init.c
|
||||
19=engine\code\game\g_misc.c
|
||||
20=engine\code\game\bg_misc.c
|
||||
21=engine\code\game\g_local.h
|
||||
22=engine\code\game\g_combat.c
|
||||
23=engine\code\cgame\cg_ents.c
|
||||
24=engine\code\cgame\cg_draw.c
|
||||
25=engine\code\game\bg_pmove.c
|
||||
26=engine\code\q3_ui\ui_cinematics.c
|
||||
[Selected Project Files]
|
||||
Main=
|
||||
Selected=engine\code\qcommon\q_shared.h
|
||||
|
|
@ -883,16 +892,16 @@ Selected=engine\code\qcommon\q_shared.h
|
|||
TopLine=3681
|
||||
Caret=1,3695
|
||||
[engine\code\game\g_weapon.c]
|
||||
TopLine=444
|
||||
Caret=20,464
|
||||
TopLine=429
|
||||
Caret=20,442
|
||||
[engine\code\cgame\cg_weapons.c]
|
||||
TopLine=677
|
||||
Caret=1,692
|
||||
TopLine=2106
|
||||
Caret=1,2120
|
||||
[engine\code\game\g_missile.c]
|
||||
TopLine=906
|
||||
Caret=34,916
|
||||
TopLine=861
|
||||
Caret=13,865
|
||||
[engine\code\qcommon\q_shared.h]
|
||||
TopLine=45
|
||||
TopLine=52
|
||||
Caret=39,70
|
||||
[engine\code\q3_ui\ui_rally_credits.c]
|
||||
TopLine=63
|
||||
|
|
@ -907,8 +916,8 @@ Caret=64,1916
|
|||
TopLine=25
|
||||
Caret=33,40
|
||||
[engine\code\game\bg_public.h]
|
||||
TopLine=587
|
||||
Caret=25,611
|
||||
TopLine=893
|
||||
Caret=1,907
|
||||
[engine\code\cgame\cg_event.c]
|
||||
TopLine=1117
|
||||
Caret=1,1132
|
||||
|
|
@ -916,8 +925,8 @@ Caret=1,1132
|
|||
TopLine=208
|
||||
Caret=48,229
|
||||
[engine\code\cgame\cg_local.h]
|
||||
TopLine=1784
|
||||
Caret=1,1799
|
||||
TopLine=1095
|
||||
Caret=1,1109
|
||||
[engine\code\cgame\cg_rally_hud.c]
|
||||
TopLine=723
|
||||
Caret=1,738
|
||||
|
|
@ -933,3 +942,30 @@ Caret=51,267
|
|||
[engine\code\q3_ui\ui_serverinfo.c]
|
||||
TopLine=111
|
||||
Caret=29,136
|
||||
[engine\code\server\sv_init.c]
|
||||
TopLine=671
|
||||
Caret=1,685
|
||||
[engine\code\game\g_misc.c]
|
||||
TopLine=335
|
||||
Caret=1,349
|
||||
[engine\code\game\bg_misc.c]
|
||||
TopLine=1552
|
||||
Caret=1,1566
|
||||
[engine\code\game\g_local.h]
|
||||
TopLine=630
|
||||
Caret=1,644
|
||||
[engine\code\game\g_combat.c]
|
||||
TopLine=1079
|
||||
Caret=1,1093
|
||||
[engine\code\cgame\cg_ents.c]
|
||||
TopLine=437
|
||||
Caret=1,463
|
||||
[engine\code\cgame\cg_draw.c]
|
||||
TopLine=3413
|
||||
Caret=1,3427
|
||||
[engine\code\game\bg_pmove.c]
|
||||
TopLine=2015
|
||||
Caret=1,2029
|
||||
[engine\code\q3_ui\ui_cinematics.c]
|
||||
TopLine=21
|
||||
Caret=1,35
|
||||
|
|
|
|||
Loading…
Reference in a new issue