diff --git a/engine/code/cgame/cg_rankings.c b/engine/code/cgame/cg_rankings.c new file mode 100644 index 00000000..aff82044 --- /dev/null +++ b/engine/code/cgame/cg_rankings.c @@ -0,0 +1,33 @@ +// cg_rankings.c -- client global rankings system + +#include "cg_local.h" + +/* +================ +CG_RankRunFrame +================ +*/ + +void CG_RankRunFrame(void) +{ + grank_status_t status; + + if (! cgs.localServer) + trap_CL_RankPoll(); + + status = trap_CL_RankUserStatus(); + + if( cgs.client_status != status ) + { + // GRank status changed + + // inform UI of current status + trap_Cvar_Set("client_status", va("%i",(int)(status))); + + // show rankings status dialog if error + trap_CL_RankShowStatus((int)status); + + cgs.client_status = status; + } + return; +} diff --git a/engine/code/game/bg_pmove.c b/engine/code/game/bg_pmove.c index bbbd665b..05c5a9e8 100644 --- a/engine/code/game/bg_pmove.c +++ b/engine/code/game/bg_pmove.c @@ -2047,7 +2047,7 @@ static void PM_Alt_Weapon( void ) { ammo_use = 3; //there are 6 trajectories in g_missile.c: G_ExplodeCluster() break; case WP_ROCKET_LAUNCHER: - ammo_use = 1; //homing + ammo_use = 3; //homing break; case WP_PLASMAGUN: ammo_use = 1; //rotational defense diff --git a/engine/code/game/g_missile.c b/engine/code/game/g_missile.c index 574f8295..986db34f 100644 --- a/engine/code/game/g_missile.c +++ b/engine/code/game/g_missile.c @@ -1104,7 +1104,7 @@ gentity_t *fire_homing_rocket (gentity_t *self, vec3_t start, vec3_t dir) { bolt->s.weapon = WP_ROCKET_LAUNCHER; bolt->r.ownerNum = self->s.number; bolt->parent = self; - bolt->damage = 80; + bolt->damage = 40; //bolt->splashDamage = 100; //TBB - too high for being splash bolt->splashDamage = 60; //TBB bolt->splashRadius = 75; diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index ce8d94d6..0f0972aa 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.3b_r412" +#define PRODUCT_VERSION "v0.3c" // r414 #endif diff --git a/q3rallycode.ppr b/q3rallycode.ppr index cf7e6641..80c06b60 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -907,12 +907,16 @@ q3rallycode 19=engine\code\game\g_items.c 20=engine\code\game\g_spawn.c 21=engine\code\game\g_arenas.c +22=engine\code\game\bg_pmove.c +23=engine\code\game\g_weapon.c +24=engine\code\cgame\cg_weapons.c +25=engine\code\game\g_missile.c [Selected Project Files] Main= -Selected=engine\code\game\g_team.c +Selected=engine\code\qcommon\q_shared.h [engine\code\qcommon\q_shared.h] -TopLine=1787 -Caret=17,1804 +TopLine=55 +Caret=46,70 [engine\code\qcommon\qcommon.h] TopLine=700 Caret=1,715 @@ -953,7 +957,7 @@ Caret=3,1170 TopLine=444 Caret=1,457 [engine\code\game\g_client.c] -TopLine=686 +TopLine=1 Caret=1,700 [engine\code\game\g_cmds.c] TopLine=110 @@ -976,3 +980,15 @@ Caret=59,335 [engine\code\game\g_arenas.c] TopLine=79 Caret=52,92 +[engine\code\game\bg_pmove.c] +TopLine=1871 +Caret=15,2050 +[engine\code\game\g_weapon.c] +TopLine=1295 +Caret=25,1308 +[engine\code\cgame\cg_weapons.c] +TopLine=2121 +Caret=1,2125 +[engine\code\game\g_missile.c] +TopLine=1092 +Caret=19,1107