From ff05e4ca0152c7c7dd94f23802aab90f60153beb Mon Sep 17 00:00:00 2001 From: q3rally Date: Fri, 29 Apr 2016 22:17:40 +0000 Subject: [PATCH] Changed some version stuff... --- engine/code/q3_ui/ui_menu.c | 4 +-- engine/code/q3_ui/ui_rally_credits.c | 2 +- engine/code/qcommon/q_shared.h | 4 +-- engine/misc/nsis/Makefile | 2 +- q3rallycode.ppr | 42 ++++++++++++++++++++++++---- 5 files changed, 43 insertions(+), 11 deletions(-) diff --git a/engine/code/q3_ui/ui_menu.c b/engine/code/q3_ui/ui_menu.c index 58c1a58b..b931fcaa 100644 --- a/engine/code/q3_ui/ui_menu.c +++ b/engine/code/q3_ui/ui_menu.c @@ -428,14 +428,14 @@ static void Main_MenuDraw( void ) { // STONELANCE UI_DrawProportionalString( 320, 432, "DEMO FOR MATURE AUDIENCES DEMO", 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 - 2015 Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); + UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2016 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, 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 - 2015 | 13 Years now... | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); + UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2016 | 14 Years now... | 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 9bd7409d..d127403c 100644 --- a/engine/code/q3_ui/ui_rally_credits.c +++ b/engine/code/q3_ui/ui_rally_credits.c @@ -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, Q3_VERSION " (c) 2002 - 2014 | 12 Years now... | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); + UI_DrawString( 320, y, Q3_VERSION " (c) 2002 - 2016 | 14 Years now... | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); } diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index acb613ea..7c12e6ed 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define GAMENAME_FOR_MASTER "Q3Rally" // must NOT contain whitespace // #define LEGACY_PROTOCOL // You probably don't need this for your standalone game #else - #define PRODUCT_NAME "ioq3" + #define PRODUCT_NAME "Q3Rally" #define BASEGAME "baseq3" #define CLIENT_WINDOW_TITLE "ioquake3" #define CLIENT_WINDOW_MIN_TITLE "ioq3" @@ -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 "v0.0.0.4 r132" +#define PRODUCT_VERSION "v0.0.0.4 r134" #endif #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION diff --git a/engine/misc/nsis/Makefile b/engine/misc/nsis/Makefile index b0d8b86d..f9ddb921 100644 --- a/engine/misc/nsis/Makefile +++ b/engine/misc/nsis/Makefile @@ -1,5 +1,5 @@ ifndef VERSION -VERSION=v0.0.0.3 +VERSION=v0.0.0.4 endif ifndef RELEASE RELEASE=0 diff --git a/q3rallycode.ppr b/q3rallycode.ppr index 7dbb0d6b..9f32a7d9 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -857,13 +857,45 @@ q3rallycode engine\resync_svn.sh [Open project files] 0=engine\code\qcommon\q_shared.h -1=engine\code\cgame\cg_draw.c +1=engine\code\client\cl_curl.c +2=engine\code\qcommon\files.c +3=engine\code\sys\sys_win32.c +4=engine\misc\nsis\Makefile +5=engine\code\cgame\cg_rally_hud.c +6=engine\code\client\cl_console.c +7=engine\code\q3_ui\ui_menu.c +8=engine\code\q3_ui\ui_rally_credits.c +9=engine\code\qcommon\common.c [Selected Project Files] Main= Selected=engine\code\qcommon\q_shared.h [engine\code\qcommon\q_shared.h] -TopLine=42 -Caret=39,58 -[engine\code\cgame\cg_draw.c] +TopLine=15 +Caret=34,41 +[engine\code\client\cl_curl.c] +TopLine=236 +Caret=1,252 +[engine\code\qcommon\files.c] +TopLine=3473 +Caret=1,3489 +[engine\code\sys\sys_win32.c] +TopLine=657 +Caret=1,673 +[engine\misc\nsis\Makefile] TopLine=1 -Caret=1,1 +Caret=17,2 +[engine\code\cgame\cg_rally_hud.c] +TopLine=835 +Caret=1,851 +[engine\code\client\cl_console.c] +TopLine=632 +Caret=1,648 +[engine\code\q3_ui\ui_menu.c] +TopLine=414 +Caret=63,438 +[engine\code\q3_ui\ui_rally_credits.c] +TopLine=86 +Caret=65,102 +[engine\code\qcommon\common.c] +TopLine=2749 +Caret=1,2765