diff --git a/engine/Makefile b/engine/Makefile index d8f33616..2bd040a0 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -224,7 +224,7 @@ ifneq ($(BUILD_CLIENT),0) endif # version info -VERSION=0.1 +VERSION=v0.0.0.3 USE_SVN= ifeq ($(wildcard .svn),.svn) diff --git a/engine/code/cgame/cg_rally_hud.c b/engine/code/cgame/cg_rally_hud.c index a3a7cf3f..5ab907fe 100644 --- a/engine/code/cgame/cg_rally_hud.c +++ b/engine/code/cgame/cg_rally_hud.c @@ -836,17 +836,17 @@ static float CG_DrawSDKMessage( float y ) { } x = 4; - w = (CG_DrawStrlen("This represents not the finished Game") * TINYCHAR_WIDTH); + w = (CG_DrawStrlen("does not represent the finished game.") * TINYCHAR_WIDTH); y -= 3*TINYCHAR_HEIGHT+2; CG_FillRect( x, y, w, 3*TINYCHAR_HEIGHT+2, bg_color ); - CG_DrawTinyStringColor( x, y, GAME_VERSION, colorWhite); + CG_DrawTinyStringColor( x, y, Q3_VERSION, colorWhite); y += TINYCHAR_HEIGHT; - CG_DrawTinyStringColor( x, y, "For Development Purposes Only", colorWhite); + CG_DrawTinyStringColor( x, y, "For development purposes only, this", colorWhite); y += TINYCHAR_HEIGHT; - CG_DrawTinyStringColor( x, y, "This represents not the finished Game", colorWhite); + CG_DrawTinyStringColor( x, y, "does not represent the finished game.", colorWhite); y += TINYCHAR_HEIGHT; y -= 3*TINYCHAR_HEIGHT+2; diff --git a/engine/code/game/bg_public.h b/engine/code/game/bg_public.h index 74efd411..af92ca77 100644 --- a/engine/code/game/bg_public.h +++ b/engine/code/game/bg_public.h @@ -30,9 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // because games can change separately from the main system version, we need a // second version that must match between game and cgame -// STONELANCE -#define GAME_VERSION "Q3Rally v0.0.0.3" -// END +#define GAME_VERSION Q3_VERSION // BASEGAME "-1" #define DEFAULT_GRAVITY 800 #define GIB_HEALTH -40 diff --git a/engine/code/game/g_local.h b/engine/code/game/g_local.h index 92d74b56..59f5317e 100644 --- a/engine/code/game/g_local.h +++ b/engine/code/game/g_local.h @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA //================================================================== // the "gameversion" client command will print this plus compile date -#define GAMEVERSION BASEGAME +#define GAMEVERSION Q3_VERSION // BASEGAME #define BODY_QUEUE_SIZE 8 diff --git a/engine/code/game/g_main.c b/engine/code/game/g_main.c index 3db308ae..7ab10ad1 100644 --- a/engine/code/game/g_main.c +++ b/engine/code/game/g_main.c @@ -133,10 +133,7 @@ static cvarTable_t gameCvarTable[] = { { &g_cheats, "sv_cheats", "", 0, 0, qfalse }, // noset vars -// STOENLANCE - use GAME_VERSION -// { NULL, "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, - { NULL, "gamename", GAME_VERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, -// END + { NULL, "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, { NULL, "gamedate", __DATE__ , CVAR_ROM, 0, qfalse }, { &g_restarted, "g_restarted", "0", CVAR_ROM, 0, qfalse }, { NULL, "sv_mapname", "", CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, @@ -526,10 +523,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) { int i; G_Printf ("------- Game Initialization -------\n"); -// STONELANCE - use GAME_VERSION -// G_Printf ("gamename: %s\n", GAMEVERSION); - G_Printf ("gamename: %s\n", GAME_VERSION); -// END + G_Printf ("gamename: %s\n", GAMEVERSION); G_Printf ("gamedate: %s\n", __DATE__); srand( randomSeed ); diff --git a/engine/code/q3_ui/ui_menu.c b/engine/code/q3_ui/ui_menu.c index a7611ccc..4296e75c 100644 --- a/engine/code/q3_ui/ui_menu.c +++ b/engine/code/q3_ui/ui_menu.c @@ -427,15 +427,15 @@ static void Main_MenuDraw( void ) { if (uis.demoversion) { // STONELANCE UI_DrawProportionalString( 320, 432, "DEMO FOR MATURE AUDIENCES DEMO", UI_CENTER|UI_SMALLFONT, text_color_normal ); - //UI_DrawString( 320, 460, GAME_VERSION " (c) 2002 - 2009 New Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); - UI_DrawString( 320, 460, GAME_VERSION " (c) 2002 - 2011 Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); + //UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2009 New Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); + UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2011 Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); // UI_DrawProportionalString( 320, 372, "DEMO FOR MATURE AUDIENCES DEMO", UI_CENTER|UI_SMALLFONT, color ); // UI_DrawString( 320, 400, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color ); // END } else { // STONELANCE - //UI_DrawString( 320, 460, GAME_VERSION " (c) 2002 - 2009 New Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); - UI_DrawString( 320, 460, GAME_VERSION " (c) 2002 - 2011 Team Q3Rally | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); + //UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2009 New Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); + UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2011 Team Q3Rally | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); // UI_DrawString( 320, 450, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color ); // END } diff --git a/engine/code/q3_ui/ui_rally_credits.c b/engine/code/q3_ui/ui_rally_credits.c index 6b69da92..8cfbd5f2 100644 --- a/engine/code/q3_ui/ui_rally_credits.c +++ b/engine/code/q3_ui/ui_rally_credits.c @@ -63,14 +63,14 @@ static void UI_Rally_CreditMenu_Draw( void ) { UI_DrawProportionalString( 320, y, "Programming until V1.2:", UI_CENTER|UI_SMALLFONT, color_white ); y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; UI_DrawProportionalString( 320, y, "Steve \"Stone Lance\" Heijster", UI_CENTER|UI_SMALLFONT, color_white ); - y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; + y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; UI_DrawProportionalString( 320, y, "Per \"Perle\" Thormann", UI_CENTER|UI_SMALLFONT, color_white ); y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; UI_DrawProportionalString( 320, y, "Art and Models:", UI_CENTER|UI_SMALLFONT, color_white ); y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; UI_DrawProportionalString( 320, y, "Jeff \"Stecki\" Garstecki", UI_CENTER|UI_SMALLFONT, color_white ); - y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; + y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; UI_DrawProportionalString( 320, y, "\"Steel Painter\"", UI_CENTER|UI_SMALLFONT, color_white ); y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; @@ -99,7 +99,7 @@ static void UI_Rally_CreditMenu_Draw( void ) { UI_DrawProportionalString( 320, y, "Cyberdemon, Killaz and skw|d", UI_CENTER|UI_SMALLFONT, color_white ); y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; - UI_DrawString( 320, y, GAME_VERSION " (c) 2002 - 2009 Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); + UI_DrawString( 320, y, Q3_VERSION " (c) 2002 - 2011 Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); } diff --git a/engine/code/q3_ui/ui_rally_servers.c b/engine/code/q3_ui/ui_rally_servers.c index 5a95debe..c9d29076 100644 --- a/engine/code/q3_ui/ui_rally_servers.c +++ b/engine/code/q3_ui/ui_rally_servers.c @@ -801,15 +801,6 @@ static void ArenaServers_Insert( char* adrstr, char* info, int pingtime ) //remove //trap_Cmd_ExecuteText( EXEC_NOW, va( "echo infostring: %s\n", info ) ); -// STONELANCE - s = Info_ValueForKey( info, "game"); - - // only list q3rally servers -// if( Q_stricmp( s, GAME_VERSION ) ) { -// return; -// } -// END - if (*g_arenaservers.numservers >= g_arenaservers.maxservers) { // list full; servernodeptr = g_arenaservers.serverlist+(*g_arenaservers.numservers)-1; diff --git a/engine/code/q3_ui/ui_servers2.c b/engine/code/q3_ui/ui_servers2.c index 78945eef..c511dc98 100644 --- a/engine/code/q3_ui/ui_servers2.c +++ b/engine/code/q3_ui/ui_servers2.c @@ -730,19 +730,6 @@ static void ArenaServers_Insert( char* adrstr, char* info, int pingtime ) //remove //trap_Cmd_ExecuteText( EXEC_NOW, va( "echo infostring: %s\n", info ) ); -// STONELANCE - s = Info_ValueForKey( info, "game"); - - Com_Printf("game %s\n", s); - // only list q3rally servers -// UPDATE - enable this -/* - if( Q_stricmp( s, GAME_VERSION ) ) { - return; - } -*/ -// END - if (*g_arenaservers.numservers >= g_arenaservers.maxservers) { // list full; servernodeptr = g_arenaservers.serverlist+(*g_arenaservers.numservers)-1; diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index 16247f03..e56347c7 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -55,7 +55,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define BASETA "missionpack" #ifndef PRODUCT_VERSION - #define PRODUCT_VERSION "1.36" + #define PRODUCT_VERSION "v0.0.0.3" #endif #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION