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

VITA/NX: Give crosshair control to server

Browse source
This commit is contained in:
cypress 2023-10-16 10:42:50 -04:00
parent 6fff93bd6a
commit 07b01ad46e
4 changed files with 91 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/cl_parse.c
View file

@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "bgmusic.h"
extern qboolean domaxammo;
qboolean crosshair_pulse_grenade;
const char *svc_strings[] =
{
@ -84,7 +85,7 @@ const char *svc_strings[] =
"svc_spawnstaticsound2", // 44 // [coord3] [short] samp [byte] vol [byte] aten
"svc_songegg", // 45
"svc_maxammo", // 46
"", // 47
"svc_pulse", // 47
"", // 48
"", // 49
"svc_bspdecal", // 50 // [string] name [byte] decal_size [coords] pos
@ -1545,6 +1546,9 @@ void CL_ParseServerMessage (void)
case svc_maxammo:
domaxammo = true;
break;
case svc_pulse:
crosshair_pulse_grenade = true;
break;
//case svc_bspdecal:
// CL_ParseBSPDecal ();

79
source/gl_screen.c
View file

@ -1536,6 +1536,7 @@ Draw_Crosshair
================
*/
extern qboolean paused_hack;
extern qboolean crosshair_pulse_grenade;
void SCR_DrawCrosshair (void)
{
if (paused_hack == true || m_state == m_exit) {
@ -1547,7 +1548,7 @@ void SCR_DrawCrosshair (void)
Draw_FillByColor(0, vid.height/2, vid.width, 1, 0, 255, 0, 255);
}
if (!crosshair.value)
if (cl.stats[STAT_HEALTH] <= 20)
return;
float col;
@ -1563,6 +1564,21 @@ void SCR_DrawCrosshair (void)
#else
GL_SetCanvas(CANVAS_USEPRINT);
#endif
if (cl.stats[STAT_ZOOM] == 2) {
GL_SetCanvas(CANVAS_DEFAULT);
Draw_AlphaStretchPic (0, 0, vid.width, vid.height, 255, sniper_scope);
}
if (Hitmark_Time > sv.time) {
Draw_Pic ((vid.width/2 - hitmark->width)/2,vid.height/2 + (vid.height/2 - hitmark->height)/2, hitmark);
}
// Make sure to do this after hitmark drawing.
if (cl.stats[STAT_ZOOM] == 2 || cl.stats[STAT_ZOOM] == 1) {
GL_SetCanvas(CANVAS_DEFAULT);
return;
}
if (crosshair_spread_time > sv.time && crosshair_spread_time)
{
cur_spread = cur_spread + 10;
@ -1579,15 +1595,13 @@ void SCR_DrawCrosshair (void)
}
}
if (cl.stats[STAT_ACTIVEWEAPON] == W_M2 || cl.stats[STAT_ACTIVEWEAPON] == W_TESLA || cl.stats[STAT_ACTIVEWEAPON] == W_FIW || cl.stats[STAT_ACTIVEWEAPON] == W_DG3)
{
Draw_CharacterRGBA ((vid.width)/4-4, (vid.height)*3/4, 'O', 255, col, col, 0.7);
int x_value, y_value;
int crosshair_offset;
}
else if (crosshair.value == 1 && cl.stats[STAT_ZOOM] != 1 && cl.stats[STAT_ZOOM] != 2 && cl.stats[STAT_ACTIVEWEAPON] != W_PANZER && cl.stats[STAT_ACTIVEWEAPON] != W_LONGINUS)
{
int x_value, y_value;
int crosshair_offset = CrossHairWeapon() + cur_spread;
// Standard crosshair (+)
if (crosshair.value == 1) {
x_value, y_value;
crosshair_offset = CrossHairWeapon() + cur_spread;
if (CrossHairMaxSpread() < crosshair_offset || croshhairmoving)
crosshair_offset = CrossHairMaxSpread();
@ -1612,18 +1626,47 @@ void SCR_DrawCrosshair (void)
y_value = (vid.height - 8)*3/4 + crosshair_offset_step;
Draw_CharacterRGBA (x_value, y_value, 157, 255, col, col, 0.7);
}
else if (crosshair.value && cl.stats[STAT_ZOOM] != 1 && cl.stats[STAT_ZOOM] != 2)
{
}
// Area of Effect (o)
else if (crosshair.value == 2) {
Draw_CharacterRGBA ((vid.width)/4-4, (vid.height)*3/4, 'O', 255, col, col, 0.7);
}
// Dot crosshair (.)
else if (crosshair.value == 3) {
Draw_CharacterRGBA ((vid.width - 8)/4/* + crosshair_x*/, (vid.height - 8)*3/4/* + crosshair_y*/, '.', 255, col, col, 0.7);
}
if (cl.stats[STAT_ZOOM] == 2) {
GL_SetCanvas(CANVAS_DEFAULT);
Draw_AlphaStretchPic (0, 0, vid.width, vid.height, 255, sniper_scope);
// Grenade crosshair
else if (crosshair.value == 4) {
if (crosshair_pulse_grenade) {
crosshair_offset_step = 0;
cur_spread = 2;
}
crosshair_pulse_grenade = false;
crosshair_offset = 12 + cur_spread;
crosshair_offset_step += (crosshair_offset - crosshair_offset_step) * 0.5;
x_value = ((vid.width - 8)/4) - crosshair_offset_step;
y_value = (vid.height - 8)*3/4;
Draw_CharacterRGBA (x_value, y_value, 158, 255, 255, 255, 0.7);
x_value = ((vid.width - 8)/4) + crosshair_offset_step;
y_value = (vid.height - 8)*3/4;
Draw_CharacterRGBA (x_value, y_value, 158, 255, 255, 255, 0.7);
x_value = ((vid.width - 8)/4);
y_value = (vid.height - 8)*3/4 - crosshair_offset_step;
Draw_CharacterRGBA (x_value, y_value, 157, 255, 255, 255, 0.7);
x_value = ((vid.width - 8)/4);
y_value = (vid.height - 8)*3/4 + crosshair_offset_step;
Draw_CharacterRGBA (x_value, y_value, 157, 255, 255, 255, 0.7);
}
if (Hitmark_Time > sv.time) {
Draw_Pic ((vid.width/2 - hitmark->width)/2,vid.height/2 + (vid.height/2 - hitmark->height)/2, hitmark);
}
GL_SetCanvas(CANVAS_DEFAULT);
}

24
source/pr_cmds.c
View file

@ -1276,6 +1276,29 @@ void PF_MaxAmmo(void)
MSG_WriteByte(&sv.reliable_datagram, svc_maxammo);
}
/*
=================
PF_GrenadePulse
pulses grenade crosshair
grenade_pulse()
=================
*/
void PF_GrenadePulse(void)
{
client_t *client;
int entnum;
entnum = G_EDICTNUM(OFS_PARM0);
if (entnum < 1 || entnum > svs.maxclients)
return;
client = &svs.clients[entnum-1];
MSG_WriteByte (&client->message,svc_pulse);
}
/*
=================
PF_achievement
@ -3765,6 +3788,7 @@ static builtin_t pr_builtin[] =
NULL, // #499
PF_SongEgg, // #500
PF_MaxAmmo, // #501
PF_GrenadePulse, // #502
};
builtin_t *pr_builtins = pr_builtin;

1
source/protocol.h
View file

@ -213,6 +213,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define svc_songegg 45 // 45
#define svc_maxammo 46 // 46
#define svc_pulse 47 // 47
#define svc_limbupdate 51
#define svc_achievement 52 // [string] name [byte] decal_size [coords] pos