diff --git a/baseq3r/maps/q3r_battlecanyon.aas b/baseq3r/maps/q3r_battlecanyon.aas new file mode 100644 index 00000000..98d6b2ae Binary files /dev/null and b/baseq3r/maps/q3r_battlecanyon.aas differ diff --git a/engine/code/game/g_weapon.c b/engine/code/game/g_weapon.c index 95c3cc88..7944fe5f 100644 --- a/engine/code/game/g_weapon.c +++ b/engine/code/game/g_weapon.c @@ -539,22 +539,22 @@ PLASMA GUN - Altfire void Weapon_Plasmagun_Circular_Fire (gentity_t *ent) { gentity_t *m; // gentity_t *n; - vec3_t temp, temp2; +// vec3_t temp, temp2; //forward[0] += (float)sin( m->s.pos.trTime / m->s.pos.trDuration ); - temp[0] = (float) sin( level.time * 2 * 3.14 / 1000.0); - temp[1] = 0; temp[2] = 0; +// temp[0] = (float) sin( level.time * 2 * 3.14 / 1000.0); +// temp[1] = 0; temp[2] = 0; - temp2[0] = (float) cos( level.time * 2 * 3.14 / 1000.0); - temp2[1] = 0; temp2[2] = 0; +// temp2[0] = (float) cos( level.time * 2 * 3.14 / 1000.0); +// temp2[1] = 0; temp2[2] = 0; - VectorAdd( forward, temp, temp); - VectorAdd( right, temp2, temp2); - VectorAdd( temp, temp2, temp2); +// VectorAdd( forward, temp, temp); +// VectorAdd( right, temp2, temp2); +// VectorAdd( temp, temp2, 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->splashDamage *= s_quadFactor; /* diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index 1f9ca577..f60328a5 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.3c_r422" +#define PRODUCT_VERSION "v0.3c_r426" #endif diff --git a/q3rallycode.ppr b/q3rallycode.ppr index f10f5fc5..ae1f2c1e 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -122,7 +122,7 @@ q3rallycode engine\code\botlib\l_utils.h engine\code\botlib\lcc.mak engine\code\botlib\linux-i386.mak - +cgame + -cgame engine\code\cgame\cg_atmospheric.c engine\code\cgame\cg_consolecmds.c engine\code\cgame\cg_draw.c @@ -889,18 +889,30 @@ q3rallycode 1=engine\code\q3_ui\ui_rally_startserver.c 2=engine\code\q3_ui\ui_local.h 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] Main= -Selected=engine\code\q3_ui\ui_rally_startserver.c +Selected=engine\code\qcommon\q_shared.h [engine\code\qcommon\q_shared.h] TopLine=51 Caret=36,70 [engine\code\q3_ui\ui_rally_startserver.c] -TopLine=1634 -Caret=42,1637 +TopLine=1397 +Caret=36,1413 [engine\code\q3_ui\ui_local.h] TopLine=44 Caret=1,60 [engine\code\q3_ui\ui_main.c] TopLine=225 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