yquake2/rogue
0
0
Fork 0
mirror of https://github.com/yquake2/rogue.git synced 2024-11-24 05:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #123 from protocultor/quick_weap

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

52
src/g_cmds.c
View file

@ -728,12 +728,20 @@ Cmd_WeapPrev_f(edict_t *ent)
cl = ent->client; 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; 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++) for (i = 1; i <= MAX_ITEMS; i++)
@ -748,12 +756,7 @@ Cmd_WeapPrev_f(edict_t *ent)
it = &itemlist[index]; it = &itemlist[index];
if (!it->use) if (!it->use || !(it->flags & IT_WEAPON))
{
continue;
}
if (!(it->flags & IT_WEAPON))
{ {
continue; continue;
} }
@ -763,6 +766,12 @@ Cmd_WeapPrev_f(edict_t *ent)
/* prevent scrolling through ALL weapons */ /* prevent scrolling through ALL weapons */
if (cl->newweapon == it) 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; return;
} }
} }
@ -783,14 +792,22 @@ Cmd_WeapNext_f(edict_t *ent)
cl = ent->client; 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; 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++) for (i = 1; i <= MAX_ITEMS; i++)
{ {
/* prevent scrolling through ALL weapons */ /* prevent scrolling through ALL weapons */
@ -803,12 +820,7 @@ Cmd_WeapNext_f(edict_t *ent)
it = &itemlist[index]; it = &itemlist[index];
if (!it->use) if (!it->use || !(it->flags & IT_WEAPON))
{
continue;
}
if (!(it->flags & IT_WEAPON))
{ {
continue; continue;
} }
@ -818,6 +830,12 @@ Cmd_WeapNext_f(edict_t *ent)
/* prevent scrolling through ALL weapons */ /* prevent scrolling through ALL weapons */
if (cl->newweapon == it) 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; return;
} }
} }

1
src/g_main.c
View file

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

1
src/header/local.h
View file

@ -635,6 +635,7 @@ extern cvar_t *g_disruptor;
extern cvar_t *aimfix; extern cvar_t *aimfix;
extern cvar_t *g_machinegun_norecoil; extern cvar_t *g_machinegun_norecoil;
extern cvar_t *g_quick_weap;
extern cvar_t *g_swap_speed; extern cvar_t *g_swap_speed;
/* this is for the count of monsters */ /* this is for the count of monsters */

1
src/savegame/savegame.c
View file

@ -260,6 +260,7 @@ InitGame(void)
/* others */ /* others */
aimfix = gi.cvar("aimfix", "0", CVAR_ARCHIVE); aimfix = gi.cvar("aimfix", "0", CVAR_ARCHIVE);
g_machinegun_norecoil = gi.cvar("g_machinegun_norecoil", "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); g_swap_speed = gi.cvar("g_swap_speed", "1", 0);
/* items */ /* items */