fixed bug #69

cg_autodrop should work now

engine/code/game/g_client.c

@@ -1012,16 +1012,15 @@ void ClientUserinfoChanged( int clientNum ) {
 	}
 #endif
 
-// STONELANCE
-	// UPDATE: enable this
-/*
+// P3rlE
+	// UPDATE: Tryout Autodrop
+
 	s = Info_ValueForKey( userinfo, "cg_autodrop" );
 	if ( ! *s || atoi( s ) != 0 ) {
 		client->pers.autoDrop = qtrue;
 	} else {
 		client->pers.autoDrop = qfalse;
 	}
-*/
 
 	s = Info_ValueForKey( userinfo, "cg_controlMode" );
 	if ( *s ) {

engine/code/game/g_items.c

@@ -444,10 +444,10 @@ Touch_Item
 ===============
 */
 void Touch_Item (gentity_t *ent, gentity_t *other, trace_t *trace) {
-	int			respawn;
+    int			respawn;
 	qboolean	predict;
 // Q3Rally Code Start
-//	int			i;
+	int			i;
 // Q3Rally Code END
 
 	if (!other->client)
@@ -458,7 +458,7 @@ void Touch_Item (gentity_t *ent, gentity_t *other, trace_t *trace) {
 // STONELANCE
 	// FIXME: implement autoDrop
 	// autoDrop old weapon
-/*
+
 	if ( ent->item->giType == IT_RFWEAPON && other->client->pers.autoDrop ){
 		for (i = RWP_SMOKE; i < WP_NUM_WEAPONS; i++){
 			if (ent->item->giTag == i) continue;
@@ -473,7 +473,7 @@ void Touch_Item (gentity_t *ent, gentity_t *other, trace_t *trace) {
 			}
 		}
 	}
-*/
+
 // END
 
 	// the same pickup rules are used for client side and server side

engine/code/game/g_local.h

@@ -323,6 +323,7 @@ typedef struct {
 	qboolean	teamInfo;			// send team overlay updates?
 // STONELANCE
 	int			controlMode;		// control mode
+    int         autoDrop;           // autodrop
 	qboolean	manualShift;		// shift manually?
 // END
 } clientPersistant_t;

engine/code/q3_ui/ui_menu.c

@@ -529,7 +529,7 @@ void UI_MainMenu( void ) {
         s_main.banner.generic.flags                     = QMF_INACTIVE;
         s_main.banner.generic.x                         = 320;
         s_main.banner.generic.y                         = 17;
-        s_main.banner.string                            = "Q3RALLY STANDALONE";
+        s_main.banner.string                            = "Q3RALLY";
         s_main.banner.color                             = text_color_normal;
         s_main.banner.style                             = UI_CENTER|UI_DROPSHADOW;
 

engine/code/qcommon/q_shared.h

@@ -70,7 +70,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-#define PRODUCT_VERSION "v0.5_r591"
+#define PRODUCT_VERSION "v0.5 r603"
 #endif