[wpdev-commits] wolfpack spawnregions.cpp,1.62,1.63

[Sebastian H. <dar...@us...>]

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

Modified Files:
	spawnregions.cpp 
Log Message:
Spawnregion fix.

Index: spawnregions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** spawnregions.cpp	18 Jul 2004 21:02:58 -0000	1.62
--- spawnregions.cpp	19 Jul 2004 14:30:18 -0000	1.63
***************
*** 213,217 ****
  		else
  			pos.z = Maps::instance()->mapElevation( pos );
- 
  		pos.map = rectangles_[rndRectNum].map;
  
--- 213,216 ----
***************
*** 224,234 ****
  			cCharSectorIterator *chariterator = SectorMaps::instance()->findChars(pos, 0);
  
  			P_CHAR pChar;
  			for (pChar = chariterator->first(); pChar; pChar = chariterator->next()) {
  				if (pChar->spawnregion()) {
! 					continue;
  				}
  			}
  
  			cItemSectorIterator *itemiterator = SectorMaps::instance()->findItems(pos, 0);
  
--- 223,239 ----
  			cCharSectorIterator *chariterator = SectorMaps::instance()->findChars(pos, 0);
  
+ 			bool blocked = false;
  			P_CHAR pChar;
  			for (pChar = chariterator->first(); pChar; pChar = chariterator->next()) {
  				if (pChar->spawnregion()) {
! 					blocked = true;
! 					break;
  				}
  			}
  
+ 			if (blocked) {
+ 				continue;
+ 			}
+ 
  			cItemSectorIterator *itemiterator = SectorMaps::instance()->findItems(pos, 0);
  
***************
*** 236,242 ****
  			for (pItem = itemiterator->first(); pItem; pItem = itemiterator->next()) {
  				if (pItem->spawnregion()) {
! 					continue;
  				}
  			}
  		}	
  	}
--- 241,254 ----
  			for (pItem = itemiterator->first(); pItem; pItem = itemiterator->next()) {
  				if (pItem->spawnregion()) {
! 					blocked = true;
! 					break;
  				}
  			}
+ 
+ 			if (blocked) {
+ 				continue;
+ 			}
+ 
+ 			return true;
  		}	
  	}