nzp-team
/
quakespasm
mirror of https://github.com/nzp-team/quakespasm.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restored missing entity fields 

iframetime
bleed_out
Weapon_Name
This commit is contained in:
Tyler Young 2023-01-22 19:31:48 -05:00
parent c7ba1d40e5
commit ed0f1379b1
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/gl_hud.c
View File

@ -1580,6 +1580,7 @@ void HUD_Weapon (void)
#else #else
y_value = vid.height - 16 - fragpic->height - 4 - 16; y_value = vid.height - 16 - fragpic->height - 4 - 16;
#endif #endif
//strcpy(str, pr_strings+sv_player->v.Weapon_Name);
strcpy(str, GetWeaponName(cl.stats[STAT_ACTIVEWEAPON])); strcpy(str, GetWeaponName(cl.stats[STAT_ACTIVEWEAPON]));
l = strlen(str); l = strlen(str);
#ifdef VITA #ifdef VITA

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, 150); Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 1);
// 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, 220, 220, 220, 220); Draw_FillByColor(10, y + 90, 240, 3, 220, 220, 220, 0.8);
// 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, 220, 220, 220, 220); Draw_FillByColor(10, y + 135, 240, 3, 220, 220, 220, 0.8);
// 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, 220, 220, 220, 220); Draw_FillByColor(10, y + 165, 240, 3, 220, 220, 220, 0.8);
// 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, 220, 220, 220, 220); Draw_FillByColor(10, y + 135, 240, 3, 220, 220, 220, 0.8);
// 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, 220, 220, 220, 220); Draw_FillByColor(10, y + 105, 240, 3, 220, 220, 220, 0.8);
// Console // Console
if (options_cursor == 3) if (options_cursor == 3)

3
source/progdefs.q1
View File

@ -76,6 +76,7 @@ typedef struct
string_t model; string_t model;
float frame; float frame;
float skin; float skin;
float iframetime;
float effects; float effects;
vec3_t mins; vec3_t mins;
vec3_t maxs; vec3_t maxs;
@ -143,6 +144,7 @@ typedef struct
string_t targetname; string_t targetname;
float dmg_take; float dmg_take;
float dmg_save; float dmg_save;
float bleed_out;
float progress_bar; float progress_bar;
int dmg_inflictor; int dmg_inflictor;
int owner; int owner;
@ -155,6 +157,7 @@ typedef struct
string_t noise3; string_t noise3;
float x2_icon; float x2_icon;
float insta_icon; float insta_icon;
string_t Weapon_Name;
string_t Weapon_Name_Touch; string_t Weapon_Name_Touch;
vec3_t ADS_Offset; vec3_t ADS_Offset;
vec3_t Flash_Offset; vec3_t Flash_Offset;