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

Fixed a 2 frags pr kill bug, the use cmd now cancels weaponchanges in progress

Browse source 
and fixed the captain status lingering on people after switching from MM
This commit is contained in:
Richard Allen 2002-07-02 03:41:59 +00:00
parent 07d76e2578
commit c6459bd54d
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reaction/game/g_client.c
View file

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.104 2002/07/02 03:41:59 jbravo
// Fixed a 2 frags pr kill bug, the use cmd now cancels weaponchanges in progress
// and fixed the captain status lingering on people after switching from MM
//
// Revision 1.103 2002/06/30 17:33:01 jbravo
// New radio sounds and the 0wned sound was added.
//
@ -1431,6 +1435,9 @@ char *ClientConnect(int clientNum, qboolean firstTime, qboolean isBot)
// JBravo: moved from ClientBegin
client->pers.enterTime = level.time;
// JBravo: cleaning up stuff
client->sess.sub = TEAM_FREE;
client->sess.captain = TEAM_FREE;
return NULL;
}

6
reaction/game/g_combat.c
View file

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.107 2002/07/02 03:41:59 jbravo
// Fixed a 2 frags pr kill bug, the use cmd now cancels weaponchanges in progress
// and fixed the captain status lingering on people after switching from MM
//
// Revision 1.106 2002/06/30 17:33:01 jbravo
// New radio sounds and the 0wned sound was added.
//
@ -1316,7 +1320,7 @@ void player_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, i
// DM reward scoring, should add an if statement to get around this when
// we add teamplay.
// JBravo: Done ;)
if (g_gametype.integer != GT_TEAMPLAY || g_gametype.integer != GT_CTF) {
if (g_gametype.integer == GT_FFA) {
if (attacker->client->killStreak < 4)
AddScore(attacker, self->r.currentOrigin, 1);
else if (attacker->client->killStreak < 8) {

7
reaction/game/g_teamplay.c
View file

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.119 2002/07/02 03:41:59 jbravo
// Fixed a 2 frags pr kill bug, the use cmd now cancels weaponchanges in progress
// and fixed the captain status lingering on people after switching from MM
//
// Revision 1.118 2002/07/01 02:56:15 blaze
// moved the start demo code to where it prints the 20 seconds till match start
//
@ -1965,6 +1969,7 @@ void RQ3_Cmd_Use_f(gentity_t * ent)
if (weapon != WP_NONE) {
if (weapon == ent->client->ps.weapon)
return;
trap_SendServerCommand(ent - g_entities, va("rq3_cmd %i %i", SETWEAPON, weapon));
Com_sprintf(buf, sizeof(buf), "stuff weapon %d\n", weapon);
trap_SendServerCommand(ent - g_entities, buf);
return;
@ -2041,9 +2046,9 @@ void RQ3_Cmd_Use_f(gentity_t * ent)
}
if (weapon == ent->client->ps.weapon)
return;
trap_SendServerCommand(ent - g_entities, va("rq3_cmd %i %i", SETWEAPON, weapon));
Com_sprintf(buf, sizeof(buf), "stuff weapon %d\n", weapon);
trap_SendServerCommand(ent - g_entities, buf);
// trap_SendServerCommand(ent-g_entities, va("rq3_cmd %i weapon %i", STUFF, weapon));
}
void Add_TeamWound(gentity_t * attacker, gentity_t * victim, int mod)