- Added CVAR_SYSTEMINFO to cvars that need it.

- Changed SpecifyServer Menu to Q3Rally style, removed OpenArena graphics

engine/code/cgame/cg_main.c

@@ -389,7 +389,7 @@ static cvarTable_t cvarTable[] = {
 	{ &cg_buildScript, "com_buildScript", "0", 0 },	// force loading of all possible data amd error on failures
 	{ &cg_paused, "cl_paused", "0", CVAR_ROM },
 	{ &cg_blood, "com_blood", "1", CVAR_ARCHIVE },
-	{ &cg_synchronousClients, "g_synchronousClients", "0", 0 },	// communicated by systeminfo
+	{ &cg_synchronousClients, "g_synchronousClients", "0", CVAR_SYSTEMINFO },	// communicated by systeminfo
 #ifdef MISSIONPACK
 	{ &cg_redTeamName, "g_redteam", DEFAULT_REDTEAM_NAME, CVAR_ARCHIVE | CVAR_SERVERINFO | CVAR_USERINFO },
 	{ &cg_blueTeamName, "g_blueteam", DEFAULT_BLUETEAM_NAME, CVAR_ARCHIVE | CVAR_SERVERINFO | CVAR_USERINFO },
@@ -413,12 +413,9 @@ static cvarTable_t cvarTable[] = {
 	{ &cg_smoothClients, "cg_smoothClients", "0", CVAR_USERINFO | CVAR_ARCHIVE},
 	{ &cg_cameraMode, "com_cameraMode", "0", CVAR_CHEAT},
 
-// Q3Rally Code Start
+
-//	{ &pmove_fixed, "pmove_fixed", "0", 0},
+	{ &pmove_fixed, "pmove_fixed", "0", CVAR_SYSTEMINFO},
-//	{ &pmove_msec, "pmove_msec", "8", 0},
+	{ &pmove_msec, "pmove_msec", "8", CVAR_SYSTEMINFO},
-	{ &pmove_fixed, "pmove_fixed", "1", 0},
-	{ &pmove_msec, "pmove_msec", "18", 0},
-// Q3Rally Code END
 	{ &cg_noTaunt, "cg_noTaunt", "0", CVAR_ARCHIVE},
 	{ &cg_noProjectileTrail, "cg_noProjectileTrail", "0", CVAR_ARCHIVE},
 	{ &cg_smallFont, "ui_smallFont", "0.25", CVAR_ARCHIVE},

engine/code/q3_ui/ui_setup.c

@@ -35,14 +35,7 @@ SETUP MENU
 
 #define SETUP_MENU_VERTICAL_SPACING		34
 
-// BAGPUSS
+
-/*
-#define ART_BACK0		"menu/art/back_0"
-#define ART_BACK1		"menu/art/back_1"	
-#define ART_FRAMEL		"menu/art/frame2_l"
-#define ART_FRAMER		"menu/art/frame1_r"
-*/
-// END
 
 #define ID_CUSTOMIZEPLAYER		10
 #define ID_CUSTOMIZECONTROLS	11
@@ -62,27 +55,15 @@ typedef struct {
 	menuframework_s	menu;
 
 	menutext_s		banner;
-// BAGPUSS
-/*
-	menubitmap_s	framel;
-	menubitmap_s	framer;
-*/
-// END
 	menutext_s		setupplayer;
 	menutext_s		setupcontrols;
 	menutext_s		setupsystem;
 	menutext_s		game;
 	menutext_s		cdkey;
-//	menutext_s		load;
-//	menutext_s		save;
-// STONELANCE
 	menutext_s		q3rOptions;
-// END
 	menutext_s		defaults;
-// BAGPUSS
-//	menubitmap_s	back;
 	menutext_s		back;
-// END
+
 } setupMenuInfo_t;
 
 static setupMenuInfo_t	setupMenuInfo;
@@ -200,14 +181,6 @@ void UI_SetupMenu_ChangeMenu( int menuID ){
 		UI_CDKeyMenu();
 		break;
 
-//	case ID_LOAD:
-//		UI_LoadConfigMenu();
-//		break;
-
-//	case ID_SAVE:
-//		UI_SaveConfigMenu();
-//		break;
-
 	case ID_Q3ROPTIONS:
 		UI_Q3ROptionsMenu();
 		break;

engine/code/q3_ui/ui_specifyserver.c

@@ -118,22 +118,6 @@ void SpecifyServer_MenuInit( void )
 	s_specifyserver.banner.color  		 = color_white;
 	s_specifyserver.banner.style  		 = UI_CENTER;
 
-	s_specifyserver.framel.generic.type  = MTYPE_BITMAP;
-	s_specifyserver.framel.generic.name  = SPECIFYSERVER_FRAMEL;
-	s_specifyserver.framel.generic.flags = QMF_INACTIVE;
-	s_specifyserver.framel.generic.x	 = 0;  
-	s_specifyserver.framel.generic.y	 = 78;
-	s_specifyserver.framel.width  	     = 256;
-	s_specifyserver.framel.height  	     = 329;
-
-	s_specifyserver.framer.generic.type  = MTYPE_BITMAP;
-	s_specifyserver.framer.generic.name  = SPECIFYSERVER_FRAMER;
-	s_specifyserver.framer.generic.flags = QMF_INACTIVE;
-	s_specifyserver.framer.generic.x	 = 376;
-	s_specifyserver.framer.generic.y	 = 76;
-	s_specifyserver.framer.width  	     = 256;
-	s_specifyserver.framer.height  	     = 334;
-
 	s_specifyserver.domain.generic.type       = MTYPE_FIELD;
 	s_specifyserver.domain.generic.name       = "Address:";
 	s_specifyserver.domain.generic.flags      = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
@@ -150,27 +134,25 @@ void SpecifyServer_MenuInit( void )
 	s_specifyserver.port.field.widthInChars = 6;
 	s_specifyserver.port.field.maxchars     = 5;
 
-	s_specifyserver.go.generic.type	    = MTYPE_BITMAP;
+	s_specifyserver.go.generic.type	    = MTYPE_PTEXT;
-	s_specifyserver.go.generic.name     = SPECIFYSERVER_FIGHT0;
 	s_specifyserver.go.generic.flags    = QMF_RIGHT_JUSTIFY|QMF_PULSEIFFOCUS;
 	s_specifyserver.go.generic.callback = SpecifyServer_Event;
-	s_specifyserver.go.generic.id	    = ID_SPECIFYSERVERGO;
+	s_specifyserver.go.generic.id	      = ID_SPECIFYSERVERGO;
-	s_specifyserver.go.generic.x		= 640;
+	s_specifyserver.go.generic.x		    = 640;
-	s_specifyserver.go.generic.y		= 480-64;
+	s_specifyserver.go.generic.y		    = 480-64;
-	s_specifyserver.go.width  		    = 128;
+	s_specifyserver.go.string				    = "FIGHT >";
-	s_specifyserver.go.height  		    = 64;
+	s_specifyserver.go.color				    = text_color_normal;
-	s_specifyserver.go.focuspic         = SPECIFYSERVER_FIGHT1;
+	s_specifyserver.go.style				  = UI_LEFT | UI_SMALLFONT;
 	
-	s_specifyserver.back.generic.type	  = MTYPE_BITMAP;
+	s_specifyserver.back.generic.type			= MTYPE_PTEXT;
-	s_specifyserver.back.generic.name     = SPECIFYSERVER_BACK0;
+	s_specifyserver.back.generic.flags		= QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
-	s_specifyserver.back.generic.flags    = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
 	s_specifyserver.back.generic.callback = SpecifyServer_Event;
 	s_specifyserver.back.generic.id	      = ID_SPECIFYSERVERBACK; 
-	s_specifyserver.back.generic.x		  = 0;
+	s_specifyserver.back.generic.x			  = 0;
-	s_specifyserver.back.generic.y		  = 480-64;
+	s_specifyserver.back.generic.y			  = 480 - 64;
-	s_specifyserver.back.width  		  = 128;
+	s_specifyserver.back.string				    = "< BACK";
-	s_specifyserver.back.height  		  = 64;
+	s_specifyserver.back.color				    = text_color_normal;
-	s_specifyserver.back.focuspic         = SPECIFYSERVER_BACK1;
+	s_specifyserver.back.style				    = UI_LEFT | UI_SMALLFONT;
 
 	Menu_AddItem( &s_specifyserver.menu, &s_specifyserver.banner );
 	Menu_AddItem( &s_specifyserver.menu, &s_specifyserver.framel );

engine/code/qcommon/files.c

@@ -199,7 +199,7 @@ typedef struct
 const purePak_t com_purePaks[] =
 {
 	{BASEGAME, "assets0", 1440211393u},
-  {BASEGAME, "qvm", 79200548u},
+  {BASEGAME, "qvm", 879652862u},
   
 
 #if 0

engine/version_history.txt

@@ -1,7 +1,7 @@
 Q3Rally Version History
 
 
-Q3Rally v0.0.0.3
+Q3Rally v0.0.0.3	(xx.xx.xxxx)
 
 - Removed "Show Q3Rally Only" option, after last revision we only get q3rally servers.
 - Fixed requesting servers for a specific gametype (uses a dpmaster feature)
@@ -12,6 +12,10 @@ Q3Rally v0.0.0.3
 - Removed out of date game binaries (they probably shouldn't be in svn at all).
 - Removed cvar ui_browserShowRallyOnly (no longer used after r77)
 - Added target_gravity from EntityPlus
+- Created function for GAMES_* to GT_*, it's only done in one place now. (ported from Turtle Arena r1517)
+- Unified version (mostly), update VERSION in Makefile and PRODUCT_VERSION in q_shared.h. Sets version everywhere instead of just qvms.
+- Modified 'not finished game' message in cg_rally_hud.c to be better English
+- Added CVAR_SYSTEMINFO to cvars that need it.
 
 Q3Rally v0.0.0.2	(26.07.2011)
 

q3rallycode.ppr

@@ -13,7 +13,7 @@ ProjectFilesOnly=0
 [Project tree]
 q3rallycode
 	+engine
-		-code
+		+code
 			-AL
 				engine\code\AL\al.h
 				engine\code\AL\alc.h
@@ -424,7 +424,7 @@ q3rallycode
 				engine\code\null\null_main.c
 				engine\code\null\null_net.c
 				engine\code\null\null_snddma.c
-			-q3_ui
+			+q3_ui
 				engine\code\q3_ui\ui.def
 				engine\code\q3_ui\ui_addbots.c
 				engine\code\q3_ui\ui_atoms.c
@@ -858,18 +858,34 @@ q3rallycode
 1=engine\code\qcommon\files.c
 2=engine\code\game\bg_public.h
 3=engine\resync_svn.sh
+4=engine\code\qcommon\qfiles.h
+5=engine\code\cgame\cg_main.c
+6=engine\code\q3_ui\ui_specifyserver.c
+7=engine\code\q3_ui\ui_setup.c
 [Selected Project Files]
 Main=
-Selected=engine\code\cgame\cg_ents.c
+Selected=engine\code\q3_ui\ui_specifyserver.c
 [engine\code\cgame\cg_ents.c]
 TopLine=121
 Caret=1,1
 [engine\code\qcommon\files.c]
-TopLine=177
+TopLine=1
-Caret=34,201
+Caret=1,1
 [engine\code\game\bg_public.h]
 TopLine=1
-Caret=50,34
+Caret=59,6
 [engine\resync_svn.sh]
 TopLine=386
 Caret=1,1
+[engine\code\qcommon\qfiles.h]
+TopLine=291
+Caret=1,1
+[engine\code\cgame\cg_main.c]
+TopLine=406
+Caret=53,418
+[engine\code\q3_ui\ui_specifyserver.c]
+TopLine=101
+Caret=70,153
+[engine\code\q3_ui\ui_setup.c]
+TopLine=331
+Caret=1,341