yquake2/xatrix
0
0
Fork 0
mirror of https://github.com/yquake2/xatrix.git synced 2024-11-10 06:42:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #97 from protocultor/quick_weap

Browse source 
Faster "weapprev" and "weapnext" behavior
This commit is contained in:
Yamagi 2023-12-17 11:50:44 +01:00 committed by GitHub
commit b837ee59e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/g_cmds.c
View file

@ -759,14 +759,22 @@ Cmd_WeapPrev_f(edict_t *ent)
cl = ent->client;
if (!cl->pers.weapon)
if (g_quick_weap->value && cl->newweapon)
{
it = cl->newweapon;
}
else if (cl->pers.weapon)
{
it = cl->pers.weapon;
}
else
{
return;
}
selected_weapon = ITEM_INDEX(cl->pers.weapon);
selected_weapon = ITEM_INDEX(it);
/* scan for the next valid one */
/* scan for the next valid one */
for (i = 1; i <= MAX_ITEMS; i++)
{
index = (selected_weapon + MAX_ITEMS - i) % MAX_ITEMS;
@ -778,12 +786,7 @@ Cmd_WeapPrev_f(edict_t *ent)
it = &itemlist[index];
if (!it->use)
{
continue;
}
if (!(it->flags & IT_WEAPON))
if (!it->use || !(it->flags & IT_WEAPON))
{
continue;
}
@ -792,6 +795,12 @@ Cmd_WeapPrev_f(edict_t *ent)
if (cl->newweapon == it)
{
if (g_quick_weap->value)
{
cl->ps.stats[STAT_PICKUP_ICON] = gi.imageindex(cl->newweapon->icon);
cl->ps.stats[STAT_PICKUP_STRING] = CS_ITEMS + ITEM_INDEX(cl->newweapon);
cl->pickup_msg_time = level.time + 0.9f;
}
return;
}
}
@ -812,14 +821,22 @@ Cmd_WeapNext_f(edict_t *ent)
cl = ent->client;
if (!cl->pers.weapon)
if (g_quick_weap->value && cl->newweapon)
{
it = cl->newweapon;
}
else if (cl->pers.weapon)
{
it = cl->pers.weapon;
}
else
{
return;
}
selected_weapon = ITEM_INDEX(cl->pers.weapon);
selected_weapon = ITEM_INDEX(it);
/* scan for the next valid one */
/* scan for the next valid one */
for (i = 1; i <= MAX_ITEMS; i++)
{
index = (selected_weapon + i) % MAX_ITEMS;
@ -831,12 +848,7 @@ Cmd_WeapNext_f(edict_t *ent)
it = &itemlist[index];
if (!it->use)
{
continue;
}
if (!(it->flags & IT_WEAPON))
if (!it->use || !(it->flags & IT_WEAPON))
{
continue;
}
@ -845,6 +857,12 @@ Cmd_WeapNext_f(edict_t *ent)
if (cl->newweapon == it)
{
if (g_quick_weap->value)
{
cl->ps.stats[STAT_PICKUP_ICON] = gi.imageindex(cl->newweapon->icon);
cl->ps.stats[STAT_PICKUP_STRING] = CS_ITEMS + ITEM_INDEX(cl->newweapon);
cl->pickup_msg_time = level.time + 0.9f;
}
return;
}
}

1
src/g_main.c
View file

@ -68,6 +68,7 @@ cvar_t *gib_on;
cvar_t *aimfix;
cvar_t *g_machinegun_norecoil;
cvar_t *g_quick_weap;
cvar_t *g_swap_speed;
void SpawnEntities(char *mapname, char *entities, char *spawnpoint);

1
src/header/local.h
View file

@ -542,6 +542,7 @@ extern cvar_t *sv_maplist;
extern cvar_t *aimfix;
extern cvar_t *g_machinegun_norecoil;
extern cvar_t *g_quick_weap;
extern cvar_t *g_swap_speed;
#define world (&g_edicts[0])

1
src/savegame/savegame.c
View file

@ -251,6 +251,7 @@ InitGame(void)
/* others */
aimfix = gi.cvar("aimfix", "0", CVAR_ARCHIVE);
g_machinegun_norecoil = gi.cvar("g_machinegun_norecoil", "0", CVAR_ARCHIVE);
g_quick_weap = gi.cvar("g_quick_weap", "0", CVAR_ARCHIVE);
g_swap_speed = gi.cvar("g_swap_speed", "1", 0);
/* items */