[wpdev-commits] wolfpack defines.h,1.55,1.56 definitions.cpp,1.9,1.10 guilds.cpp,1.15,1.16 items.cpp,1.421,1.422 items.h,1.203,1.204 log.h,1.9,1.10

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

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

Modified Files:
	defines.h definitions.cpp guilds.cpp items.cpp items.h log.h 
Log Message:
Whitespace cleanup...
I actually fixed a few warnings


Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.421
retrieving revision 1.422
diff -C2 -d -r1.421 -r1.422
*** items.cpp	2 Jul 2004 06:01:16 -0000	1.421
--- items.cpp	5 Jul 2004 18:23:06 -0000	1.422
***************
*** 1503,1507 ****
  }
  
- 
  void cItem::addItem( cItem* pItem, bool randomPos, bool handleWeight, bool noRemove )
  {
--- 1503,1506 ----
***************
*** 1992,2000 ****
  	*/
  	else
! 		GET_PROPERTY( "lightsource", lightsource() )	
  
  	/*
  	\rproperty item.decaydelay The decay delay for this item in miliseconds.
! 	This is 0 if the item won't decay. 
  	*/
  	else
--- 1991,1999 ----
  	*/
  	else
! 		GET_PROPERTY( "lightsource", lightsource() )
  
  	/*
  	\rproperty item.decaydelay The decay delay for this item in miliseconds.
! 	This is 0 if the item won't decay.
  	*/
  	else

Index: defines.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/defines.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** defines.h	2 Jul 2004 06:01:16 -0000	1.55
--- defines.h	5 Jul 2004 18:23:06 -0000	1.56
***************
*** 29,33 ****
  #define __DEFINES_H__
  
- 
  //o---------------------------------------------------------------------------o
  // FIXMEs / TODOs / NOTE macros
--- 29,32 ----
***************
*** 73,77 ****
  enum eSkills
  {
! 	ALCHEMY				= 0,
  	ANATOMY,
  	ANIMALLORE,
--- 72,76 ----
  enum eSkills
  {
! 	ALCHEMY = 0,
  	ANATOMY,
  	ANIMALLORE,

Index: items.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.h,v
retrieving revision 1.203
retrieving revision 1.204
diff -C2 -d -r1.203 -r1.204
*** items.h	3 Jun 2004 19:45:28 -0000	1.203
--- items.h	5 Jul 2004 18:23:12 -0000	1.204
***************
*** 45,49 ****
  
  /*
! 	This class represents an item definition and it's 
  	static properties.
  */
--- 45,49 ----
  
  /*
! 	This class represents an item definition and it's
  	static properties.
  */
***************
*** 66,70 ****
  	void load();
  	void reset();
! public:	
  	cItemBaseDef( const QCString& id );
  	~cItemBaseDef();
--- 66,70 ----
  	void load();
  	void reset();
! public:
  	cItemBaseDef( const QCString& id );
  	~cItemBaseDef();
***************
*** 207,211 ****
  	{
  		return priv_ & 0x20;
! 	} // Is the weapon twohanded ?	
  	bool secured() const
  	{
--- 207,211 ----
  	{
  		return priv_ & 0x20;
! 	} // Is the weapon twohanded ?
  	bool secured() const
  	{
***************
*** 215,219 ****
  	{
  		return priv_ & 0x10;
! 	} // Does this armor allow meditation?	
  	SI16 hp() const
  	{
--- 215,219 ----
  	{
  		return priv_ & 0x10;
! 	} // Does this armor allow meditation?
  	SI16 hp() const
  	{
***************
*** 290,294 ****
  	}
  
! 	inline unsigned char lightsource() 
  	{
  		return basedef_ ? basedef_->lightsource() : 0;
--- 290,294 ----
  	}
  
! 	inline unsigned char lightsource()
  	{
  		return basedef_ ? basedef_->lightsource() : 0;

Index: guilds.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/guilds.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** guilds.cpp	2 Jul 2004 13:35:36 -0000	1.15
--- guilds.cpp	5 Jul 2004 18:23:06 -0000	1.16
***************
*** 365,369 ****
  {
  	PyObject_HEAD_INIT( NULL )
! 	0, "guild", sizeof( wpGuildType ), 0, wpDealloc, 0, ( getattrfunc ) wpGuild_getAttr, ( setattrfunc ) wpGuild_setAttr, wpGuild_compare, 
  };
  
--- 365,369 ----
  {
  	PyObject_HEAD_INIT( NULL )
! 	0, "guild", sizeof( wpGuildType ), 0, wpDealloc, 0, ( getattrfunc ) wpGuild_getAttr, ( setattrfunc ) wpGuild_setAttr, wpGuild_compare,
  };
  
***************
*** 732,736 ****
  	}
  	/*
! 		\property guild.serial This is the unique integer id for this guild. It can be used to 
  		retrieve a guild object by using the wolfpack.findguild function.
  	*/
--- 732,736 ----
  	}
  	/*
! 		\property guild.serial This is the unique integer id for this guild. It can be used to
  		retrieve a guild object by using the wolfpack.findguild function.
  	*/

Index: definitions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** definitions.cpp	19 Jun 2004 07:37:53 -0000	1.9
--- definitions.cpp	5 Jul 2004 18:23:06 -0000	1.10
***************
*** 66,74 ****
  stCategory categories[] =
  {
! 	{ "item", WPDT_ITEM }, 
! 	{ "script", WPDT_SCRIPT }, 
  	{ "npc", WPDT_NPC },
! 	{ "list", WPDT_LIST }, 
! 	{ "menu", WPDT_MENU }, 
  	{ "spell", WPDT_SPELL },
  	{ "acl", WPDT_PRIVLEVEL },
--- 66,74 ----
  stCategory categories[] =
  {
! 	{ "item", WPDT_ITEM },
! 	{ "script", WPDT_SCRIPT },
  	{ "npc", WPDT_NPC },
! 	{ "list", WPDT_LIST },
! 	{ "menu", WPDT_MENU },
  	{ "spell", WPDT_SPELL },
  	{ "acl", WPDT_PRIVLEVEL },
***************
*** 76,92 ****
  	{ "region", WPDT_REGION },
  	{ "multi", WPDT_MULTI },
! 	{ "text", WPDT_TEXT }, 
  	{ "startitems", WPDT_STARTITEMS },
  	{ "location", WPDT_LOCATION },
! 	{ "skill", WPDT_SKILL }, 
  	{ "action", WPDT_ACTION },
  	{ "make", WPDT_MAKESECTION },
! 	{ "makeitem", WPDT_MAKEITEM }, 
  	{ "useitem", WPDT_USEITEM },
! 	{ "skillcheck", WPDT_SKILLCHECK }, 
! 	{ "define", WPDT_DEFINE }, 
! 	{ "resource", WPDT_RESOURCE }, 
! 	{ "contextmenu", WPDT_CONTEXTMENU }, 
! 	{ "ai", WPDT_AI }, { 0, WPDT_COUNT }, 
  };
  
--- 76,93 ----
  	{ "region", WPDT_REGION },
  	{ "multi", WPDT_MULTI },
! 	{ "text", WPDT_TEXT },
  	{ "startitems", WPDT_STARTITEMS },
  	{ "location", WPDT_LOCATION },
! 	{ "skill", WPDT_SKILL },
  	{ "action", WPDT_ACTION },
  	{ "make", WPDT_MAKESECTION },
! 	{ "makeitem", WPDT_MAKEITEM },
  	{ "useitem", WPDT_USEITEM },
! 	{ "skillcheck", WPDT_SKILLCHECK },
! 	{ "define", WPDT_DEFINE },
! 	{ "resource", WPDT_RESOURCE },
! 	{ "contextmenu", WPDT_CONTEXTMENU },
! 	{ "ai", WPDT_AI },
! 	{ 0, WPDT_COUNT },
  };
  
***************
*** 730,738 ****
  	PyObject_HEAD_INIT( NULL )
  	0,
! 	"element", 
! 	sizeof( wpElementType ), 
! 	0, 
! 	wpDealloc, 
! 	0, 
  	( getattrfunc ) wpElement_getAttr
  };
--- 731,739 ----
  	PyObject_HEAD_INIT( NULL )
  	0,
! 	"element",
! 	sizeof( wpElementType ),
! 	0,
! 	wpDealloc,
! 	0,
  	( getattrfunc ) wpElement_getAttr
  };

Index: log.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/log.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** log.h	2 Jun 2004 15:04:06 -0000	1.9
--- log.h	5 Jul 2004 18:23:12 -0000	1.10
***************
*** 41,52 ****
  enum eLogLevel
  {
! 	LOG_MESSAGE		= 0x01,
! 	LOG_ERROR		= 0x02,
! 	LOG_PYTHON		= 0x04,
! 	LOG_WARNING		= 0x08,
! 	LOG_NOTICE		= 0x10,
! 	LOG_TRACE		= 0x20,
! 	LOG_DEBUG		= 0x40,
! 	LOG_ALL			= 0xFF
  };
  
--- 41,52 ----
  enum eLogLevel
  {
! 	LOG_MESSAGE = 0x01,
! 	LOG_ERROR = 0x02,
! 	LOG_PYTHON = 0x04,
! 	LOG_WARNING = 0x08,
! 	LOG_NOTICE = 0x10,
! 	LOG_TRACE = 0x20,
! 	LOG_DEBUG = 0x40,
! 	LOG_ALL = 0xFF
  };