rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-27 14:32:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

use 'Combat Knife' / 'special' fixes

Browse source
This commit is contained in:
Andrei Drexler 2011-03-09 20:35:49 +00:00
parent 2604b67188
commit bff6b08767
1 changed files with 49 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
reaction/code/game/g_teamplay.c
View file

@ -2286,10 +2286,49 @@ void RQ3_SpectatorMode(gentity_t * ent)
(ent->client->sess.spectatorState == SPECTATOR_FREE) ? "FREE" : "FOLLOW")); (ent->client->sess.spectatorState == SPECTATOR_FREE) ? "FREE" : "FOLLOW"));
} }
static qboolean RQ3_IsSpecialWeapon(int weapon)
{
switch (weapon)
{
case WP_M3:
case WP_MP5:
case WP_HANDCANNON:
case WP_SSG3000:
case WP_M4:
return qtrue;
default:
return qfalse;
}
}
static weapon_t RQ3_CycleSpecialWeapon(gentity_t* ent)
{
int i;
for (i=ent->client->ps.weapon-1; i>WP_NONE; --i)
{
int mask = (1 << i);
if ((ent->client->ps.stats[STAT_WEAPONS] & mask) == mask && RQ3_IsSpecialWeapon(i))
return (weapon_t) i;
}
for (i=WP_NUM_WEAPONS-1; i>ent->client->ps.weapon; --i)
{
int mask = (1 << i);
if ((ent->client->ps.stats[STAT_WEAPONS] & mask) == mask && RQ3_IsSpecialWeapon(i))
return (weapon_t) i;
}
if (RQ3_IsSpecialWeapon(ent->client->ps.weapon))
return (weapon_t) ent->client->ps.weapon;
return WP_NONE;
}
void RQ3_Cmd_Use_f(gentity_t * ent) void RQ3_Cmd_Use_f(gentity_t * ent)
{ {
char *cmd, buf[128]; char *cmd, buf[128];
int weapon, i; int weapon;
if (!ent->client) { if (!ent->client) {
return; // not fully in game yet return; // not fully in game yet
@ -2341,7 +2380,15 @@ void RQ3_Cmd_Use_f(gentity_t * ent)
trap_SendServerCommand(ent - g_entities, va("print \"Out of item: %s\n\"", RQ3_KNIFE_NAME)); trap_SendServerCommand(ent - g_entities, va("print \"Out of item: %s\n\"", RQ3_KNIFE_NAME));
return; return;
} }
} else if (Q_stricmp(cmd, RQ3_KNIFE_NAME) == 0 || Q_stricmp(cmd, "knife") == 0 || Q_stricmp(cmd, "knives") == 0) {
if ((ent->client->ps.stats[STAT_WEAPONS] & (1 << WP_KNIFE)) == (1 << WP_KNIFE)) {
weapon = WP_KNIFE;
} else {
trap_SendServerCommand(ent - g_entities, va("print \"Out of item: %s\n\"", RQ3_KNIFE_NAME));
return;
} }
}
if (weapon != WP_NONE) { if (weapon != WP_NONE) {
if (weapon == ent->client->ps.weapon) if (weapon == ent->client->ps.weapon)
return; return;
@ -2405,14 +2452,7 @@ void RQ3_Cmd_Use_f(gentity_t * ent)
return; return;
} }
} else if (Q_stricmp(cmd, "special") == 0) { } else if (Q_stricmp(cmd, "special") == 0) {
for (i = WP_NUM_WEAPONS - 1; i > 0; i--) { weapon = RQ3_CycleSpecialWeapon(ent);
if (i == WP_KNIFE || i == WP_PISTOL || i == WP_AKIMBO || i == WP_GRENADE)
continue;
if (ent->client->ps.stats[STAT_WEAPONS] & (1 << i)) {
weapon = i;
break;
}
}
if (weapon == WP_NONE) { if (weapon == WP_NONE) {
trap_SendServerCommand(ent - g_entities, va("print \"You dont have a special weapon!\n\"")); trap_SendServerCommand(ent - g_entities, va("print \"You dont have a special weapon!\n\""));
return; return;