[wpdev-commits] wolfpack basechar.cpp,1.43,1.44 basechar.h,1.34,1.35 defines.h,1.42,1.43 res.rc,1.15,1.16 scriptmanager.h,1.4,1.5

[<co...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv13173

Modified Files:
	basechar.cpp basechar.h defines.h res.rc scriptmanager.h 
Log Message:
Custom houses constructor work

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** basechar.cpp	11 Sep 2003 16:19:49 -0000	1.43
--- basechar.cpp	15 Sep 2003 19:56:23 -0000	1.44
***************
*** 1221,1225 ****
  	return false;
  }
! 
  bool cBaseChar::onShowTooltip( P_PLAYER sender, cUOTxTooltipList* tooltip )
  {
--- 1221,1229 ----
  	return false;
  }
! bool cBaseChar::onCHLevelChange( SERIAL multi_serial )
! {
! 	cMulti* multi = dynamic_cast< cMulti* >( FindItemBySerial( multi_serial ) );
! 	return false;
! }
  bool cBaseChar::onShowTooltip( P_PLAYER sender, cUOTxTooltipList* tooltip )
  {

Index: basechar.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** basechar.h	11 Sep 2003 16:19:50 -0000	1.34
--- basechar.h	15 Sep 2003 19:56:23 -0000	1.35
***************
*** 46,54 ****
  #include "territories.h"
  #include "log.h"
  
  class cUOTxTooltipList;
  
  
- 
  // This class is the base interface for all char objects. 
  class cBaseChar : public cUObject
--- 46,55 ----
  #include "territories.h"
  #include "log.h"
+ #include "multis.h"
  
+ class cMulti;
  class cUOTxTooltipList;
  
  
  // This class is the base interface for all char objects. 
  class cBaseChar : public cUObject
***************
*** 169,172 ****
--- 170,174 ----
  	QString onShowPaperdollName( P_CHAR pOrigin ); // only change the viewed name
  	virtual bool onShowTooltip( P_PLAYER sender, cUOTxTooltipList* tooltip ); // Shows a tool tip for specific object
+ 	virtual bool onCHLevelChange( SERIAL multi_serial ); // Fired when player moving trough levels
  	bool onSkillGain( UI08 Skill, SI32 min, SI32 max, bool success );
  	bool onStatGain( UI08 stat, SI08 amount );

Index: defines.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/defines.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** defines.h	11 Sep 2003 15:33:58 -0000	1.42
--- defines.h	15 Sep 2003 19:56:23 -0000	1.43
***************
*** 33,36 ****
--- 33,41 ----
  #define __DEFINES_H__
  
+ #define _ST_( L ) #L
+ #define _MST_( M, L ) M(L)
+ #define $LINE _MST_(_ST_, __LINE__)
+ #define Reminder  "("$LINE"):Remind: "
+ 
  #define MAXLOOPS 250000
  #define MaxZstep 5

Index: res.rc
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/res.rc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** res.rc	15 Sep 2003 12:49:05 -0000	1.15
--- res.rc	15 Sep 2003 19:56:23 -0000	1.16
***************
*** 1,5 ****
  //Microsoft Developer Studio generated resource script.
  //
- #include "resrc1.h"
  
  #define APSTUDIO_READONLY_SYMBOLS
--- 1,4 ----

Index: scriptmanager.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/scriptmanager.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** scriptmanager.h	7 Sep 2003 19:07:47 -0000	1.4
--- scriptmanager.h	15 Sep 2003 19:56:23 -0000	1.5
***************
*** 78,81 ****
--- 78,82 ----
  #define EVENT_STATGAIN				32
  #define EVENT_CASTSPELL				33
+ #define EVENT_CHLEVELCHANGE			34
  
  class cScriptManager