From 84d8c60a4e0b29016cf182e0c8e4c44703ff3086 Mon Sep 17 00:00:00 2001 From: q3rally Date: Tue, 21 Sep 2021 12:46:07 +0000 Subject: [PATCH] changed "SIGIL" to "Control Point" changed "Regenaration" to "Auto Repair" Modified the Chat position --- engine/code/client/cl_console.c | 10 +++---- engine/code/game/ai_cmd.c | 2 +- engine/code/game/ai_dmq3.c | 2 +- engine/code/game/bg_misc.c | 12 ++++---- engine/code/qcommon/q_shared.h | 4 +-- q3rallycode.ppr | 52 ++++++++++++++++----------------- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/engine/code/client/cl_console.c b/engine/code/client/cl_console.c index 6a65bb79..9a471472 100644 --- a/engine/code/client/cl_console.c +++ b/engine/code/client/cl_console.c @@ -573,7 +573,7 @@ void Con_DrawNotify (void) currentColor = 7; re.SetColor( g_color_table[currentColor] ); - v = 0; + v = 336; for (i= con.current-NUM_CON_TIMES+1 ; i<=con.current ; i++) { if (i < 0) @@ -582,7 +582,7 @@ void Con_DrawNotify (void) if (time == 0) continue; time = cls.realtime - time; - if (time > con_notifytime->value*1000) + if (time > con_notifytime->value*2000) continue; text = con.text + (i % con.totallines)*con.linewidth; @@ -598,7 +598,7 @@ void Con_DrawNotify (void) currentColor = ColorIndexForNumber( text[x]>>8 ); re.SetColor( g_color_table[currentColor] ); } - SCR_DrawSmallChar( cl_conXOffset->integer + con.xadjust + (x+1)*SMALLCHAR_WIDTH, v, text[x] & 0xff ); + SCR_DrawSmallChar( cl_conXOffset->integer + con.xadjust + (x+1)*SMALLCHAR_WIDTH, v-336, text[x] & 0xff ); } v += SMALLCHAR_HEIGHT; @@ -615,12 +615,12 @@ void Con_DrawNotify (void) { if (chat_team) { - SCR_DrawBigString (8, v, "say_team:", 1.0f, qfalse ); + SCR_DrawBigString (8, v, "Team Chat:", 1.0f, qfalse ); skip = 10; } else { - SCR_DrawBigString (8, v, "say:", 1.0f, qfalse ); + SCR_DrawBigString (8, v, "Chat:", 1.0f, qfalse ); skip = 5; } diff --git a/engine/code/game/ai_cmd.c b/engine/code/game/ai_cmd.c index 5593c6d5..e842e8e0 100644 --- a/engine/code/game/ai_cmd.c +++ b/engine/code/game/ai_cmd.c @@ -1517,7 +1517,7 @@ void BotMatch_WhereAreYou(bot_state_t *bs, bot_match_t *match) { "Lightning Gun", "BFG10K", "Quad Damage", - "Regeneration", + "Auto Repair", "Battle Suit", "Speed", "Invisibility", diff --git a/engine/code/game/ai_dmq3.c b/engine/code/game/ai_dmq3.c index bb293def..8237f362 100644 --- a/engine/code/game/ai_dmq3.c +++ b/engine/code/game/ai_dmq3.c @@ -2594,7 +2594,7 @@ void BotGoForPowerups(bot_state_t *bs) { //don't avoid any of the powerups anymore BotDontAvoid(bs, "Quad Damage"); - BotDontAvoid(bs, "Regeneration"); + BotDontAvoid(bs, "Auto Repair"); BotDontAvoid(bs, "Battle Suit"); BotDontAvoid(bs, "Speed"); BotDontAvoid(bs, "Invisibility"); diff --git a/engine/code/game/bg_misc.c b/engine/code/game/bg_misc.c index db79932f..4c2097e5 100644 --- a/engine/code/game/bg_misc.c +++ b/engine/code/game/bg_misc.c @@ -812,7 +812,7 @@ gitem_t bg_itemlist[] = // END NULL, NULL }, /* icon */ "icons/regen", -/* pickup */ "Regeneration", +/* pickup */ "Auto Repair", 30, IT_POWERUP, PW_REGEN, @@ -901,7 +901,7 @@ Only in Domination games { "models/flags/r_sigil.md3", 0, 0, 0 }, /* icon */ "icons/icons_red", -/* pickup */ "Sigil", +/* pickup */ "Control Point", 0, IT_SIGIL, PW_SIGILRED, @@ -918,7 +918,7 @@ Only in Domination games { "models/flags/b_sigil.md3", 0, 0, 0 }, /* icon */ "icons/icons_blu", -/* pickup */ "Sigil", +/* pickup */ "Control Point", 0, IT_SIGIL, PW_SIGILBLUE, @@ -935,7 +935,7 @@ Only in Domination games { "models/flags/g_sigil.md3", 0, 0, 0 }, /* icon */ "icons/icons_green", -/* pickup */ "Sigil", +/* pickup */ "Control Point", 0, IT_SIGIL, PW_SIGILGREEN, @@ -952,7 +952,7 @@ Only in Domination games { "models/flags/y_sigil.md3", 0, 0, 0 }, /* icon */ "icons/icons_yellow", -/* pickup */ "Sigil", +/* pickup */ "Control Point", 0, IT_SIGIL, PW_SIGILYELLOW, @@ -969,7 +969,7 @@ Only in Domination games { "models/flags/n_sigil.md3", 0, 0, 0 }, /* icon */ "icons/icons_neutral", -/* pickup */ "Sigil", +/* pickup */ "Control Point", 0, IT_SIGIL, PW_SIGILWHITE, diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index 8785fd40..0ea55d49 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define BASETA "missionpack" #ifndef PRODUCT_VERSION -#define PRODUCT_VERSION "v0.3c_r434" +#define PRODUCT_VERSION "v0.3c_r436" #endif @@ -1148,7 +1148,7 @@ typedef struct { // in order from highest priority to lowest // if none of the catchers are active, bound key strings will be executed #define KEYCATCH_CONSOLE 0x0001 -#define KEYCATCH_UI 0x0002 +#define KEYCATCH_UI 0x0002 #define KEYCATCH_MESSAGE 0x0004 #define KEYCATCH_CGAME 0x0008 diff --git a/q3rallycode.ppr b/q3rallycode.ppr index 082acee2..424543df 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -886,33 +886,33 @@ q3rallycode engine\cross-make-mingw64.sh [Open project files] 0=engine\code\qcommon\q_shared.h -1=engine\code\game\g_spawn.c -2=engine\code\game\g_target.c -3=engine\code\cgame\cg_rally_platetools.c -4=engine\code\cgame\cg_main.c -5=engine\code\client\cl_main.c -6=engine\code\q3_ui\ui_qmenu.c +1=engine\code\game\bg_misc.c +2=engine\code\game\ai_cmd.c +3=engine\code\game\ai_dmq3.c +4=engine\code\cgame\cg_local.h +5=engine\code\client\cl_console.c +6=engine\code\client\cl_scrn.c [Selected Project Files] Main= -Selected=engine\code\cgame\cg_main.c +Selected=engine\code\qcommon\q_shared.h [engine\code\qcommon\q_shared.h] -TopLine=59 +TopLine=57 Caret=36,70 -[engine\code\game\g_spawn.c] -TopLine=134 -Caret=1,153 -[engine\code\game\g_target.c] -TopLine=24 -Caret=3,41 -[engine\code\cgame\cg_rally_platetools.c] -TopLine=127 -Caret=38,151 -[engine\code\cgame\cg_main.c] -TopLine=2159 -Caret=72,2175 -[engine\code\client\cl_main.c] -TopLine=3114 -Caret=61,3130 -[engine\code\q3_ui\ui_qmenu.c] -TopLine=2219 -Caret=66,2235 +[engine\code\game\bg_misc.c] +TopLine=799 +Caret=26,815 +[engine\code\game\ai_cmd.c] +TopLine=1504 +Caret=15,1520 +[engine\code\game\ai_dmq3.c] +TopLine=2581 +Caret=31,2597 +[engine\code\cgame\cg_local.h] +TopLine=732 +Caret=1,748 +[engine\code\client\cl_console.c] +TopLine=559 +Caret=9,576 +[engine\code\client\cl_scrn.c] +TopLine=231 +Caret=1,191