q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2025-02-17 17:51:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Unified version (mostly), update VERSION in Makefile and PRODUCT_VERSION in q_shared.h. Sets version everywhere instead of just qvms.

Browse source 
- Modified 'not finished game' message in cg_rally_hud.c to be better English
This commit is contained in:
zturtleman 2011-07-30 15:11:52 +00:00
parent b9967186a8
commit 192e84a933
10 changed files with 17 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/Makefile
View file

@ -224,7 +224,7 @@ ifneq ($(BUILD_CLIENT),0)
endif endif
# version info # version info
VERSION=0.1 VERSION=v0.0.0.3
USE_SVN= USE_SVN=
ifeq ($(wildcard .svn),.svn) ifeq ($(wildcard .svn),.svn)

8
engine/code/cgame/cg_rally_hud.c
View file

@ -836,17 +836,17 @@ static float CG_DrawSDKMessage( float y ) {
} }
x = 4; 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; y -= 3*TINYCHAR_HEIGHT+2;
CG_FillRect( x, y, w, 3*TINYCHAR_HEIGHT+2, bg_color ); 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; 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; 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 += TINYCHAR_HEIGHT;
y -= 3*TINYCHAR_HEIGHT+2; y -= 3*TINYCHAR_HEIGHT+2;

4
engine/code/game/bg_public.h
View file

@ -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 // because games can change separately from the main system version, we need a
// second version that must match between game and cgame // second version that must match between game and cgame
// STONELANCE #define GAME_VERSION Q3_VERSION // BASEGAME "-1"
#define GAME_VERSION "Q3Rally v0.0.0.3"
// END
#define DEFAULT_GRAVITY 800 #define DEFAULT_GRAVITY 800
#define GIB_HEALTH -40 #define GIB_HEALTH -40

2
engine/code/game/g_local.h
View file

@ -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 // the "gameversion" client command will print this plus compile date
#define GAMEVERSION BASEGAME #define GAMEVERSION Q3_VERSION // BASEGAME
#define BODY_QUEUE_SIZE 8 #define BODY_QUEUE_SIZE 8

10
engine/code/game/g_main.c
View file

@ -133,10 +133,7 @@ static cvarTable_t gameCvarTable[] = {
{ &g_cheats, "sv_cheats", "", 0, 0, qfalse }, { &g_cheats, "sv_cheats", "", 0, 0, qfalse },
// noset vars // noset vars
// STOENLANCE - use GAME_VERSION { NULL, "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse },
// { NULL, "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse },
{ NULL, "gamename", GAME_VERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse },
// END
{ NULL, "gamedate", __DATE__ , CVAR_ROM, 0, qfalse }, { NULL, "gamedate", __DATE__ , CVAR_ROM, 0, qfalse },
{ &g_restarted, "g_restarted", "0", CVAR_ROM, 0, qfalse }, { &g_restarted, "g_restarted", "0", CVAR_ROM, 0, qfalse },
{ NULL, "sv_mapname", "", CVAR_SERVERINFO | 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; int i;
G_Printf ("------- Game Initialization -------\n"); G_Printf ("------- Game Initialization -------\n");
// STONELANCE - use GAME_VERSION G_Printf ("gamename: %s\n", GAMEVERSION);
// G_Printf ("gamename: %s\n", GAMEVERSION);
G_Printf ("gamename: %s\n", GAME_VERSION);
// END
G_Printf ("gamedate: %s\n", __DATE__); G_Printf ("gamedate: %s\n", __DATE__);
srand( randomSeed ); srand( randomSeed );

8
engine/code/q3_ui/ui_menu.c
View file

@ -427,15 +427,15 @@ static void Main_MenuDraw( void ) {
if (uis.demoversion) { if (uis.demoversion) {
// STONELANCE // STONELANCE
UI_DrawProportionalString( 320, 432, "DEMO FOR MATURE AUDIENCES DEMO", UI_CENTER|UI_SMALLFONT, text_color_normal ); 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, Q3_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 - 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_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 ); // UI_DrawString( 320, 400, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color );
// END // END
} else { } else {
// STONELANCE // 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, Q3_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 - 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 ); // UI_DrawString( 320, 450, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color );
// END // END
} }

6
engine/code/q3_ui/ui_rally_credits.c
View file

@ -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 ); UI_DrawProportionalString( 320, y, "Programming until V1.2:", UI_CENTER|UI_SMALLFONT, color_white );
y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE;
UI_DrawProportionalString( 320, y, "Steve \"Stone Lance\" Heijster", UI_CENTER|UI_SMALLFONT, color_white ); 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 ); UI_DrawProportionalString( 320, y, "Per \"Perle\" Thormann", UI_CENTER|UI_SMALLFONT, color_white );
y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE;
UI_DrawProportionalString( 320, y, "Art and Models:", UI_CENTER|UI_SMALLFONT, color_white ); UI_DrawProportionalString( 320, y, "Art and Models:", UI_CENTER|UI_SMALLFONT, color_white );
y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; y += PROP_HEIGHT * PROP_SMALL_SIZE_SCALE;
UI_DrawProportionalString( 320, y, "Jeff \"Stecki\" Garstecki", UI_CENTER|UI_SMALLFONT, color_white ); 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 ); UI_DrawProportionalString( 320, y, "\"Steel Painter\"", UI_CENTER|UI_SMALLFONT, color_white );
y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; 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 ); UI_DrawProportionalString( 320, y, "Cyberdemon, Killaz and skw|d", UI_CENTER|UI_SMALLFONT, color_white );
y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; 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 );
} }

9
engine/code/q3_ui/ui_rally_servers.c
View file

@ -801,15 +801,6 @@ static void ArenaServers_Insert( char* adrstr, char* info, int pingtime )
//remove //remove
//trap_Cmd_ExecuteText( EXEC_NOW, va( "echo infostring: %s\n", info ) ); //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) { if (*g_arenaservers.numservers >= g_arenaservers.maxservers) {
// list full; // list full;
servernodeptr = g_arenaservers.serverlist+(*g_arenaservers.numservers)-1; servernodeptr = g_arenaservers.serverlist+(*g_arenaservers.numservers)-1;

13
engine/code/q3_ui/ui_servers2.c
View file

@ -730,19 +730,6 @@ static void ArenaServers_Insert( char* adrstr, char* info, int pingtime )
//remove //remove
//trap_Cmd_ExecuteText( EXEC_NOW, va( "echo infostring: %s\n", info ) ); //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) { if (*g_arenaservers.numservers >= g_arenaservers.maxservers) {
// list full; // list full;
servernodeptr = g_arenaservers.serverlist+(*g_arenaservers.numservers)-1; servernodeptr = g_arenaservers.serverlist+(*g_arenaservers.numservers)-1;

2
engine/code/qcommon/q_shared.h
View file

@ -55,7 +55,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack" #define BASETA "missionpack"
#ifndef PRODUCT_VERSION #ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "1.36" #define PRODUCT_VERSION "v0.0.0.3"
#endif #endif
#define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION