nzp-team/quakespasm
0
0
Fork 0
mirror of https://github.com/nzp-team/quakespasm.git synced 2024-11-10 06:32:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #15 from ScatterBox/main

Browse source
This commit is contained in:
Ian 2023-01-22 17:43:07 -05:00 committed by GitHub
commit 3b0ff2abec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4974 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/gl_hud.c
View file

@ -1440,11 +1440,11 @@ void HUD_Grenades (void)
if (cl.stats[STAT_GRENADES] & UI_BETTY) if (cl.stats[STAT_GRENADES] & UI_BETTY)
{ {
#ifdef VITA #ifdef VITA
Draw_StretchPic (x_value - fragpic->width - 5, y_value, bettypic, 64, 64); Draw_StretchPic (x_value + fragpic->width + 15, y_value, bettypic, 64, 64);
if (cl.stats[STAT_PRIGRENADES] <= 0) { if (cl.stats[STAT_PRIGRENADES] <= 0) {
Draw_ColoredStringScale (x_value + 36, y_value + 44, va ("%i",cl.stats[STAT_SECGRENADES]), 1, 0, 0, 1, 2.0f); Draw_ColoredStringScale (x_value + 46, y_value + 44, va ("%i",cl.stats[STAT_SECGRENADES]), 1, 0, 0, 1, 2.0f);
} else { } else {
Draw_ColoredStringScale (x_value - fragpic->width + 32, y_value + 44, va ("%i",cl.stats[STAT_SECGRENADES]), 1, 1, 1, 1, 2.0f); Draw_ColoredStringScale (x_value + fragpic->width + 46, y_value + 44, va ("%i",cl.stats[STAT_SECGRENADES]), 1, 1, 1, 1, 2.0f);
} }
#else #else
Draw_Pic (x_value - fragpic->width - 5, y_value, bettypic); Draw_Pic (x_value - fragpic->width - 5, y_value, bettypic);
@ -1583,7 +1583,7 @@ void HUD_Weapon (void)
strcpy(str, GetWeaponName(cl.stats[STAT_ACTIVEWEAPON])); strcpy(str, GetWeaponName(cl.stats[STAT_ACTIVEWEAPON]));
l = strlen(str); l = strlen(str);
#ifdef VITA #ifdef VITA
x_value = vid.width - fragpic->width - 60 - l*16; x_value = vid.width - fragpic->width - 65 - l*16;
Draw_ColoredStringScale (x_value, y_value, str, 1, 1, 1, 1, 2.0f); Draw_ColoredStringScale (x_value, y_value, str, 1, 1, 1, 1, 2.0f);
#else #else
x_value = vid.width/2 - 8 - l*8; x_value = vid.width/2 - 8 - l*8;

12
source/menu.c
View file

@ -524,7 +524,7 @@ void M_Main_Draw (void)
Draw_BgMenu(); Draw_BgMenu();
// Fill black to make everything easier to see // Fill black to make everything easier to see
Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 0.4); Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 150);
// Version String // Version String
Draw_ColoredString(vid.width - 40, y + 5, NZP_VERSION, 1, 1, 1, 1); Draw_ColoredString(vid.width - 40, y + 5, NZP_VERSION, 1, 1, 1, 1);
@ -543,7 +543,7 @@ void M_Main_Draw (void)
Draw_ColoredStringScale(10, y + 70, "Co-Op (Coming Soon!)", 0.5, 0.5, 0.5, 1, 1.5f); Draw_ColoredStringScale(10, y + 70, "Co-Op (Coming Soon!)", 0.5, 0.5, 0.5, 1, 1.5f);
// Divider // Divider
Draw_FillByColor(10, y + 90, 240, 3, 1, 1, 1, 1); Draw_FillByColor(10, y + 90, 240, 3, 220, 220, 220, 220);
// Settings // Settings
if (m_main_cursor == 1) if (m_main_cursor == 1)
@ -555,7 +555,7 @@ void M_Main_Draw (void)
Draw_ColoredStringScale(10, y + 115, "Achievements", 0.5, 0.5, 0.5, 1, 1.5f); Draw_ColoredStringScale(10, y + 115, "Achievements", 0.5, 0.5, 0.5, 1, 1.5f);
// Divider // Divider
Draw_FillByColor(10, y + 135, 240, 3, 1, 1, 1, 1); Draw_FillByColor(10, y + 135, 240, 3, 220, 220, 220, 220);
// Credits // Credits
if (m_main_cursor == 2) if (m_main_cursor == 2)
@ -564,7 +564,7 @@ void M_Main_Draw (void)
Draw_ColoredStringScale(10, y + 145, "Credits", 1, 1, 1, 1, 1.5f); Draw_ColoredStringScale(10, y + 145, "Credits", 1, 1, 1, 1, 1.5f);
// Divider // Divider
Draw_FillByColor(10, y + 165, 240, 3, 1, 1, 1, 1); Draw_FillByColor(10, y + 165, 240, 3, 220, 220, 220, 220);
// Exit // Exit
if (m_main_cursor == 3) if (m_main_cursor == 3)
@ -851,7 +851,7 @@ void M_SinglePlayer_Draw (void)
Draw_ColoredStringScale(10, y + 115, "Christmas Special", 1, 1, 1, 1, 1.5f); Draw_ColoredStringScale(10, y + 115, "Christmas Special", 1, 1, 1, 1, 1.5f);
// Divider // Divider
Draw_FillByColor(10, y + 135, 240, 3, 1, 1, 1, 1); Draw_FillByColor(10, y + 135, 240, 3, 220, 220, 220, 220);
// Custom Maps // Custom Maps
if (m_singleplayer_cursor == 3) if (m_singleplayer_cursor == 3)
@ -1980,7 +1980,7 @@ void M_Options_Draw (void)
Draw_ColoredStringScale(10, y + 85, "Control Settings", 1, 1, 1, 1, 1.5f); Draw_ColoredStringScale(10, y + 85, "Control Settings", 1, 1, 1, 1, 1.5f);
// Divider // Divider
Draw_FillByColor(10, y + 105, 240, 3, 1, 1, 1, 1); Draw_FillByColor(10, y + 105, 240, 3, 220, 220, 220, 220);
// Console // Console
if (options_cursor == 3) if (options_cursor == 3)

3233
source/pr_cmds.c.bak
View file

File diff suppressed because it is too large Load diff

1731
source/sv_phys.c.bak
View file

File diff suppressed because it is too large Load diff