rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-30 16:00:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing item reapperaing in TP and CTB

Browse source
This commit is contained in:
Richard Allen 2002-08-27 05:34:38 +00:00
parent e00235f777
commit d0db39ca89
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reaction/ChangeLog
View file

@ -56,7 +56,7 @@
* Fixed dropped weapons and items blocking doors and other movers. * Fixed dropped weapons and items blocking doors and other movers.
* Added ref say command to talk to everyone, dead or alive * Added ref say command to talk to everyone, dead or alive
>>>>>>> 1.83
# List fixes here for the 2.1 release # List fixes here for the 2.1 release

10
reaction/game/g_items.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.46 2002/08/27 05:34:38 jbravo
// Fixing item reapperaing in TP and CTB
//
// Revision 1.45 2002/08/27 04:05:43 jbravo // Revision 1.45 2002/08/27 04:05:43 jbravo
// Fixed dropped weapons and items blocking doors and other movers. // Fixed dropped weapons and items blocking doors and other movers.
// //
@ -1467,10 +1470,9 @@ void RQ3_ResetItem(int itemTag)
gentity_t *rq3_temp; gentity_t *rq3_temp;
float angle = rand() % 360; float angle = rand() % 360;
// JBravo: no resetting items in TP // JBravo: no resetting items in TP or CTB
// JBravo: man, Ive done this badly :( if (g_gametype.integer == GT_TEAMPLAY || g_gametype.integer == GT_CTF)
/* if (g_gametype.integer == GT_TEAMPLAY || g_gametype.integer == GT_CTF) return;
return; */
switch (itemTag) { switch (itemTag) {
case HI_KEVLAR: case HI_KEVLAR: