[wpdev-commits] wolfpack basechar.cpp,1.119,1.120 basechar.h,1.72,1.73 basedef.h,1.9,1.10 commands.cpp,1.239,1.240 corpse.cpp,1.56,1.57 corpse.h,1.23,1.24 customtags.cpp,1.49,1.50

[Richard M. <dr...@us...>]

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

Modified Files:
	basechar.cpp basechar.h basedef.h commands.cpp corpse.cpp 
	corpse.h customtags.cpp 
Log Message:


Index: customtags.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** customtags.cpp	5 Jul 2004 12:52:58 -0000	1.49
--- customtags.cpp	5 Jul 2004 18:33:20 -0000	1.50
***************
*** 83,87 ****
  */
  
- 
  /*!
    Constructs an invalid variant.
--- 83,86 ----

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** basechar.cpp	19 Jun 2004 02:06:50 -0000	1.119
--- basechar.cpp	5 Jul 2004 18:33:19 -0000	1.120
***************
*** 1818,1823 ****
  		SET_INT_PROPERTY( "statcap", statCap_ )
  		/*
! 		\property char.baseid The name of the definition this character was created from. 
! 		This property is used to link the character to the definitions even after he 
  		was created.
  		*/
--- 1818,1823 ----
  		SET_INT_PROPERTY( "statcap", statCap_ )
  		/*
! 		\property char.baseid The name of the definition this character was created from.
! 		This property is used to link the character to the definitions even after he
  		was created.
  		*/
***************
*** 2048,2052 ****
  		/*
  		\rproperty char.mintaming This is the minimum taming skill required to tame this creature.
! 		This has no meaning for player characters.	
  
  		This property is inherited from the definition referenced by the baseid property.
--- 2048,2052 ----
  		/*
  		\rproperty char.mintaming This is the minimum taming skill required to tame this creature.
! 		This has no meaning for player characters.
  
  		This property is inherited from the definition referenced by the baseid property.
***************
*** 2519,2528 ****
  
  	if ( scriptChain )
! 	{	
  		PyObject* args = Py_BuildValue( "(N)", getPyObject() );
  		result = cPythonScript::callChainedEventHandler( EVENT_SHOWSKILLGUMP, scriptChain, args );
  		Py_DECREF( args );
  	}
! 	
  	return result;
  }
--- 2519,2528 ----
  
  	if ( scriptChain )
! 	{
  		PyObject* args = Py_BuildValue( "(N)", getPyObject() );
  		result = cPythonScript::callChainedEventHandler( EVENT_SHOWSKILLGUMP, scriptChain, args );
  		Py_DECREF( args );
  	}
! 
  	return result;
  }
***************
*** 2794,2798 ****
  		// stores the time and the murderer's name
  		if ( pKiller ) {
! 			corpse->setMurderer( pKiller->serial() );			
  		}
  
--- 2794,2798 ----
  		// stores the time and the murderer's name
  		if ( pKiller ) {
! 			corpse->setMurderer( pKiller->serial() );
  		}
  

Index: basedef.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** basedef.h	2 Jun 2004 15:04:03 -0000	1.9
--- basedef.h	5 Jul 2004 18:33:19 -0000	1.10
***************
*** 61,65 ****
  	void load();
  	void reset();
! public:	
  	cCharBaseDef( const QCString& id );
  	~cCharBaseDef();
--- 61,65 ----
  	void load();
  	void reset();
! public:
  	cCharBaseDef( const QCString& id );
  	~cCharBaseDef();
***************
*** 168,172 ****
  	typedef QMap<QCString, cCharBaseDef*> Container;
  	typedef Container::iterator Iterator;
! 	Container definitions;	
  public:
  	cCharBaseDefs();
--- 168,172 ----
  	typedef QMap<QCString, cCharBaseDef*> Container;
  	typedef Container::iterator Iterator;
! 	Container definitions;
  public:
  	cCharBaseDefs();

Index: basechar.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** basechar.h	19 Jun 2004 02:06:51 -0000	1.72
--- basechar.h	5 Jul 2004 18:33:19 -0000	1.73
***************
*** 75,79 ****
  	enum enLayer
  	{
! 		TradeWindow					= 0,
  		SingleHandedWeapon,
  		DualHandedWeapon,
--- 75,79 ----
  	enum enLayer
  	{
! 		TradeWindow = 0,
  		SingleHandedWeapon,
  		DualHandedWeapon,
***************
*** 84,93 ****
  		Gloves,
  		Ring,
! 		Neck						= 0xA,
  		Hair,
  		Waist,
  		InnerTorso,
  		Bracelet,
! 		FacialHair					= 0x10,
  		MiddleTorso,
  		Earrings,
--- 84,93 ----
  		Gloves,
  		Ring,
! 		Neck = 0xA,
  		Hair,
  		Waist,
  		InnerTorso,
  		Bracelet,
! 		FacialHair = 0x10,
  		MiddleTorso,
  		Earrings,
***************
*** 108,112 ****
  	enum enBark
  	{
! 		Bark_Attacking		= 0,
  		Bark_Idle,
  		Bark_Hit,
--- 108,112 ----
  	enum enBark
  	{
! 		Bark_Attacking = 0,
  		Bark_Idle,
  		Bark_Hit,
***************
*** 143,149 ****
  	enum TimingEvents
  	{
! 		EventCombat		= 0x01,
! 		EventLight		= 0x02,
! 		EventTime		= 0x04,
  	};
  
--- 143,149 ----
  	enum TimingEvents
  	{
! 		EventCombat = 0x01,
! 		EventLight = 0x02,
! 		EventTime = 0x04,
  	};
  
***************
*** 173,177 ****
  	enum FightStatus
  	{
! 		FightDenied			= 0x00,
  		FightStarted,
  		FightContinued
--- 173,177 ----
  	enum FightStatus
  	{
! 		FightDenied = 0x00,
  		FightStarted,
  		FightContinued
***************
*** 706,710 ****
  	// current hitpoints of the char.
  	// cOldChar::hp_
! 	short hitpoints_;
  
  	// Intelligence of the char.
--- 706,710 ----
  	// current hitpoints of the char.
  	// cOldChar::hp_
! 	ushort hitpoints_;
  
  	// Intelligence of the char.

Index: corpse.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** corpse.cpp	2 Jul 2004 06:01:16 -0000	1.56
--- corpse.cpp	5 Jul 2004 18:33:20 -0000	1.57
***************
*** 295,299 ****
  		character has been deleted or the owner of this corpse accidently died.
  	*/
! 	else if (name == "murderer") 
  	{
  		P_CHAR pChar = value.toChar();
--- 295,299 ----
  		character has been deleted or the owner of this corpse accidently died.
  	*/
! 	else if (name == "murderer")
  	{
  		P_CHAR pChar = value.toChar();
***************
*** 303,309 ****
  			murderer_ = INVALID_SERIAL;
  		}
! 	}		
  	/*
! 		\property corpse.murdertime The time when the murder was comitted in seconds 
  		since the epoch (UNIX timestamp).
  	*/
--- 303,309 ----
  			murderer_ = INVALID_SERIAL;
  		}
! 	}
  	/*
! 		\property corpse.murdertime The time when the murder was comitted in seconds
  		since the epoch (UNIX timestamp).
  	*/

Index: corpse.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** corpse.h	2 Jun 2004 15:04:04 -0000	1.23
--- corpse.h	5 Jul 2004 18:33:20 -0000	1.24
***************
*** 34,38 ****
  #include <qstring.h>
  
- 
  // System Includes
  #include <map>
--- 34,37 ----
***************
*** 55,59 ****
  	unsigned char direction_; // Direction the corpse is facing.
  	uint murdertime_; // When the people has been killed
! 	SERIAL murderer_; // Who was the murderer	
  	QCString charbaseid_;
  
--- 54,58 ----
  	unsigned char direction_; // Direction the corpse is facing.
  	uint murdertime_; // When the people has been killed
! 	SERIAL murderer_; // Who was the murderer
  	QCString charbaseid_;
  
***************
*** 89,93 ****
  	SERIAL murderer() const;
  	unsigned int murderTime() const;
!     
  	void addEquipment( UINT8 layer, SERIAL serial );
  	SERIAL getEquipment( UINT8 layer );
--- 88,92 ----
  	SERIAL murderer() const;
  	unsigned int murderTime() const;
! 
  	void addEquipment( UINT8 layer, SERIAL serial );
  	SERIAL getEquipment( UINT8 layer );
***************
*** 191,195 ****
  }
  
! inline const QCString &cCorpse::charBaseid() const 
  {
  	return charbaseid_;
--- 190,194 ----
  }
  
! inline const QCString &cCorpse::charBaseid() const
  {
  	return charbaseid_;

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.239
retrieving revision 1.240
diff -C2 -d -r1.239 -r1.240
*** commands.cpp	5 Jul 2004 14:03:15 -0000	1.239
--- commands.cpp	5 Jul 2004 18:33:19 -0000	1.240
***************
*** 26,30 ****
   */
  
- 
  #include "accounts.h"
  #include "skills.h"
--- 26,29 ----
***************
*** 1397,1430 ****
  stCommand cCommands::commands[] =
  {
! 	{ "ACCOUNT", commandAccount }, 
! 	{ "ADDEVENT", commandAddEvent }, 
  	{ "ALLMOVE", commandAllMove },
! 	{ "ALLSHOW", commandAllShow }, 
! 	{ "ALLSKILLS", commandAllSkills }, 
! 	{ "BROADCAST", commandBroadcast }, 
! 	{ "DOORGEN", commandDoorGenerator }, 
! 	{ "FIX", commandFix }, 
! 	{ "GMTALK", commandGmtalk }, 
! 	{ "INVIS", commandInvis }, 
! 	{ "KILL", commandKill }, 
! 	{ "MOVE", commandMove }, 
! 	{ "PAGES", commandPages }, 
! 	{ "PAGENOTIFY", commandPageNotify }, 
! 	{ "PASSWORD", commandPassword }, 
! 	{ "RELOAD", commandReload }, 
! 	{ "REMOVE", commandRemove }, 
! 	{ "REMOVEEVENT", commandRemoveEvent }, 
! 	{ "RESEND", commandResend }, 
! 	{ "RESTOCK", commandRestock }, 
! 	{ "RESURRECT", commandResurrect }, 
! 	{ "SAVE", commandSave }, 
  	{ "SERVERTIME", commandServerTime },
! 	{ "SET", commandSet }, 
! 	{ "SHOW", commandShow }, 
! 	{ "SHUTDOWN", commandShutDown }, 
! 	{ "STAFF", commandStaff }, 
! 	{ "SPAWNREGION", commandSpawnRegion }, 
  	{ "TELE", commandTele },
! 	{ "WHO", commandWho }, 
  	{ NULL, NULL }
  };
--- 1396,1429 ----
  stCommand cCommands::commands[] =
  {
! 	{ "ACCOUNT", commandAccount },
! 	{ "ADDEVENT", commandAddEvent },
  	{ "ALLMOVE", commandAllMove },
! 	{ "ALLSHOW", commandAllShow },
! 	{ "ALLSKILLS", commandAllSkills },
! 	{ "BROADCAST", commandBroadcast },
! 	{ "DOORGEN", commandDoorGenerator },
! 	{ "FIX", commandFix },
! 	{ "GMTALK", commandGmtalk },
! 	{ "INVIS", commandInvis },
! 	{ "KILL", commandKill },
! 	{ "MOVE", commandMove },
! 	{ "PAGES", commandPages },
! 	{ "PAGENOTIFY", commandPageNotify },
! 	{ "PASSWORD", commandPassword },
! 	{ "RELOAD", commandReload },
! 	{ "REMOVE", commandRemove },
! 	{ "REMOVEEVENT", commandRemoveEvent },
! 	{ "RESEND", commandResend },
! 	{ "RESTOCK", commandRestock },
! 	{ "RESURRECT", commandResurrect },
! 	{ "SAVE", commandSave },
  	{ "SERVERTIME", commandServerTime },
! 	{ "SET", commandSet },
! 	{ "SHOW", commandShow },
! 	{ "SHUTDOWN", commandShutDown },
! 	{ "STAFF", commandStaff },
! 	{ "SPAWNREGION", commandSpawnRegion },
  	{ "TELE", commandTele },
! 	{ "WHO", commandWho },
  	{ NULL, NULL }
  };