[wpdev-commits] wolfpack ChangeLog,1.34,1.35 basechar.cpp,1.144,1.145 basedef.h,1.13,1.14 player.cpp,1.126,1.127

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

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

Modified Files:
	ChangeLog basechar.cpp basedef.h player.cpp 
Log Message:
Fixes

Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** player.cpp	4 Sep 2004 21:19:52 -0000	1.126
--- player.cpp	6 Sep 2004 22:31:25 -0000	1.127
***************
*** 1630,1634 ****
  
  	// Don't miss lord and lady titles
! 	if ( !isIncognito() && !isPolymorphed() && fame_ >= 1000 )
  	{
  		if ( gender() )
--- 1630,1634 ----
  
  	// Don't miss lord and lady titles
! 	if ( !isIncognito() && !isPolymorphed() && fame_ >= 10000 )
  	{
  		if ( gender() )

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** ChangeLog	6 Sep 2004 17:36:13 -0000	1.34
--- ChangeLog	6 Sep 2004 22:31:24 -0000	1.35
***************
*** 19,22 ****
--- 19,27 ----
  	  But be careful not to create two objects with the same serial.
  	- Fixed contextmenus to use <scripts></scripts>, this was missed.
+ 	- Removed old macros that interfered with the new property system.
+ 	- Allowed the range for weapons to be a property which can be overriden
+ 	  with a tag.
+ 	- Fixed a tooltip bug that made players lords and ladies with only 1000 points
+ 	  of fame.
  
  Wolfpack 12.9.9 Beta (4. September 2004)

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** basechar.cpp	4 Sep 2004 15:25:40 -0000	1.144
--- basechar.cpp	6 Sep 2004 22:31:24 -0000	1.145
***************
*** 3208,3213 ****
  			P_ITEM weapon = getWeapon();
  
! 			if ( weapon && weapon->hasTag( "range" ) )
! 				range = weapon->getTag( "range" ).toInt();
  
  			// We are out of range
--- 3208,3219 ----
  			P_ITEM weapon = getWeapon();
  
! 			if ( weapon )
! 			{
! 				if ( weapon->hasTag( "range" ) ) {
! 					range = weapon->getTag( "range" ).toInt();
! 				} else if ( weapon->basedef() ) {
! 					range = weapon->basedef()->getIntProperty( "range", 1 );
! 				}
! 			}
  
  			// We are out of range

Index: basedef.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** basedef.h	5 Sep 2004 17:43:51 -0000	1.13
--- basedef.h	6 Sep 2004 22:31:25 -0000	1.14
***************
*** 39,45 ****
  class cPythonScript;
  
- #undef getIntProperty
- #undef getStrProperty
- 
  class cBaseDef : public cDefinable {
  protected:
--- 39,42 ----