q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-24 21:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

changed "SIGIL" to "Control Point"

Browse source 
changed "Regenaration" to "Auto Repair"
Modified the Chat position
This commit is contained in:
q3rally 2021-09-21 12:46:07 +00:00
parent 9e7dd83cef
commit 84d8c60a4e
6 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
engine/code/client/cl_console.c
View file

@ -573,7 +573,7 @@ void Con_DrawNotify (void)
currentColor = 7; currentColor = 7;
re.SetColor( g_color_table[currentColor] ); re.SetColor( g_color_table[currentColor] );
v = 0; v = 336;
for (i= con.current-NUM_CON_TIMES+1 ; i<=con.current ; i++) for (i= con.current-NUM_CON_TIMES+1 ; i<=con.current ; i++)
{ {
if (i < 0) if (i < 0)
@ -582,7 +582,7 @@ void Con_DrawNotify (void)
if (time == 0) if (time == 0)
continue; continue;
time = cls.realtime - time; time = cls.realtime - time;
if (time > con_notifytime->value*1000) if (time > con_notifytime->value*2000)
continue; continue;
text = con.text + (i % con.totallines)*con.linewidth; text = con.text + (i % con.totallines)*con.linewidth;
@ -598,7 +598,7 @@ void Con_DrawNotify (void)
currentColor = ColorIndexForNumber( text[x]>>8 ); currentColor = ColorIndexForNumber( text[x]>>8 );
re.SetColor( g_color_table[currentColor] ); 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; v += SMALLCHAR_HEIGHT;
@ -615,12 +615,12 @@ void Con_DrawNotify (void)
{ {
if (chat_team) if (chat_team)
{ {
SCR_DrawBigString (8, v, "say_team:", 1.0f, qfalse ); SCR_DrawBigString (8, v, "Team Chat:", 1.0f, qfalse );
skip = 10; skip = 10;
} }
else else
{ {
SCR_DrawBigString (8, v, "say:", 1.0f, qfalse ); SCR_DrawBigString (8, v, "Chat:", 1.0f, qfalse );
skip = 5; skip = 5;
} }

2
engine/code/game/ai_cmd.c
View file

@ -1517,7 +1517,7 @@ void BotMatch_WhereAreYou(bot_state_t *bs, bot_match_t *match) {
"Lightning Gun", "Lightning Gun",
"BFG10K", "BFG10K",
"Quad Damage", "Quad Damage",
"Regeneration", "Auto Repair",
"Battle Suit", "Battle Suit",
"Speed", "Speed",
"Invisibility", "Invisibility",

2
engine/code/game/ai_dmq3.c
View file

@ -2594,7 +2594,7 @@ void BotGoForPowerups(bot_state_t *bs) {
//don't avoid any of the powerups anymore //don't avoid any of the powerups anymore
BotDontAvoid(bs, "Quad Damage"); BotDontAvoid(bs, "Quad Damage");
BotDontAvoid(bs, "Regeneration"); BotDontAvoid(bs, "Auto Repair");
BotDontAvoid(bs, "Battle Suit"); BotDontAvoid(bs, "Battle Suit");
BotDontAvoid(bs, "Speed"); BotDontAvoid(bs, "Speed");
BotDontAvoid(bs, "Invisibility"); BotDontAvoid(bs, "Invisibility");

12
engine/code/game/bg_misc.c
View file

@ -812,7 +812,7 @@ gitem_t bg_itemlist[] =
// END // END
NULL, NULL }, NULL, NULL },
/* icon */ "icons/regen", /* icon */ "icons/regen",
/* pickup */ "Regeneration", /* pickup */ "Auto Repair",
30, 30,
IT_POWERUP, IT_POWERUP,
PW_REGEN, PW_REGEN,
@ -901,7 +901,7 @@ Only in Domination games
{ "models/flags/r_sigil.md3", { "models/flags/r_sigil.md3",
0, 0, 0 }, 0, 0, 0 },
/* icon */ "icons/icons_red", /* icon */ "icons/icons_red",
/* pickup */ "Sigil", /* pickup */ "Control Point",
0, 0,
IT_SIGIL, IT_SIGIL,
PW_SIGILRED, PW_SIGILRED,
@ -918,7 +918,7 @@ Only in Domination games
{ "models/flags/b_sigil.md3", { "models/flags/b_sigil.md3",
0, 0, 0 }, 0, 0, 0 },
/* icon */ "icons/icons_blu", /* icon */ "icons/icons_blu",
/* pickup */ "Sigil", /* pickup */ "Control Point",
0, 0,
IT_SIGIL, IT_SIGIL,
PW_SIGILBLUE, PW_SIGILBLUE,
@ -935,7 +935,7 @@ Only in Domination games
{ "models/flags/g_sigil.md3", { "models/flags/g_sigil.md3",
0, 0, 0 }, 0, 0, 0 },
/* icon */ "icons/icons_green", /* icon */ "icons/icons_green",
/* pickup */ "Sigil", /* pickup */ "Control Point",
0, 0,
IT_SIGIL, IT_SIGIL,
PW_SIGILGREEN, PW_SIGILGREEN,
@ -952,7 +952,7 @@ Only in Domination games
{ "models/flags/y_sigil.md3", { "models/flags/y_sigil.md3",
0, 0, 0 }, 0, 0, 0 },
/* icon */ "icons/icons_yellow", /* icon */ "icons/icons_yellow",
/* pickup */ "Sigil", /* pickup */ "Control Point",
0, 0,
IT_SIGIL, IT_SIGIL,
PW_SIGILYELLOW, PW_SIGILYELLOW,
@ -969,7 +969,7 @@ Only in Domination games
{ "models/flags/n_sigil.md3", { "models/flags/n_sigil.md3",
0, 0, 0 }, 0, 0, 0 },
/* icon */ "icons/icons_neutral", /* icon */ "icons/icons_neutral",
/* pickup */ "Sigil", /* pickup */ "Control Point",
0, 0,
IT_SIGIL, IT_SIGIL,
PW_SIGILWHITE, PW_SIGILWHITE,

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

@ -67,7 +67,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 "v0.3c_r434" #define PRODUCT_VERSION "v0.3c_r436"
#endif #endif
@ -1148,7 +1148,7 @@ typedef struct {
// in order from highest priority to lowest // in order from highest priority to lowest
// if none of the catchers are active, bound key strings will be executed // if none of the catchers are active, bound key strings will be executed
#define KEYCATCH_CONSOLE 0x0001 #define KEYCATCH_CONSOLE 0x0001
#define KEYCATCH_UI 0x0002 #define KEYCATCH_UI 0x0002
#define KEYCATCH_MESSAGE 0x0004 #define KEYCATCH_MESSAGE 0x0004
#define KEYCATCH_CGAME 0x0008 #define KEYCATCH_CGAME 0x0008

52
q3rallycode.ppr
View file

@ -886,33 +886,33 @@ q3rallycode
engine\cross-make-mingw64.sh engine\cross-make-mingw64.sh
[Open project files] [Open project files]
0=engine\code\qcommon\q_shared.h 0=engine\code\qcommon\q_shared.h
1=engine\code\game\g_spawn.c 1=engine\code\game\bg_misc.c
2=engine\code\game\g_target.c 2=engine\code\game\ai_cmd.c
3=engine\code\cgame\cg_rally_platetools.c 3=engine\code\game\ai_dmq3.c
4=engine\code\cgame\cg_main.c 4=engine\code\cgame\cg_local.h
5=engine\code\client\cl_main.c 5=engine\code\client\cl_console.c
6=engine\code\q3_ui\ui_qmenu.c 6=engine\code\client\cl_scrn.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\cgame\cg_main.c Selected=engine\code\qcommon\q_shared.h
[engine\code\qcommon\q_shared.h] [engine\code\qcommon\q_shared.h]
TopLine=59 TopLine=57
Caret=36,70 Caret=36,70
[engine\code\game\g_spawn.c] [engine\code\game\bg_misc.c]
TopLine=134 TopLine=799
Caret=1,153 Caret=26,815
[engine\code\game\g_target.c] [engine\code\game\ai_cmd.c]
TopLine=24 TopLine=1504
Caret=3,41 Caret=15,1520
[engine\code\cgame\cg_rally_platetools.c] [engine\code\game\ai_dmq3.c]
TopLine=127 TopLine=2581
Caret=38,151 Caret=31,2597
[engine\code\cgame\cg_main.c] [engine\code\cgame\cg_local.h]
TopLine=2159 TopLine=732
Caret=72,2175 Caret=1,748
[engine\code\client\cl_main.c] [engine\code\client\cl_console.c]
TopLine=3114 TopLine=559
Caret=61,3130 Caret=9,576
[engine\code\q3_ui\ui_qmenu.c] [engine\code\client\cl_scrn.c]
TopLine=2219 TopLine=231
Caret=66,2235 Caret=1,191