q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-24 21:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

added aas file for battlecanyon

Browse source 
fixed bug #39 (plasmagun alt fire)
This commit is contained in:
q3rally 2021-07-27 20:57:01 +00:00
parent 51f77cca5e
commit 8be1b5b71d
4 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
baseq3r/maps/q3r_battlecanyon.aas Normal file
View file

Binary file not shown.

18
engine/code/game/g_weapon.c
View file

@ -539,22 +539,22 @@ PLASMA GUN - Altfire
void Weapon_Plasmagun_Circular_Fire (gentity_t *ent) { void Weapon_Plasmagun_Circular_Fire (gentity_t *ent) {
gentity_t *m; gentity_t *m;
// gentity_t *n; // gentity_t *n;
vec3_t temp, temp2; // vec3_t temp, temp2;
//forward[0] += (float)sin( m->s.pos.trTime / m->s.pos.trDuration ); //forward[0] += (float)sin( m->s.pos.trTime / m->s.pos.trDuration );
temp[0] = (float) sin( level.time * 2 * 3.14 / 1000.0); // temp[0] = (float) sin( level.time * 2 * 3.14 / 1000.0);
temp[1] = 0; temp[2] = 0; // temp[1] = 0; temp[2] = 0;
temp2[0] = (float) cos( level.time * 2 * 3.14 / 1000.0); // temp2[0] = (float) cos( level.time * 2 * 3.14 / 1000.0);
temp2[1] = 0; temp2[2] = 0; // temp2[1] = 0; temp2[2] = 0;
VectorAdd( forward, temp, temp); // VectorAdd( forward, temp, temp);
VectorAdd( right, temp2, temp2); // VectorAdd( right, temp2, temp2);
VectorAdd( temp, temp2, temp2); // VectorAdd( temp, temp2, temp2);
//VectorMA( m->s.pos.trBase, 100, forward, temp2); //VectorMA( m->s.pos.trBase, 100, forward, temp2);
m = fire_plasma_bounce(ent, muzzle, temp2); m = fire_plasma_bounce(ent, muzzle, forward);
m->damage *= s_quadFactor; m->damage *= s_quadFactor;
m->splashDamage *= s_quadFactor; m->splashDamage *= s_quadFactor;
/* /*

2
engine/code/qcommon/q_shared.h
View file

@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack" #define BASETA "missionpack"
#ifndef PRODUCT_VERSION #ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.3c_r422" #define PRODUCT_VERSION "v0.3c_r426"
#endif #endif

20
q3rallycode.ppr
View file

@ -122,7 +122,7 @@ q3rallycode
engine\code\botlib\l_utils.h engine\code\botlib\l_utils.h
engine\code\botlib\lcc.mak engine\code\botlib\lcc.mak
engine\code\botlib\linux-i386.mak engine\code\botlib\linux-i386.mak
+cgame -cgame
engine\code\cgame\cg_atmospheric.c engine\code\cgame\cg_atmospheric.c
engine\code\cgame\cg_consolecmds.c engine\code\cgame\cg_consolecmds.c
engine\code\cgame\cg_draw.c engine\code\cgame\cg_draw.c
@ -889,18 +889,30 @@ q3rallycode
1=engine\code\q3_ui\ui_rally_startserver.c 1=engine\code\q3_ui\ui_rally_startserver.c
2=engine\code\q3_ui\ui_local.h 2=engine\code\q3_ui\ui_local.h
3=engine\code\q3_ui\ui_main.c 3=engine\code\q3_ui\ui_main.c
4=engine\code\q3_ui\ui_rally_controls.c
5=engine\code\game\g_weapon.c
6=engine\code\game\g_missile.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\q3_ui\ui_rally_startserver.c Selected=engine\code\qcommon\q_shared.h
[engine\code\qcommon\q_shared.h] [engine\code\qcommon\q_shared.h]
TopLine=51 TopLine=51
Caret=36,70 Caret=36,70
[engine\code\q3_ui\ui_rally_startserver.c] [engine\code\q3_ui\ui_rally_startserver.c]
TopLine=1634 TopLine=1397
Caret=42,1637 Caret=36,1413
[engine\code\q3_ui\ui_local.h] [engine\code\q3_ui\ui_local.h]
TopLine=44 TopLine=44
Caret=1,60 Caret=1,60
[engine\code\q3_ui\ui_main.c] [engine\code\q3_ui\ui_main.c]
TopLine=225 TopLine=225
Caret=47,243 Caret=47,243
[engine\code\q3_ui\ui_rally_controls.c]
TopLine=93
Caret=22,98
[engine\code\game\g_weapon.c]
TopLine=539
Caret=45,557
[engine\code\game\g_missile.c]
TopLine=748
Caret=1,768