[wpdev-commits] wolfpack ChangeLog,1.44,1.45 timers.cpp,1.14,1.15 timers.h,1.6,1.7 world.h,1.21,1.22

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

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

Modified Files:
	ChangeLog timers.cpp timers.h world.h 
Log Message:
Fixes for certain crashes.

Index: timers.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timers.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** timers.h	16 Aug 2004 18:18:03 -0000	1.6
--- timers.h	10 Sep 2004 04:06:26 -0000	1.7
***************
*** 155,159 ****
  class cDelayedOnCreateCall : public cTimer
  {
! 	cUObject* obj_;
  	const QString def_;
  public:
--- 155,159 ----
  class cDelayedOnCreateCall : public cTimer
  {
! 	SERIAL objSer_;
  	const QString def_;
  public:

Index: world.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** world.h	8 Sep 2004 18:00:59 -0000	1.21
--- world.h	10 Sep 2004 04:06:26 -0000	1.22
***************
*** 30,33 ****
--- 30,34 ----
  
  // Wolfpack Includes
+ #include "defines.h"
  #include "typedefs.h"
  #include "singleton.h"

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** ChangeLog	9 Sep 2004 22:19:14 -0000	1.44
--- ChangeLog	10 Sep 2004 04:06:26 -0000	1.45
***************
*** 2,5 ****
--- 2,8 ----
  
  Wolfpack 12.9.11 Beta (CVS)
+ 	- Fixed a crashbug related to NPC ai storing invalidated character pointers.
+ 	  This will slow AI down a little but crash prevention is well worth it.
+ 	- Fixed a crashbug with the delayed onCreate call.
  
  Wolfpack 12.9.10 Beta (10. September 2004)

Index: timers.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timers.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** timers.cpp	29 Aug 2004 20:40:50 -0000	1.14
--- timers.cpp	10 Sep 2004 04:06:26 -0000	1.15
***************
*** 428,432 ****
  
  cDelayedOnCreateCall::cDelayedOnCreateCall( cUObject* obj, const QString& definition ) :
! 	obj_(obj), def_(definition)
  {
  	setSerializable( false );
--- 428,432 ----
  
  cDelayedOnCreateCall::cDelayedOnCreateCall( cUObject* obj, const QString& definition ) :
! 	objSer_(obj->serial()), def_(definition)
  {
  	setSerializable( false );
***************
*** 436,440 ****
  void cDelayedOnCreateCall::Expire()
  {
! 	obj_->onCreate(def_);
  }
  
--- 436,444 ----
  void cDelayedOnCreateCall::Expire()
  {
! 	cUObject *object = World::instance()->findObject(objSer_);
! 
! 	if (object) {
! 		object->onCreate(def_);
! 	}
  }