[wpdev-commits] wolfpack ChangeLog,1.56,1.57 player.cpp,1.130,1.131 sectors.cpp,1.31,1.32

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

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

Modified Files:
	ChangeLog player.cpp sectors.cpp 
Log Message:
crashfix

Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** player.cpp	9 Sep 2004 02:36:24 -0000	1.130
--- player.cpp	17 Sep 2004 16:33:59 -0000	1.131
***************
*** 1746,1749 ****
--- 1746,1766 ----
  	}
  
+ 	// Remove the owner tag from all of our followers
+ 	CharContainer::iterator it;
+ 	for (it = pets_.begin(); it != pets_.end(); ++it) {
+ 		P_NPC npc = dynamic_cast<P_NPC>((*it));
+ 
+ 		if (npc && npc->owner() == this) {
+ 			npc->setOwner(NULL, true);
+ 			npc->setTamed(false);
+ 
+ 			// Remove his stabled NPCs.
+ 			if (npc->stablemasterSerial() != INVALID_SERIAL) {
+ 				npc->remove();
+ 			}
+ 		}
+ 	}
+ 	pets_.clear();
+ 
  	cBaseChar::remove();
  }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** ChangeLog	16 Sep 2004 18:52:43 -0000	1.56
--- ChangeLog	17 Sep 2004 16:33:59 -0000	1.57
***************
*** 19,22 ****
--- 19,25 ----
  	- Completely rewrote line of sight.
  	- Fixed a crashbug related to trying to remove basescripts from objects.
+ 	- Fixed a crasbhug related to players being removed and the owner property of their
+ 	  pets not being reset.
+ 	- Added support for the Samurai Empire map.
  
  Wolfpack 12.9.10 Beta (10. September 2004)

Index: sectors.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/sectors.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** sectors.cpp	15 Sep 2004 02:15:28 -0000	1.31
--- sectors.cpp	17 Sep 2004 16:34:00 -0000	1.32
***************
*** 305,308 ****
--- 305,309 ----
  	addMap( 2, 2304, 1600 );
  	addMap( 3, 2560, 2048 );
+ 	addMap( 4, 1448, 1448 );
  
  	cComponent::load();