[wpdev-commits] wolfpack timing.cpp,1.9,1.10

[Correa <thi...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4962

Modified Files:
	timing.cpp 
Log Message:
fix for items decaying when they shouldn't

Index: timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** timing.cpp	4 Aug 2004 23:17:37 -0000	1.9
--- timing.cpp	7 Aug 2004 03:24:12 -0000	1.10
***************
*** 107,111 ****
  		for (sit = toRemove.begin(); sit != toRemove.end(); ++sit) {
  			P_ITEM item = FindItemBySerial(*sit);
! 			if (item && item->isInWorld()) {
  				item->remove(); // Auto removes from the decaylist
  			} else {
--- 107,111 ----
  		for (sit = toRemove.begin(); sit != toRemove.end(); ++sit) {
  			P_ITEM item = FindItemBySerial(*sit);
! 			if (item && item->isInWorld() && !item->nodecay()) {
  				item->remove(); // Auto removes from the decaylist
  			} else {