wpdev-commits — Wolfpack CVS commit info

[wpdev-commits] wolfpack console.cpp,1.20,1.21 dbdriver.cpp,1.37,1.38 definitions.cpp,1.10,1.11 guilds.cpp,1.16,1.17 party.cpp,1.14,1.15 server.cpp,1.10,1.11 speech.cpp,1.179,1.180 wolfpack.pro,1.197,1.198

[Correa <thi...@us...>]

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

Modified Files:
	console.cpp dbdriver.cpp definitions.cpp guilds.cpp party.cpp 
	server.cpp speech.cpp wolfpack.pro 
Log Message:
fixed possible bug with python interface ( possibly source of crashing bugs )
Added Py_RETURN_NONE/TRUE/FALSE as in Python 2.4
added status on MySQL/SQLite modules.

Index: definitions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** definitions.cpp	5 Jul 2004 18:23:06 -0000	1.10
--- definitions.cpp	20 Jul 2004 04:40:51 -0000	1.11
***************
*** 736,740 ****
  	wpDealloc,
  	0,
! 	( getattrfunc ) wpElement_getAttr
  };
  
--- 736,741 ----
  	wpDealloc,
  	0,
! 	( getattrfunc ) wpElement_getAttr,
! 	0,
  };
  
***************
*** 748,752 ****
  	}
  
! 	return self->element->hasAttribute( name ) ? PyTrue() : PyFalse();
  }
  
--- 749,755 ----
  	}
  
! 	if ( self->element->hasAttribute( name ) )
! 		Py_RETURN_TRUE;
! 	Py_RETURN_FALSE;
  }
  
***************
*** 798,803 ****
  	else
  	{
! 		Py_INCREF( Py_None );
! 		return Py_None;
  	}
  }
--- 801,805 ----
  	else
  	{
! 		Py_RETURN_NONE;
  	}
  }
***************
*** 820,825 ****
  	else
  	{
! 		Py_INCREF( Py_None );
! 		return Py_None;
  	}
  }
--- 822,826 ----
  	else
  	{
! 		Py_RETURN_NONE;
  	}
  }
***************
*** 847,852 ****
  		else
  		{
! 			Py_INCREF( Py_None );
! 			return Py_None;
  		}
  	}
--- 848,852 ----
  		else
  		{
! 			Py_RETURN_NONE;
  		}
  	}

Index: server.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** server.cpp	2 Jun 2004 15:04:06 -0000	1.10
--- server.cpp	20 Jul 2004 04:40:51 -0000	1.11
***************
*** 420,425 ****
  
  	Console::instance()->send( "Compiled for Python " PY_VERSION " (Using: " );
! 	Console::instance()->send( pythonBuild + ")\n\n" );
! 
  	QString consoleTitle = QString( "%1 %2 %3" ).arg( productString(), productBeta(), productVersion() );
  	Console::instance()->setConsoleTitle( consoleTitle );
--- 420,431 ----
  
  	Console::instance()->send( "Compiled for Python " PY_VERSION " (Using: " );
! 	Console::instance()->send( pythonBuild + ")\n" );
! 	Console::instance()->send( "SQLite Support: enabled\n" );
! #if defined (MYSQL_DRIVER)
! 	Console::instance()->send( "MySQL Support.: enabled\n" );
! #else
! 	Console::instance()->send( "MySQL Support.: disabled\n" );
! #endif
! 	Console::instance()->send("\n");
  	QString consoleTitle = QString( "%1 %2 %3" ).arg( productString(), productBeta(), productVersion() );
  	Console::instance()->setConsoleTitle( consoleTitle );

Index: party.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/party.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** party.cpp	2 Jul 2004 13:35:36 -0000	1.14
--- party.cpp	20 Jul 2004 04:40:51 -0000	1.15
***************
*** 457,461 ****
  {
  	PyObject_HEAD_INIT( NULL )
! 	0, "party", sizeof( wpPartyType ), 0, wpDealloc, 0, ( getattrfunc ) wpParty_getAttr, ( setattrfunc ) wpParty_setAttr, wpParty_compare, 
  };
  
--- 457,470 ----
  {
  	PyObject_HEAD_INIT( NULL )
! 	0, 
! 	"party", 
! 	sizeof( wpPartyType ), 
! 	0, 
! 	wpDealloc, 
! 	0, 
! 	( getattrfunc ) wpParty_getAttr, 
! 	( setattrfunc ) wpParty_setAttr, 
! 	wpParty_compare,
! 	0,
  };
  
***************
*** 490,495 ****
  		PyMem_Free( message );
  
! 		Py_INCREF(Py_None);
! 		return Py_None;
  	}
  
--- 499,503 ----
  		PyMem_Free( message );
  
! 		Py_RETURN_NONE;
  	}
  
***************
*** 517,521 ****
  		PyMem_Free( message );
  
! 		return PyTrue();
  	}
  
--- 525,529 ----
  		PyMem_Free( message );
  
! 		Py_RETURN_TRUE;
  	}
  

Index: speech.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** speech.cpp	18 Jul 2004 21:02:58 -0000	1.179
--- speech.cpp	20 Jul 2004 04:40:51 -0000	1.180
***************
*** 70,74 ****
  		return false;
  
! 	bool ok;
  	//INT32 num = speech.toInt( &ok ); // Generally try to convert it
  	QString notification;
--- 70,74 ----
  		return false;
  
! 	bool ok = false;
  	//INT32 num = speech.toInt( &ok ); // Generally try to convert it
  	QString notification;
***************
*** 78,90 ****
  		// Pricing an item - PlayerVendors
  	case cPlayer::enPricing:
! 		if ( ok )
! 		{
! 			//			pItem->setPrice( num );
! 			//			socket->sysMessage( tr( "This item's price has been set to %1." ).arg( num ) );
! 			socket->sysMessage( "Ops, sorry not implemented" );
! 		}
! 		else
! 			socket->sysMessage( tr( "You have to enter a numeric price" ) );
! 
  		pChar->setInputMode( cPlayer::enDescription );
  		socket->sysMessage( tr( "Enter a description for this item." ) );
--- 78,82 ----
  		// Pricing an item - PlayerVendors
  	case cPlayer::enPricing:
! 		socket->sysMessage( "Ops, sorry not implemented" );
  		pChar->setInputMode( cPlayer::enDescription );
  		socket->sysMessage( tr( "Enter a description for this item." ) );

Index: dbdriver.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** dbdriver.cpp	2 Jul 2004 13:35:36 -0000	1.37
--- dbdriver.cpp	20 Jul 2004 04:40:51 -0000	1.38
***************
*** 190,194 ****
  {
  	PyObject_HEAD_INIT( NULL )
! 	0, "dbresult", sizeof( wpDbResultType ), 0, wpDeallocDbResult, 0, ( getattrfunc ) wpDbResult_getAttr
  };
  
--- 190,201 ----
  {
  	PyObject_HEAD_INIT( NULL )
! 	0, 
! 	"dbresult", 
! 	sizeof( wpDbResultType ), 
! 	0, 
! 	wpDeallocDbResult, 
! 	0, 
! 	( getattrfunc ) wpDbResult_getAttr,
! 	0,
  };
  
***************
*** 202,207 ****
  	Q_UNUSED( args );
  	self->result->free();
! 	Py_INCREF( Py_None );
! 	return Py_None;
  }
  
--- 209,213 ----
  	Q_UNUSED( args );
  	self->result->free();
! 	Py_RETURN_NONE;
  }
  
***************
*** 217,223 ****
  
  	if ( result )
! 		return PyTrue();
  	else
! 		return PyFalse();
  }
  
--- 223,229 ----
  
  	if ( result )
! 		Py_RETURN_TRUE;
  	else
! 		Py_RETURN_FALSE;
  }
  

Index: guilds.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/guilds.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** guilds.cpp	5 Jul 2004 18:23:06 -0000	1.16
--- guilds.cpp	20 Jul 2004 04:40:51 -0000	1.17
***************
*** 365,369 ****
  {
  	PyObject_HEAD_INIT( NULL )
! 	0, "guild", sizeof( wpGuildType ), 0, wpDealloc, 0, ( getattrfunc ) wpGuild_getAttr, ( setattrfunc ) wpGuild_setAttr, wpGuild_compare,
  };
  
--- 365,378 ----
  {
  	PyObject_HEAD_INIT( NULL )
! 	0, 
! 	"guild", 
! 	sizeof( wpGuildType ), 
! 	0, 
! 	wpDealloc, 
! 	0, 
! 	( getattrfunc ) wpGuild_getAttr, 
! 	( setattrfunc ) wpGuild_setAttr, 
! 	wpGuild_compare,
! 	0,
  };
  
***************
*** 391,399 ****
  		{
  			self->guild->addMember( player );
! 			return PyTrue();
  		}
  		else
  		{
! 			return PyFalse();
  		}
  	}
--- 400,408 ----
  		{
  			self->guild->addMember( player );
! 			Py_RETURN_TRUE;
  		}
  		else
  		{
! 			Py_RETURN_FALSE;
  		}
  	}
***************
*** 416,424 ****
  		{
  			self->guild->removeMember( player );
! 			return PyTrue();
  		}
  		else
  		{
! 			return PyFalse();
  		}
  	}
--- 425,433 ----
  		{
  			self->guild->removeMember( player );
! 			Py_RETURN_TRUE;
  		}
  		else
  		{
! 			Py_RETURN_FALSE;
  		}
  	}
***************
*** 441,449 ****
  		{
  			self->guild->addCanidate( player );
! 			return PyTrue();
  		}
  		else
  		{
! 			return PyFalse();
  		}
  	}
--- 450,458 ----
  		{
  			self->guild->addCanidate( player );
! 			Py_RETURN_TRUE;
  		}
  		else
  		{
! 			Py_RETURN_FALSE;
  		}
  	}
***************
*** 466,474 ****
  		{
  			self->guild->removeCanidate( player );
! 			return PyTrue();
  		}
  		else
  		{
! 			return PyFalse();
  		}
  	}
--- 475,483 ----
  		{
  			self->guild->removeCanidate( player );
! 			Py_RETURN_TRUE;
  		}
  		else
  		{
! 			Py_RETURN_FALSE;
  		}
  	}
***************
*** 540,544 ****
  	}
  
! 	return PyTrue();
  }
  
--- 549,553 ----
  	}
  
! 	Py_RETURN_TRUE;
  }
  
***************
*** 597,601 ****
  	delete self->guild;
  	self->guild = 0;
! 	return PyTrue();
  }
  
--- 606,610 ----
  	delete self->guild;
  	self->guild = 0;
! 	Py_RETURN_TRUE;
  }
  
***************
*** 653,658 ****
  		if ( !self->guild->leader() )
  		{
! 			Py_INCREF( Py_None );
! 			return Py_None;
  		}
  		else
--- 662,666 ----
  		if ( !self->guild->leader() )
  		{
! 			Py_RETURN_NONE;
  		}
  		else
***************
*** 757,762 ****
  		else
  		{
! 			Py_INCREF( Py_None );
! 			return Py_None;
  		}
  	}
--- 765,769 ----
  		else
  		{
! 			Py_RETURN_NONE;
  		}
  	}

Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.197
retrieving revision 1.198
diff -C2 -d -r1.197 -r1.198
*** wolfpack.pro	19 Jul 2004 21:58:30 -0000	1.197
--- wolfpack.pro	20 Jul 2004 04:40:51 -0000	1.198
***************
*** 15,19 ****
  	# Common unix settings
  	# Lets try to figure some paths
- 	message("HINT: use ./configure script!")
  
  	CONFIG += console
--- 15,18 ----
***************
*** 42,51 ****
  INCLUDEPATH += sqlite 
  win32:DEFINES -= UNICODE
- #CONFIG += precompile_header
- # Precompiled header
- precompile_header:PRECOMPILED_HEADER = wolfpack_pch.h
  
  # Include configure's settings
! include(config.pri)
  
  # Common files
--- 41,52 ----
  INCLUDEPATH += sqlite 
  win32:DEFINES -= UNICODE
  
  # Include configure's settings
! !include(config.pri) {
! 	message("HINT: use ./configure script!")
! }
! 
! # Precompiled header
! precompile_header:PRECOMPILED_HEADER = wolfpack_pch.h
  
  # Common files

Index: console.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** console.cpp	2 Jun 2004 15:04:04 -0000	1.20
--- console.cpp	20 Jul 2004 04:40:51 -0000	1.21
***************
*** 44,55 ****
  #include <qmutex.h>
  
- #if defined(Q_OS_UNIX)
- 	#include <sys/types.h>
- 	#include <sys/time.h>
- 	#include <unistd.h>
- #else
- 
- #endif
- 
  using namespace std;
  
--- 44,47 ----

[wpdev-commits] xmlscripts/scripts food.py,1.10,1.11 potionkeg.py,1.10,1.11

[Correa <thi...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15474

Modified Files:
	food.py potionkeg.py 
Log Message:
item.magic is now item.movable

Index: food.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/food.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** food.py	12 Jul 2004 21:06:29 -0000	1.10
--- food.py	19 Jul 2004 23:22:15 -0000	1.11
***************
*** 94,98 ****
  			char.events = ['food'] + char.events
  			char.say( "*nibbles*" )
! 			item.magic = 3
  			item.update()
  			return True
--- 94,98 ----
  			char.events = ['food'] + char.events
  			char.say( "*nibbles*" )
! 			item.movable = 3
  			item.update()
  			return True

Index: potionkeg.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/potionkeg.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** potionkeg.py	16 Jul 2004 07:09:26 -0000	1.10
--- potionkeg.py	19 Jul 2004 23:22:15 -0000	1.11
***************
*** 95,99 ****
  				return False
  			newpot.decay = 1
! 			newpot.magic = 1
  			socket.clilocmessage( 502242 ) # You pour some of the keg's contents into an empty bottle...
  			socket.clilocmessage( 502243 ) # ...and place it into your backpack.
--- 95,99 ----
  				return False
  			newpot.decay = 1
! 			newpot.movable = 1
  			socket.clilocmessage( 502242 ) # You pour some of the keg's contents into an empty bottle...
  			socket.clilocmessage( 502243 ) # ...and place it into your backpack.

[wpdev-commits] wolfpack items.cpp,1.424,1.425 items.h,1.204,1.205

[Correa <thi...@us...>]

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

Modified Files:
	items.cpp items.h 
Log Message:
item.magic is now item.movable

Index: items.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.h,v
retrieving revision 1.204
retrieving revision 1.205
diff -C2 -d -r1.204 -r1.205
*** items.h	5 Jul 2004 18:23:12 -0000	1.204
--- items.h	19 Jul 2004 23:19:11 -0000	1.205
***************
*** 359,366 ****
  	{
  		maxhp_ = nValue; flagChanged(); changed( TOOLTIP );
! 	};
  	void setNewbie( bool nValue )
  	{
! 		( nValue ) ? priv_ |= 0x02 : priv_ &= 0xFD; flagChanged(); changed( TOOLTIP );
  	}
  	void setUnprocessed( bool nValue )
--- 359,366 ----
  	{
  		maxhp_ = nValue; flagChanged(); changed( TOOLTIP );
! 	}
  	void setNewbie( bool nValue )
  	{
! 		( nValue ) ? priv_ |= 0x02 : priv_ &= ~0x02; flagChanged(); changed( TOOLTIP );
  	}
  	void setUnprocessed( bool nValue )

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.424
retrieving revision 1.425
diff -C2 -d -r1.424 -r1.425
*** items.cpp	19 Jul 2004 21:58:28 -0000	1.424
--- items.cpp	19 Jul 2004 23:19:11 -0000	1.425
***************
*** 1866,1870 ****
  
  		/*
! 		\property item.magic The movable permission for the object.
  		Values:
  		<code>0 - Tiledata default
--- 1866,1870 ----
  
  		/*
! 		\property item.movable The movable permission for the object.
  		Values:
  		<code>0 - Tiledata default
***************
*** 1875,1879 ****
  		*/
  	else
! 		SET_INT_PROPERTY( "magic", magic_ )
  
  		// Flags
--- 1875,1879 ----
  		*/
  	else
! 		SET_INT_PROPERTY( "movable", magic_ )
  
  		// Flags
***************
*** 2064,2068 ****
  		GET_PROPERTY( "ownervisible", visible_ == 1 ? 1 : 0 )
  	else
! 		GET_PROPERTY( "magic", magic_ )
  
  		// Flags
--- 2064,2068 ----
  		GET_PROPERTY( "ownervisible", visible_ == 1 ? 1 : 0 )
  	else
! 		GET_PROPERTY( "movable", magic_ )
  
  		// Flags

[wpdev-commits] wolfpack configure.py,1.5,1.6

[Correa <thi...@us...>]

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

Modified Files:
	configure.py 
Log Message:
item.magic is now item.movable

Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure.py	19 Jul 2004 22:54:33 -0000	1.5
--- configure.py	19 Jul 2004 23:18:33 -0000	1.6
***************
*** 134,139 ****
  	
  	config.write("LIBS += %s\n" % LIBS)
  	
! 	config.write("Generating makefile...")
  	os.execv(qt_qmake, [qt_qmake, "wolfpack.pro"])
  
--- 134,140 ----
  	
  	config.write("LIBS += %s\n" % LIBS)
+ 	config.close()
  	
! 	sys.stdout.write("Generating makefile...")
  	os.execv(qt_qmake, [qt_qmake, "wolfpack.pro"])
  

[wpdev-commits] wolfpack configure.py,1.4,1.5

[Correa <thi...@us...>]

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

Modified Files:
	configure.py 
Log Message:
no message

Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.py	19 Jul 2004 22:23:00 -0000	1.4
--- configure.py	19 Jul 2004 22:54:33 -0000	1.5
***************
*** 135,139 ****
  	config.write("LIBS += %s\n" % LIBS)
  	
! 	
  
  	
--- 135,140 ----
  	config.write("LIBS += %s\n" % LIBS)
  	
! 	config.write("Generating makefile...")
! 	os.execv(qt_qmake, [qt_qmake, "wolfpack.pro"])
  
  	

[wpdev-commits] wolfpack configure.py,1.3,1.4

[Correa <thi...@us...>]

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

Modified Files:
	configure.py 
Log Message:
little fix

Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure.py	19 Jul 2004 22:13:09 -0000	1.3
--- configure.py	19 Jul 2004 22:23:00 -0000	1.4
***************
*** 125,129 ****
  	config.write("#          any changes to this file will be lost!\n")
  	
! 	config.write("INCLUDEPATH += %s" % ( py_incpath ) )
  	# Build LIBS
  	LIBS = ""
--- 125,129 ----
  	config.write("#          any changes to this file will be lost!\n")
  	
! 	config.write("INCLUDEPATH += %s\n" % ( py_incpath ) )
  	# Build LIBS
  	LIBS = ""
***************
*** 133,137 ****
  		LIBS = "-l%s -L%s" % ( py_libfile, py_libpath )
  	
! 	config.write("LIBS += %s" % LIBS)
  	
  	
--- 133,137 ----
  		LIBS = "-l%s -L%s" % ( py_libfile, py_libpath )
  	
! 	config.write("LIBS += %s\n" % LIBS)
  	
  	

[wpdev-commits] wolfpack configure.py,1.2,1.3

[Correa <thi...@us...>]

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

Modified Files:
	configure.py 
Log Message:
little fix

Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.py	19 Jul 2004 22:02:54 -0000	1.2
--- configure.py	19 Jul 2004 22:13:09 -0000	1.3
***************
*** 128,132 ****
  	# Build LIBS
  	LIBS = ""
! 	if sys.platform == win32:
  		LIBS = os.path.join( py_libpath, py_libfile )
  	else:
--- 128,132 ----
  	# Build LIBS
  	LIBS = ""
! 	if sys.platform == "win32":
  		LIBS = os.path.join( py_libpath, py_libfile )
  	else:

[wpdev-commits] wolfpack configure.py,1.1,1.2

[Correa <thi...@us...>]

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

Modified Files:
	configure.py 
Log Message:
you couldn't expect it to work on the first time, right?

Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** configure.py	19 Jul 2004 21:58:28 -0000	1.1
--- configure.py	19 Jul 2004 22:02:54 -0000	1.2
***************
*** 122,131 ****
  		
  	config = file("config.pri", "w")
- 	config.write("#################################################################\n \
- 				  #   )      (\_     # Wolfpack 13.0.0 Build Script               #\n \
- 				  #  ((    _/{  \"-;  # Created by: Wolfpack Development Team      #\n \
- 				  #   )).-" {{ ;\"`   # Revised by: Wolfpack Development Team      #\n \
- 				  #  ( (  ;._ \\ ctr # Last Modification: check cvs logs          #\n \
- 				  #################################################################\n")
  	config.write("# WARNING: This file was automatically generated by configure.py\n ")
  	config.write("#          any changes to this file will be lost!\n")
--- 122,125 ----

[wpdev-commits] xmlscripts/scripts/commands decoration.py,1.4,1.5

[Correa <thi...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31782

Modified Files:
	decoration.py 
Log Message:
fixed.
players can't move decoration items

Index: decoration.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/decoration.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** decoration.py	15 Jul 2004 02:23:18 -0000	1.4
--- decoration.py	19 Jul 2004 21:59:49 -0000	1.5
***************
*** 66,71 ****
              map = int( atts.getValue("map") )
              item.moveto( x, y, z, map )
              item.update()
!             item.decay = 0
  
  
--- 66,72 ----
              map = int( atts.getValue("map") )
              item.moveto( x, y, z, map )
+             item.magic = 3 # not moveable
              item.update()
!             item.decay = 0 # no decay
  
  

[wpdev-commits] wolfpack configure.py,NONE,1.1 items.cpp,1.423,1.424 wolfpack.pro,1.196,1.197

[Correa <thi...@us...>]

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

Modified Files:
	items.cpp wolfpack.pro 
Added Files:
	configure.py 
Log Message:
new configure script
minor cleanup

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.423
retrieving revision 1.424
diff -C2 -d -r1.423 -r1.424
*** items.cpp	17 Jul 2004 08:23:27 -0000	1.423
--- items.cpp	19 Jul 2004 21:58:28 -0000	1.424
***************
*** 1903,1909 ****
  	{
  		if ( value.toInt() )
! 			priv_ |= 0x02;
  		else
! 			priv_ &= ~0x02;
  		return 0;
  	}
--- 1903,1909 ----
  	{
  		if ( value.toInt() )
! 			setNewbie(true);
  		else
! 			setNewbie(false);
  		return 0;
  	}

Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.196
retrieving revision 1.197
diff -C2 -d -r1.196 -r1.197
*** wolfpack.pro	10 Jun 2004 00:27:12 -0000	1.196
--- wolfpack.pro	19 Jul 2004 21:58:30 -0000	1.197
***************
*** 9,13 ****
  TARGET = wolfpack
  TEMPLATE = app
! CONFIG += qt console thread exceptions rtti
  
  unix {
--- 9,13 ----
  TARGET = wolfpack
  TEMPLATE = app
! CONFIG += qt thread exceptions rtti
  
  unix {
***************
*** 46,49 ****
--- 46,51 ----
  precompile_header:PRECOMPILED_HEADER = wolfpack_pch.h
  
+ # Include configure's settings
+ include(config.pri)
  
  # Common files

--- NEW FILE: configure.py ---

#################################################################
#   )      (\_     # Wolfpack 13.0.0 Build Script               #
#  ((    _/{  "-;  # Created by: Wolfpack Development Team      #
#   )).-" {{ ;"`   # Revised by: Wolfpack Development Team      #
#  ( (  ;._ \\ ctr # Last Modification: check cvs logs          #
#################################################################

import os
import sys
import glob
import fnmatch
import dircache
import string

# These are the variables we are trying to figure out
py_libpath = ""
py_libfile = ""
py_incpath = ""
qt_qmake = ""

sys.stdout.write( "Wolfpack configure script\n"	)

def findFile( searchpath ):
	path = ""
	file = ""
	for entry in searchpath:
		pathexp, fileexp = os.path.split( entry )
		for path in glob.glob(pathexp):
			if os.path.exists(path):
				for file in dircache.listdir(path):
					if fnmatch.fnmatch( file, fileexp ):
						return (file, path)
	return (None, None)


def checkQt():

	if sys.platform == "win32":
		QMAKE_EXECUTABLE = "qmake.exe"
	else:
		QMAKE_EXECUTABLE = "qmake"

	sys.stdout.write( "Checking QTDIR enviroment variable..." )
	if ( len( os.environ["QTDIR"] ) > 0 and os.path.exists( os.environ["QTDIR"] ) ):
		sys.stdout.write( "ok\n" )
	else:
		sys.stdout.write( "failed\n" )
		sys.stdout.write( "You must properly setup QTDIR" )
		sys.exit();
	sys.stdout.write( "Searching for qmake..." )
	temp = ""
	
	QMAKESEARCHPATH = [ os.path.join(os.path.join(os.environ["QTDIR"], "bin"), QMAKE_EXECUTABLE) ]
	for dir in string.split( os.environ["PATH"], os.path.pathsep ):
		QMAKESEARCHPATH.append( os.path.join(dir, QMAKE_EXECUTABLE) )

	qmake_file, qmake_path = findFile(QMAKESEARCHPATH)
	global qt_qmake;
	qt_qmake = os.path.join(qmake_path, qmake_file)
	sys.stdout.write( "%s\n" % qt_qmake )
	
	return True

def checkPython():
	if sys.platform == "win32":
		PYTHONLIBSEARCHPATH = [ sys.prefix + "\Libs\python*.lib" ]
		PYTHONINCSEARCHPATH = [ sys.prefix + "\include\Python.h" ]
	elif sys.platform == "linux2":
		PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython*.so", \
							 "/usr/local/lib/[Pp]ython*/libpython*.so", \
							 "/usr/lib/libpython*.so", \
							 "/usr/lib/[Pp]ython*/libpython*.so", \
							 "/usr/lib/[Pp]ython*/config/libpython*.so", \
							 "/usr/local/lib/[Pp]ython*/config/libpython*.so"]
		PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython*/Python.h", \
							 "/usr/include/[Pp]ython*/Python.h"]

	else:
		sys.stdout.write("ERROR: Unknown platform %s to checkPython()" % sys.platform )
	sys.stdout.write( "Checking Python version... " )
	if sys.hexversion >= 0x020300F0:
		sys.stdout.write("ok\n")
	else:
		sys.stdout.write( "failed\n" )
		sys.stdout.write( "Wolfpack requires Python version greater than 2.3.0 " )
		sys.exit();
	sys.stdout.write( "Searching for Python library... " )
	
	global py_libpath
	global py_libfile

	py_libfile, py_libpath = findFile( PYTHONLIBSEARCHPATH )
	if ( py_libfile ):
		sys.stdout.write("%s\n" % os.path.join( py_libpath, py_libfile ) )
	else:
		sys.stdout.write("Not Found!\n")
		sys.exit()

	global py_incpath
	py_incfile = None
	sys.stdout.write( "Searching for Python includes... " )
	py_incfile, py_incpath = findFile( PYTHONINCSEARCHPATH )
	if ( py_incfile ):
		sys.stdout.write( "%s\n" % py_incpath )
	else:
		sys.stdout.write("Not Found!\n")
		sys.exit()
	
	return True

# Entry point
def main():
	checkPython()
	checkQt()

	# Create config.pri
	global py_libpath
	global py_libfile
	global py_incpath
	global qt_qmake
		
	config = file("config.pri", "w")
	config.write("#################################################################\n \
				  #   )      (\_     # Wolfpack 13.0.0 Build Script               #\n \
				  #  ((    _/{  \"-;  # Created by: Wolfpack Development Team      #\n \
				  #   )).-" {{ ;\"`   # Revised by: Wolfpack Development Team      #\n \
				  #  ( (  ;._ \\ ctr # Last Modification: check cvs logs          #\n \
				  #################################################################\n")
	config.write("# WARNING: This file was automatically generated by configure.py\n ")
	config.write("#          any changes to this file will be lost!\n")
	
	config.write("INCLUDEPATH += %s" % ( py_incpath ) )
	# Build LIBS
	LIBS = ""
	if sys.platform == win32:
		LIBS = os.path.join( py_libpath, py_libfile )
	else:
		LIBS = "-l%s -L%s" % ( py_libfile, py_libpath )
	
	config.write("LIBS += %s" % LIBS)
	
	

	
if __name__ == "__main__":
    main()

[wpdev-commits] xmlscripts/scripts/magic __init__.py,1.8,1.9 firefield.py,1.4,1.5 poisonfield.py,1.3,1.4 polymorph.py,1.3,1.4 rune.py,1.5,1.6 runebook.py,1.5,1.6 spell.py,1.9,1.10 spellbook.py,1.6,1.7 trap.py,1.4,1.5 utilities.py,1.7,1.8

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

Update of /cvsroot/wpdev/xmlscripts/scripts/magic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21901

Modified Files:
	__init__.py firefield.py poisonfield.py polymorph.py rune.py 
	runebook.py spell.py spellbook.py trap.py utilities.py 
Log Message:
import cleanups


Index: rune.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/rune.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rune.py	15 Jul 2004 01:50:41 -0000	1.5
--- rune.py	19 Jul 2004 21:07:36 -0000	1.6
***************
*** 8,13 ****
  #===============================================================#
  
- from wolfpack.gumps import cGump
  import wolfpack
  
  # This function returns 1 if the tested
--- 8,13 ----
  #===============================================================#
  
  import wolfpack
+ from wolfpack.gumps import cGump
  
  # This function returns 1 if the tested

Index: runebook.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/runebook.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** runebook.py	15 Jul 2004 20:31:14 -0000	1.5
--- runebook.py	19 Jul 2004 21:07:36 -0000	1.6
***************
*** 6,11 ****
  #################################################################
  
- from wolfpack.gumps import cGump
  import wolfpack
  from magic.rune import isrune
  from magic.utilities import fizzle
--- 6,11 ----
  #################################################################
  
  import wolfpack
+ from wolfpack.gumps import cGump
  from magic.rune import isrune
  from magic.utilities import fizzle

Index: polymorph.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/polymorph.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** polymorph.py	26 May 2004 13:07:23 -0000	1.3
--- polymorph.py	19 Jul 2004 21:07:36 -0000	1.4
***************
*** 1,6 ****
  
- from wolfpack import console
- from wolfpack.consts import *
  import wolfpack
  from system.makemenus import MakeAction, MakeMenu, findmenu
  from magic import castSpell
--- 1,5 ----
  
  import wolfpack
+ from wolfpack import console
  from system.makemenus import MakeAction, MakeMenu, findmenu
  from magic import castSpell

Index: spell.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** spell.py	20 May 2004 06:32:29 -0000	1.9
--- spell.py	19 Jul 2004 21:07:36 -0000	1.10
***************
*** 1,9 ****
  
  import magic
- from wolfpack.consts import *
- from magic.utilities import *
- import wolfpack.console
  import random
  from wolfpack import properties
  
  # Recursive Function for counting reagents
--- 1,10 ----
  
  import magic
  import random
+ import wolfpack.console
  from wolfpack import properties
+ from magic.utilities import *
+ from wolfpack.consts import MAGICRESISTANCE, EVALUATINGINTEL, INSCRIPTION, \
+ 	MAGERY, ANIM_CASTDIRECTED, SPELLDAMAGEBONUS, LOG_WARNING \
  
  # Recursive Function for counting reagents

Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/utilities.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** utilities.py	26 May 2004 13:07:23 -0000	1.7
--- utilities.py	19 Jul 2004 21:07:36 -0000	1.8
***************
*** 3,7 ****
  from wolfpack.utilities import *
  from wolfpack import properties
! from wolfpack.consts import *
  
  TARGET_CHAR = 1
--- 3,7 ----
  from wolfpack.utilities import *
  from wolfpack import properties
! from wolfpack.consts import EVALUATINGINTEL, MAGICRESISTANCE \
  
  TARGET_CHAR = 1

Index: firefield.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/firefield.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** firefield.py	26 May 2004 13:07:23 -0000	1.4
--- firefield.py	19 Jul 2004 21:07:36 -0000	1.5
***************
*** 1,5 ****
  
  import wolfpack
- from wolfpack.consts import *
  from wolfpack.utilities import energydamage
  
--- 1,4 ----

Index: trap.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/trap.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** trap.py	26 May 2004 13:07:23 -0000	1.4
--- trap.py	19 Jul 2004 21:07:36 -0000	1.5
***************
*** 6,10 ****
  
  import wolfpack
- from wolfpack.consts import *
  from wolfpack.utilities import energydamage
  
--- 6,9 ----

Index: spellbook.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spellbook.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** spellbook.py	26 May 2004 13:07:23 -0000	1.6
--- spellbook.py	19 Jul 2004 21:07:36 -0000	1.7
***************
*** 28,33 ****
  """
  
- from math import floor,ceil
  import wolfpack
  
  def commandAddSpell( socket, command, arguments ):
--- 28,33 ----
  """
  
  import wolfpack
+ from math import floor,ceil
  
  def commandAddSpell( socket, command, arguments ):

Index: poisonfield.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/poisonfield.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** poisonfield.py	26 May 2004 13:07:23 -0000	1.3
--- poisonfield.py	19 Jul 2004 21:07:36 -0000	1.4
***************
*** 1,5 ****
  
  import wolfpack
- from wolfpack.consts import *
  from wolfpack.utilities import energydamage
  from system import poison
--- 1,4 ----

Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/__init__.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** __init__.py	26 May 2004 13:07:22 -0000	1.8
--- __init__.py	19 Jul 2004 21:07:35 -0000	1.9
***************
*** 8,18 ****
  #===============================================================#
  
! from wolfpack.consts import *
  from magic.utilities import *
  from magic.spell import *
  from wolfpack import console
  
- import wolfpack
- 
  # Spell Registry
  spells = {}
--- 8,17 ----
  #===============================================================#
  
! import wolfpack
! from wolfpack.consts import LOG_ERROR, EVENT_CASTSPELL
  from magic.utilities import *
  from magic.spell import *
  from wolfpack import console
  
  # Spell Registry
  spells = {}

[wpdev-commits] xmlscripts/scripts/magic nightsight.py,1.3,1.4

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

Update of /cvsroot/wpdev/xmlscripts/scripts/magic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11850

Modified Files:
	nightsight.py 
Log Message:
Time fix


Index: nightsight.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/nightsight.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nightsight.py	16 Jul 2004 07:09:27 -0000	1.3
--- nightsight.py	19 Jul 2004 20:13:12 -0000	1.4
***************
*** 1,4 ****
--- 1,5 ----
  
  import wolfpack
+ import wolfpack.time
  
  #
***************
*** 46,50 ****
  
  	# Nightsight lasts 1440 ingame minutes
! 	if nightsight_start + 1440 < time.minutes():
  		if player.socket:
  			player.socket.sysmessage('Your nightsight is wearing out.')
--- 47,51 ----
  
  	# Nightsight lasts 1440 ingame minutes
! 	if nightsight_start + 1440 < wolfpack.time.minutes():
  		if player.socket:
  			player.socket.sysmessage('Your nightsight is wearing out.')

[wpdev-commits] xmlscripts/definitions/system startitems.xml,1.3,1.4

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

Update of /cvsroot/wpdev/xmlscripts/definitions/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19826/system

Modified Files:
	startitems.xml 
Log Message:


Index: startitems.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/startitems.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** startitems.xml	4 Jun 2004 18:04:13 -0000	1.3
--- startitems.xml	19 Jul 2004 18:28:27 -0000	1.4
***************
*** 64,68 ****
  		<!--Ingots --><item id="1bf2"><amount>50</amount></item>
  		<!--Random Mining Tool--><item list="MININGTOOLS" />
! 		<!--Random Blacksmith Tool--><equipment list="BLACKSMITHTOOLS"/>
  	</startitems>
  
--- 64,68 ----
  		<!--Ingots --><item id="1bf2"><amount>50</amount></item>
  		<!--Random Mining Tool--><item list="MININGTOOLS" />
! 		<!--Random Blacksmith Tool--><item list="BLACKSMITHTOOLS"/>
  	</startitems>
  

[wpdev-commits] wolfpack spawnregions.cpp,1.62,1.63

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

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

Modified Files:
	spawnregions.cpp 
Log Message:
Spawnregion fix.

Index: spawnregions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** spawnregions.cpp	18 Jul 2004 21:02:58 -0000	1.62
--- spawnregions.cpp	19 Jul 2004 14:30:18 -0000	1.63
***************
*** 213,217 ****
  		else
  			pos.z = Maps::instance()->mapElevation( pos );
- 
  		pos.map = rectangles_[rndRectNum].map;
  
--- 213,216 ----
***************
*** 224,234 ****
  			cCharSectorIterator *chariterator = SectorMaps::instance()->findChars(pos, 0);
  
  			P_CHAR pChar;
  			for (pChar = chariterator->first(); pChar; pChar = chariterator->next()) {
  				if (pChar->spawnregion()) {
! 					continue;
  				}
  			}
  
  			cItemSectorIterator *itemiterator = SectorMaps::instance()->findItems(pos, 0);
  
--- 223,239 ----
  			cCharSectorIterator *chariterator = SectorMaps::instance()->findChars(pos, 0);
  
+ 			bool blocked = false;
  			P_CHAR pChar;
  			for (pChar = chariterator->first(); pChar; pChar = chariterator->next()) {
  				if (pChar->spawnregion()) {
! 					blocked = true;
! 					break;
  				}
  			}
  
+ 			if (blocked) {
+ 				continue;
+ 			}
+ 
  			cItemSectorIterator *itemiterator = SectorMaps::instance()->findItems(pos, 0);
  
***************
*** 236,242 ****
  			for (pItem = itemiterator->first(); pItem; pItem = itemiterator->next()) {
  				if (pItem->spawnregion()) {
! 					continue;
  				}
  			}
  		}	
  	}
--- 241,254 ----
  			for (pItem = itemiterator->first(); pItem; pItem = itemiterator->next()) {
  				if (pItem->spawnregion()) {
! 					blocked = true;
! 					break;
  				}
  			}
+ 
+ 			if (blocked) {
+ 				continue;
+ 			}
+ 
+ 			return true;
  		}	
  	}

[wpdev-commits] wolfpack config.cpp,1.6,1.7 config.h,1.5,1.6 spawnregions.cpp,1.61,1.62 speech.cpp,1.178,1.179

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

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

Modified Files:
	config.cpp config.h spawnregions.cpp speech.cpp 
Log Message:
Several fixes

Index: config.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/config.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config.h	2 Jun 2004 15:04:04 -0000	1.5
--- config.h	18 Jul 2004 21:02:58 -0000	1.6
***************
*** 89,92 ****
--- 89,93 ----
  	bool guardsActive_;
  	bool saveSpawns_;
+ 	bool dontStackSpawnedObjects_;
  	bool autoAccountCreate_;
  	float checkNPCTime_;
***************
*** 221,224 ****
--- 222,229 ----
  	unsigned int tamedDisappear() const;
  	unsigned int houseInTown() const;
+ 	inline bool dontStackSpawnedObjects() const {
+ 		return dontStackSpawnedObjects_;
+ 	}
+ 
  	unsigned int shopRestock() const;
  	unsigned int snoopdelay() const;

Index: speech.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -d -r1.178 -r1.179
*** speech.cpp	11 Jul 2004 19:04:58 -0000	1.178
--- speech.cpp	18 Jul 2004 21:02:58 -0000	1.179
***************
*** 338,341 ****
--- 338,345 ----
  		return;  // Vendor responded already
  
+ 	// this makes it so npcs do not respond to isDead people - HEALERS ??
+ 	if ( pChar->isDead() )
+ 		return;
+ 
  	// 0x0007 -> Speech-id for "Guards"
  	for ( QValueVector<UINT16>::const_iterator iter = keywords.begin(); iter != keywords.end(); ++iter )
***************
*** 343,354 ****
  		UINT16 keyword = *iter;
  
! 		if ( keyword == 0x07 )
  			pChar->callGuards();
  	}
  
- 	// this makes it so npcs do not respond to isDead people - HEALERS ??
- 	if ( pChar->isDead() )
- 		return;
- 
  	/*	P_CHAR pc = NULL; ???
  		P_CHAR pNpc = NULL;
--- 347,354 ----
  		UINT16 keyword = *iter;
  
! 		if (keyword == 0x07)
  			pChar->callGuards();
  	}
  
  	/*	P_CHAR pc = NULL; ???
  		P_CHAR pNpc = NULL;

Index: spawnregions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** spawnregions.cpp	3 Jun 2004 14:42:59 -0000	1.61
--- spawnregions.cpp	18 Jul 2004 21:02:58 -0000	1.62
***************
*** 38,41 ****
--- 38,43 ----
  #include "basics.h"
  #include "console.h"
+ #include "sectors.h"
+ #include "config.h"
  
  using namespace std;
***************
*** 201,209 ****
  }
  
! bool cSpawnRegion::findValidSpot( Coord_cl& pos )
! {
! 	UI32 i = 0;
! 	while ( i < 100 )
! 	{
  		int rndRectNum = RandomNum( 0, this->rectangles_.size() - 1 );
  		pos.x = RandomNum( this->rectangles_[rndRectNum].x1, this->rectangles_[rndRectNum].x2 );
--- 203,209 ----
  }
  
! bool cSpawnRegion::findValidSpot(Coord_cl& pos) {
! 	// Try up to 100 times.
! 	for(unsigned int i = 0; i < 100; ++i) {
  		int rndRectNum = RandomNum( 0, this->rectangles_.size() - 1 );
  		pos.x = RandomNum( this->rectangles_[rndRectNum].x1, this->rectangles_[rndRectNum].x2 );
***************
*** 216,222 ****
  		pos.map = rectangles_[rndRectNum].map;
  
! 		if ( Movement::instance()->canLandMonsterMoveHere( pos ) )
! 			return true;
! 		i++;
  	}
  
--- 216,243 ----
  		pos.map = rectangles_[rndRectNum].map;
  
! 		if (Movement::instance()->canLandMonsterMoveHere(pos)) {
! 			if (!Config::instance()->dontStackSpawnedObjects()) {
! 				return true;
! 			}
! 
! 			// Check if there are spawned items or npcs at the position.
! 			cCharSectorIterator *chariterator = SectorMaps::instance()->findChars(pos, 0);
! 
! 			P_CHAR pChar;
! 			for (pChar = chariterator->first(); pChar; pChar = chariterator->next()) {
! 				if (pChar->spawnregion()) {
! 					continue;
! 				}
! 			}
! 
! 			cItemSectorIterator *itemiterator = SectorMaps::instance()->findItems(pos, 0);
! 
! 			P_ITEM pItem;
! 			for (pItem = itemiterator->first(); pItem; pItem = itemiterator->next()) {
! 				if (pItem->spawnregion()) {
! 					continue;
! 				}
! 			}
! 		}	
  	}
  

Index: config.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/config.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.cpp	2 Jun 2004 15:04:04 -0000	1.6
--- config.cpp	18 Jul 2004 21:02:58 -0000	1.7
***************
*** 164,167 ****
--- 164,168 ----
  	logMask_ = getNumber( "General", "Logging Mask", LOG_ALL, true );
  	overwriteDefinitions_ = getBool( "General", "Overwrite Definitions", false, true );
+ 	dontStackSpawnedObjects_ = getBool("General", "Don't Stack Spawned Objects", true, true);
  
  	saveInterval_ = getNumber( "General", "Save Interval", 900, true );

[wpdev-commits] wolfpack/network uosocket.cpp,1.380,1.381

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

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

Modified Files:
	uosocket.cpp 
Log Message:
Several fixes

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.380
retrieving revision 1.381
diff -C2 -d -r1.380 -r1.381
*** uosocket.cpp	1 Jul 2004 20:07:07 -0000	1.380
--- uosocket.cpp	18 Jul 2004 21:02:58 -0000	1.381
***************
*** 1980,1987 ****
  		{
  			pItem->sendTooltip( this );
- 
- #if defined( _DEBUG )
- 			log( QString( "Sending Tooltip for 0x%1 (%2).\n" ).arg( pItem->serial(), 0, 16 ).arg( pItem->name() ) );
- #endif
  		}
  	}
--- 1980,1983 ----

[wpdev-commits] wolfpack npc.cpp,1.98,1.99

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

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

Modified Files:
	npc.cpp 
Log Message:
Fix for items not being removed from their spawnregion if grabbed.

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** npc.cpp	5 Jul 2004 19:59:38 -0000	1.98
--- npc.cpp	18 Jul 2004 19:58:20 -0000	1.99
***************
*** 186,197 ****
  }
  
! void cNPC::setOwner( P_PLAYER data, bool nochecks )
! {
! 	// We CANT be our own owner
! 	if ( data && ( data->serial() == this->serial() ) )
! 		return;
! 
! 	if ( !nochecks && owner_ )
! 	{
  		owner_->removePet( this, true );
  	}
--- 186,191 ----
  }
  
! void cNPC::setOwner(P_PLAYER data, bool nochecks) {
! 	if (!nochecks && owner_) {
  		owner_->removePet( this, true );
  	}
***************
*** 201,207 ****
  	changed_ = true;
  
! 	if ( !nochecks && owner_ )
! 	{
! 		owner_->addPet( this, true );
  	}
  }
--- 195,201 ----
  	changed_ = true;
  
! 	if (!nochecks && owner_) {
! 		owner_->addPet(this, true);
! 		setSpawnregion(0);
  	}
  }

[wpdev-commits] wolfpack dragdrop.cpp,1.235,1.236 wolfpack.vcproj,1.34,1.35

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

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

Modified Files:
	dragdrop.cpp wolfpack.vcproj 
Log Message:
Fix for items not being removed from their spawnregion if grabbed.

Index: wolfpack.vcproj
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wolfpack.vcproj	2 Jul 2004 13:35:36 -0000	1.34
--- wolfpack.vcproj	18 Jul 2004 19:57:02 -0000	1.35
***************
*** 32,41 ****
  				WarningLevel="1"
  				Detect64BitPortabilityProblems="TRUE"
! 				DebugInformationFormat="3"/>
  			<Tool
  				Name="VCCustomBuildTool"/>
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="qt-mt322.lib ws2_32.lib comctl32.lib"
  				OutputFile="../wolfpack.exe"
  				LinkIncremental="2"
--- 32,41 ----
  				WarningLevel="1"
  				Detect64BitPortabilityProblems="TRUE"
! 				DebugInformationFormat="4"/>
  			<Tool
  				Name="VCCustomBuildTool"/>
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="qt-mt331.lib ws2_32.lib comctl32.lib"
  				OutputFile="../wolfpack.exe"
  				LinkIncremental="2"
***************
*** 95,99 ****
  				BufferSecurityCheck="FALSE"
  				EnableFunctionLevelLinking="FALSE"
! 				EnableEnhancedInstructionSet="1"
  				ForceConformanceInForLoopScope="TRUE"
  				RuntimeTypeInfo="TRUE"
--- 95,99 ----
  				BufferSecurityCheck="FALSE"
  				EnableFunctionLevelLinking="FALSE"
! 				EnableEnhancedInstructionSet="0"
  				ForceConformanceInForLoopScope="TRUE"
  				RuntimeTypeInfo="TRUE"

Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.235
retrieving revision 1.236
diff -C2 -d -r1.235 -r1.236
*** dragdrop.cpp	14 Jul 2004 02:40:46 -0000	1.235
--- dragdrop.cpp	18 Jul 2004 19:57:01 -0000	1.236
***************
*** 171,175 ****
  				pContainer->addItem( splitItem, false );
  			splitItem->SetOwnSerial( pItem->ownSerial() );
! 			splitItem->setSpawnregion(pItem->spawnregion());
  
  			// He needs to see the new item
--- 171,176 ----
  				pContainer->addItem( splitItem, false );
  			splitItem->SetOwnSerial( pItem->ownSerial() );
! 			
! 			splitItem->setSpawnregion(pItem->spawnregion());			
  
  			// He needs to see the new item
***************
*** 177,181 ****
  
  			// If we're taking something out of a spawn-region it's spawning "flag" is removed isn't it?
- 			pItem->setSpawnregion(0);
  			pItem->setAmount( pickedAmount );
  		}
--- 178,181 ----
***************
*** 185,188 ****
--- 185,191 ----
  	pItem->removeFromView( true );
  
+ 	// Remove from spawnregion
+ 	pItem->setSpawnregion(0);
+ 
  	// Remove it from the World if it is in world, otherwise remove it from it's current container
  	if ( pItem->isInWorld() )

[wpdev-commits] wolfpack world.cpp,1.104,1.105

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

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

Modified Files:
	world.cpp 
Log Message:
Crashfix

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** world.cpp	16 Jul 2004 21:01:07 -0000	1.104
--- world.cpp	18 Jul 2004 19:52:15 -0000	1.105
***************
*** 626,630 ****
  		cSpawnRegion *region = SpawnRegions::instance()->region(spawnregion);
  		cUObject *object = findObject(serial);
! 		if (region)
  		{
  			object->setSpawnregion(region);
--- 626,630 ----
  		cSpawnRegion *region = SpawnRegions::instance()->region(spawnregion);
  		cUObject *object = findObject(serial);
! 		if (object && region)
  		{
  			object->setSpawnregion(region);

[wpdev-commits] xmlscripts/web gender_female.gif,NONE,1.1 gender_male.gif,NONE,1.1 spacer.gif,NONE,1.1 status_template.html,NONE,1.1

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

Update of /cvsroot/wpdev/xmlscripts/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18710

Added Files:
	gender_female.gif gender_male.gif spacer.gif 
	status_template.html 
Log Message:
Status script

--- NEW FILE: status_template.html ---
<%
import sys
import wolfpack
import wolfpack.sockets
import wolfpack.accounts
import wolfpack.time
%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Wolfpack Status</title>
<style type="text/css">
<!--
body {
	margin-left: 0px;
	margin-top: 0px;
	margin-right: 0px;
	margin-bottom: 0px;
	background-color: #FFFFFF;
}
body,td,th {
	font-family: Arial, Helvetica, sans-serif;
	font-size: 10pt;
}
.maintitle {
	font-family: "Trebuchet MS", Arial, Helvetica;
	font-size: 16px;
	font-weight: bold;
	color: #336633;
}

.smalltext {
	font-family: "Trebuchet MS", Arial, Helvetica;
	font-size: 10px;
	color: #999999;
}

.sectiontitle {

	font-family: "Trebuchet MS", Arial, Helvetica;
	font-size: 14px;
	font-weight: bold;
	color: #666666;
}

.text {
	font-family: "Trebuchet MS", Arial, Helvetica;
	font-size: 12px;
}

img {
	border: 0;
}

a {
	color: #0000FF;
	text-decoration: none;
}

a:hover {
	color: #FF0000;
}

-->
</style></head>

<body>
<table width="100%"  border="0" cellspacing="0" cellpadding="0">
  <tr>
	<td bgcolor="#004026"><img src="top_logo.jpg" width="586" height="87" /></td>
  </tr>
  <tr>
	<td bgcolor="#DDDDDD" height="2"><img src="spacer.gif" width="1" height="2" /></td>
  </tr>
</table>
<div align="center"><br />
<span class="maintitle">SERVERSTATUS</span>  </div>
<table width="530"  border="0" align="center" cellpadding="5" cellspacing="0">
  <tr>
	<td width="520"><strong>Connected Accounts:</strong> <%=wolfpack.sockets.count()%> of <%=wolfpack.accounts.count()%><br />
	  <br />
	  <strong>Player Characters:</strong> <%=wolfpack.playercount()%> <br />
	  <strong>NPCs:</strong> <%=wolfpack.npccount()%> <br />
	  <strong>Items:</strong> <%=wolfpack.itemcount()%> <br />
	  <strong>Ingame Time:</strong> Day <%=wolfpack.time.days()%>, <%=wolfpack.time.hour()%>:<%="%02u" % wolfpack.time.minute()%> <br /> <br />
	  <strong>Connected Players:</strong><br>
	  <table width="100%" border="0" cellspacing="1" cellpadding="0">
<%
socket = wolfpack.sockets.first()
nextsocket = wolfpack.sockets.next()
while socket:
	if socket.player:
		%>
		<tr>
		<%
		notoriety = socket.player.notoriety()
		NOTOCOLORS = {
			1: "#0000DD",
			2: "#10d010",
			3: "#d0d0d0",
			4: "#d0d0d0",
			5: "#ff9900",
			6: "#d01010",
		}
		
		BODYIMGS = {
			0x190: 'gender_male.gif',
			0x191: 'gender_female.gif',
			0x192: 'gender_male.gif',
			0x193: 'gender_female.gif',			
		}
		
		print '<td width="16" valign="middle">'
		if BODYIMGS.has_key(socket.player.id):
			print '<div align="center"><img src="%s"></div>' % BODYIMGS[socket.player.id]
		else:
			print '<img src="spacer.gif" width="14">'
		print '</td><td valign="middle">'
		
		if NOTOCOLORS.has_key(notoriety):
			print '<font color="%s" face="Georgia"><b>%s</b></font>' % (NOTOCOLORS[notoriety], socket.player.name)
		else:
			print '<b>%s</b>' % socket.player.name

	  	if socket.player.region and len(socket.player.region.name) > 0:
	  		print ' (%s)' % socket.player.region.name
	  		
	  	print '</td></tr>'
		%></tr>
<%
		if nextsocket and nextsocket.player:
			%>
		<tr><td colspan="2" bgcolor="#DDDDDD"><img src="spacer.gif" width="1" height="1"></td></tr>
			
<%
	socket = nextsocket
	nextsocket = wolfpack.sockets.next()
%>
		</table>
	  </td>
  </tr>
</table>
</body>
</html>

--- NEW FILE: spacer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: gender_male.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: gender_female.gif ---
(This appears to be a binary file; contents omitted.)

[wpdev-commits] xmlscripts/scripts/system status.py,NONE,1.1

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

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18691/system

Added Files:
	status.py 
Log Message:
Status script

--- NEW FILE: status.py ---

import random
import wolfpack
import re
from StringIO import StringIO
import sys
from wolfpack.consts import *
from wolfpack import settings, console, accounts, sockets
import wolfpack.time # Already imported
from threading import Thread, Event, Lock
import time

magic = 0.0
interval = 60000
htmltemplate = 'web/status_template.html'
outputfile = 'web/status.html'
processthread = None
templatemodule = None
		
#
# The processing thread
#
class ProcessThread(Thread):
	# Initialize this thread
	def __init__(self):
		Thread.__init__(self)
		self.stopped = Event() # Cancel Event
		self.mutex = Lock()
		self.data = None
	
	# Threaded code
	def run(self):
		while not self.stopped.isSet():
			# Check if status data is available and process it
			data = None
			self.mutex.acquire()
			if self.data:
				data = self.data
				self.data = None
			self.mutex.release()
			
			if data:
				global outputfile
				try:
					fp = file(outputfile, 'wu')
					fp.write(data)
					fp.close()
				except Exception, e:
					console.log(LOG_PYTHON, "Couldn't write status to '%s': %s.\n" % (outputfile, str(e)))
			
			self.stopped.wait(0.5)

#
# Status generation routine
#
def generate(object, arguments):
	global magic, interval

	# The script has been reloaded
	if arguments[0] != magic:
		return
	
	global templatemodule
	
	if not templatemodule:
		global htmltemplate
		try:
			fp = file(htmltemplate, 'ru')
			template = fp.read()
			fp.close()
			console.log(LOG_MESSAGE, "Loaded status template from '%s'.\n" % htmltemplate)
		except Exception, e:
			console.log(LOG_PYTHON, "Couldn't load status template from '%s': %s.\n" % (htmltemplate, str(e)))
			return
	
		# Search for python codeblocks <%= %>
		length = len(template)
		blocks = ''
		current = ''
		inlineprint = 0
		
		# PROLOG
		try:
			for i in range(0, length):
				if template[i:i + 3] == "<%\n":
					# Dump previous string					
					if current != '':
						if inlineprint:
							blocks += '+ ' + repr(current)
						else:
							blocks += 'print ' + repr(current)
						current = ''
					inlineprint = 0
					continue
				elif template[i - 1:i+1] == "%>":
					# Gather code
					current = current[1:-1].strip("%")
					
					if inlineprint:
						blocks += " + unicode(%s)" % current[1:]
					else:
						blocks += "\n%s" % current
						inlineprint = 0
					current = ''
					continue
				elif template[i:i + 3] == "<%=":
					# Dump previous string
					if current != '':
						if inlineprint:
							blocks += '+ ' + repr(current)
						else:
							blocks += 'print ' + repr(current)
						current = ''
					inlineprint = 1
					continue
				current += template[i]
			if inlineprint:
				blocks += '+ ' + repr(current)
			else:
				blocks += 'print ' + repr(current)
			blocks += "\n"
			
		except Exception, e:
			console.log(LOG_PYTHON, "Unable to parse python template file: %s\n" % str(e))
			return		

		# Try to compile the file
		try:
			templatemodule = compile(blocks, htmltemplate, 'exec')
		except Exception, e:
			console.log(LOG_PYTHON, "Unable to compile python template file: %s\n" % str(e))
			templatemodule = None
			return			
			
	# Try to execute the code
	savedstdout = sys.stdout
	sys.stdout = StringIO()
	output = sys.stdout
	exec templatemodule
	sys.stdout = savedstdout
	
	text = output.getvalue()
	output.close()

	# Collect data and pass it to the processing thread
	global processthread
	
	if processthread:
		processthread.mutex.acquire()
		processthread.data = text
		processthread.mutex.release()

	# Re-execute after interval miliseconds
	wolfpack.addtimer(interval, "system.status.generate", [magic])

#
# Initialization
#
def onLoad():
	global magic
	magic = random.random()
	loadSettings()

	global processthread
	processthread = ProcessThread()
	processthread.start()

	wolfpack.addtimer(interval, "system.status.generate", [magic])
		
#
# Stop the thread
#
def onUnload():
	global processthread
	if processthread:
		processthread.stopped.set()
		time.sleep(0.01) # Sleep a little to give the thread time to exit
		if processthread:
			processthread.join()

#
# Load settings
#
def loadSettings():
	global interval, htmltemplate, outputfile
	interval = settings.getnumber("HTML Status", "Interval in Seconds", 60, True) * 1000
	htmltemplate = settings.getstring("HTML Status", "HTML Template", "web/status_template.html", True)
	outputfile = settings.getstring("HTML Status", "Output Path", "web/status.html", True)

[wpdev-commits] xmlscripts/definitions scripts.xml,1.148,1.149

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

Update of /cvsroot/wpdev/xmlscripts/definitions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18546

Modified Files:
	scripts.xml 
Log Message:
Status script

Index: scripts.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** scripts.xml	17 Jul 2004 12:29:31 -0000	1.148
--- scripts.xml	18 Jul 2004 16:42:55 -0000	1.149
***************
*** 165,168 ****
--- 165,169 ----
  	<!-- System Scripts -->
  	<script>system.hardwareinfo</script>
+ 	<script>system.status</script>
  	<script>system.hunger</script>
  	<script>system.loot</script>

[wpdev-commits] xmlscripts/scripts/magic circle7.py,1.7,1.8 circle4.py,1.8,1.9 circle5.py,1.9,1.10

[Ki H. P. <kh...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/magic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20686/scripts/magic

Modified Files:
	circle7.py circle4.py circle5.py 
Log Message:
commented out the item.direction properties in field spell items


Index: circle7.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle7.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** circle7.py	18 Jul 2004 08:56:52 -0000	1.7
--- circle7.py	18 Jul 2004 09:39:52 -0000	1.8
***************
*** 94,98 ****
  			newitem.moveto(pos)
  			newitem.decay = 0
! 			newitem.direction = 29
  			newitem.settag('dispellable_field', 1)
  			newitem.update()
--- 94,98 ----
  			newitem.moveto(pos)
  			newitem.decay = 0
! 			#newitem.direction = 29
  			newitem.settag('dispellable_field', 1)
  			newitem.update()
***************
*** 267,270 ****
--- 267,271 ----
  		# Enumerate chars
  		chars = wolfpack.chars(target.x, target.y, char.pos.map, 8)
+ 		items = wolfpack.items(target.x, target.y, char.pos.map, 8)
  		for target in chars:
  			if char == target or not target.npc or target.summontimer == 0:
***************
*** 279,288 ****
  			
  		# Field spells
- 		items = wolfpack.items(target.x, target.y, char.pos.map, 8)
  		for item in items:
! 			if target.hastag('dispellable_field'):
! 				wolfpack.effect(0x376a, target.pos, 9, 20)
! 				target.soundeffect(0x201)
! 				target.delete()
  
  class MeteorSwarm (Spell):
--- 280,288 ----
  			
  		# Field spells
  		for item in items:
! 			if item.hastag('dispellable_field'):
! 				wolfpack.effect(0x376a, item.pos, 9, 20)
! 				item.soundeffect(0x201)
! 				item.delete()
  
  class MeteorSwarm (Spell):

Index: circle4.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle4.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** circle4.py	15 Jul 2004 01:17:12 -0000	1.8
--- circle4.py	18 Jul 2004 09:39:52 -0000	1.9
***************
*** 214,218 ****
  			newitem = wolfpack.newitem(1)
  			newitem.id = itemid
! 			newitem.direction = 29
  			newitem.moveto(pos)
  			newitem.decay = 0 # Dont decay. TempEffect will take care of them
--- 214,218 ----
  			newitem = wolfpack.newitem(1)
  			newitem.id = itemid
! 			#newitem.direction = 29
  			newitem.moveto(pos)
  			newitem.decay = 0 # Dont decay. TempEffect will take care of them
***************
*** 225,231 ****
  			# Affect chars who are occupying the field cells
  			chars = wolfpack.chars(newitem.pos.x, newitem.pos.y, newitem.pos.map)
! 			for affected in chars:
! 				if affected.pos.z >= newitem.pos.z - 10 and affected.pos.z <= newitem.pos.z + 10:
! 					newitem.callevent(EVENT_COLLIDE, (affected, newitem))
  
  		duration = int((4 + char.skill[ MAGERY ] * 0.05) * 1000)
--- 225,232 ----
  			# Affect chars who are occupying the field cells
  			chars = wolfpack.chars(newitem.pos.x, newitem.pos.y, newitem.pos.map)
! 			if len(chars) > 0 :
! 				for affected in chars:
! 					if affected.pos.z >= newitem.pos.z - 10 and affected.pos.z <= newitem.pos.z + 10:
! 						newitem.callevent(EVENT_COLLIDE, (affected, newitem))
  
  		duration = int((4 + char.skill[ MAGERY ] * 0.05) * 1000)

Index: circle5.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle5.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** circle5.py	8 Jun 2004 20:05:19 -0000	1.9
--- circle5.py	18 Jul 2004 09:39:52 -0000	1.10
***************
*** 296,300 ****
  			newitem = wolfpack.newitem(1)
  			newitem.id = itemid
! 			newitem.direction = 29
  			newitem.moveto(pos)
  			newitem.decay = 0 # Dont decay. TempEffect will take care of them
--- 296,300 ----
  			newitem = wolfpack.newitem(1)
  			newitem.id = itemid
! 			#newitem.direction = 29
  			newitem.moveto(pos)
  			newitem.decay = 0 # Dont decay. TempEffect will take care of them

[wpdev-commits] xmlscripts/scripts/magic circle7.py,1.6,1.7

[Ki H. P. <kh...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/magic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15703/scripts/magic

Modified Files:
	circle7.py 
Log Message:
'mass dispell' now dispells field spells too.
i don't know if 'dispell' can dispell field spells.
FIXME : i don't know the formular for dispell chance.


Index: circle7.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle7.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** circle7.py	13 Jun 2004 12:23:05 -0000	1.6
--- circle7.py	18 Jul 2004 08:56:52 -0000	1.7
***************
*** 271,277 ****
  				continue
  
! 			wolfpack.effect(0x3728, target.pos, 8, 20)
! 			target.soundeffect(0x201)
! 			target.delete()
  
  class MeteorSwarm (Spell):
--- 271,288 ----
  				continue
  
! 			if self.checkresist(char, tgarget):
! 				target.effect(0x3779, 10, 20)
! 			else:
! 				wolfpack.effect(0x3728, target.pos, 8, 20)
! 				target.soundeffect(0x201)
! 				target.delete()
! 			
! 		# Field spells
! 		items = wolfpack.items(target.x, target.y, char.pos.map, 8)
! 		for item in items:
! 			if target.hastag('dispellable_field'):
! 				wolfpack.effect(0x376a, target.pos, 9, 20)
! 				target.soundeffect(0x201)
! 				target.delete()
  
  class MeteorSwarm (Spell):

[wpdev-commits] xmlscripts/scripts/magic scroll.py,1.3,1.4

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

Update of /cvsroot/wpdev/xmlscripts/scripts/magic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32164/magic

Modified Files:
	scroll.py 
Log Message:
Fixed scrolls, tried to fix skillinfo...
skillinfo still hangs my client...


Index: scroll.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/scroll.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** scroll.py	26 May 2004 13:07:23 -0000	1.3
--- scroll.py	18 Jul 2004 01:41:48 -0000	1.4
***************
*** 8,13 ****
  #===============================================================#
  
- from magic.spellbook import addspell
  import wolfpack
  
  # calculate the spell-id of a scroll
--- 8,13 ----
  #===============================================================#
  
  import wolfpack
+ from magic.spellbook import addspell, hasspell
  
  # calculate the spell-id of a scroll
***************
*** 26,30 ****
  	except:
  		char.socket.sysmessage( 'Broken scroll' )
! 		return 0
  
  	if item.amount > 1:
--- 26,30 ----
  	except:
  		char.socket.sysmessage( 'Broken scroll' )
! 		return False
  
  	if item.amount > 1:
***************
*** 34,38 ****
  		item.delete()
  
! 	return 1
  
  def onDropOnItem( cont, item ):
--- 34,38 ----
  		item.delete()
  
! 	return True
  
  def onDropOnItem( cont, item ):
***************
*** 41,45 ****
  
  	if not char.ischar():
! 		return 0
  
  	try:
--- 41,48 ----
  
  	if not char.ischar():
! 		return False
! 
! 	if cont == char.getbackpack() or cont == item.container:
! 		return False
  
  	try:
***************
*** 47,63 ****
  	except:
  		char.socket.sysmessage( "Error while calculating scroll id." )
! 		return 0
  
! 	if spell >= 64:
! 		char.socket.sysmessage( "Scroll with invalid spell-id: %d" % spell )
! 		return 0
  
! 	addspell( cont, spell )
  
- 	if item.amount > 1:
- 		item.amount -= 1
- 		return 0
  	else:
! 		item.delete() # Consume the scroll
  
! 	return 1
--- 50,73 ----
  	except:
  		char.socket.sysmessage( "Error while calculating scroll id." )
! 		return False
  
! 	if ( 'magic.spellbook' in cont.events ):
! 		if spell >= 64:
! 			char.socket.sysmessage( "Scroll with invalid spell-id: %d" % spell )
! 		else:
! 			if not hasspell( cont, spell ):
! 				addspell( cont, spell )
  
! 				if item.amount > 1:
! 					item.amount -= 1
! 					item.update()
! 				else:
! 					item.delete() # Consume the scroll
! 				return False
! 			else:
! 				return False
  
  	else:
! 		return False
  
! 	return False