rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-04-01 07:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Items can now be dropped during bandaging

Browse source
This commit is contained in:
Richard Allen 2002-06-17 16:57:39 +00:00
parent a272197f1c
commit 99e346a40c
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reaction/ChangeLog
View file

@ -8,4 +8,5 @@
* Fixed the respawning of dead players weapons and items in TP
* Fixed to allow > 16 breakables
* Recoded the AI for changing weapon modes. Bots can now zoom in/out with the SSG.
* Made it possible to add random bots when starting a game from the UI
* Made it possible to add random bots when starting a game from the UI
* Items can now be dropped during bandaging

9
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.131 2002/06/17 16:57:39 jbravo
// Items can now be dropped during bandaging
//
// Revision 1.130 2002/06/17 03:22:58 jbravo
// Base voting system is now fixed.
//
@ -2778,11 +2781,11 @@ void Cmd_DropItem_f(gentity_t * ent)
return;
// JBravo: no dropping stuff while bandaging. Fix dedicated to GoKu and JesterRace :)
// if ((ent->client->ps.stats[STAT_RQ3] & RQ3_BANDAGE_WORK) == RQ3_BANDAGE_WORK) {
if (ent->client->ps.weaponstate == WEAPON_BANDAGING) {
// Turns out they are full of shit... :)
/* if (ent->client->ps.weaponstate == WEAPON_BANDAGING) {
trap_SendServerCommand(ent - g_entities, va("print \"You are too busy bandaging...\n\""));
return;
}
} */
if (ent->client->ps.stats[STAT_HOLDABLE_ITEM]) {
//Elder: reset item totals if using bandolier

7
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.87 2002/06/17 16:57:39 jbravo
// Items can now be dropped during bandaging
//
// Revision 1.86 2002/06/17 03:22:58 jbravo
// Base voting system is now fixed.
//
@ -1265,10 +1268,6 @@ void CalculateRanks(void)
level.numPlayingClients++;
if (!(g_entities[i].r.svFlags & SVF_BOT)) {
level.numVotingClients++;
/* if (level.clients[i].sess.savedTeam == TEAM_RED)
level.numteamVotingClients[0]++;
else if (level.clients[i].sess.savedTeam == TEAM_BLUE)
level.numteamVotingClients[1]++; */
}
if (level.follow1 == -1) {
level.follow1 = i;