[wpdev-commits] wolfpack/python char.cpp,1.103,1.104 global.cpp,1.91,1.92

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

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

Modified Files:
	char.cpp global.cpp 
Log Message:
Fixed a release inlining and shutdown bug.

Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** char.cpp	11 Sep 2003 16:19:50 -0000	1.103
--- char.cpp	13 Sep 2003 13:08:41 -0000	1.104
***************
*** 150,156 ****
  
  		if( ( player->bodyID() == 0x3DB ) && message.startsWith( SrvParams->commandPrefix() ) )
! 			cCommands::instance()->process( player->socket(), message.right( message.length()-1 ) );
  		else if( message.startsWith( SrvParams->commandPrefix() ) )
! 			cCommands::instance()->process( player->socket(), message.right( message.length()-1 ) );
  		else if( PyTuple_Size( args ) == 2 && PyInt_Check( PyTuple_GetItem( args, 1 ) ) )
  			player->message( message, PyInt_AsLong( PyTuple_GetItem( args, 1 ) ) );
--- 150,156 ----
  
  		if( ( player->bodyID() == 0x3DB ) && message.startsWith( SrvParams->commandPrefix() ) )
! 			Commands::instance()->process( player->socket(), message.right( message.length()-1 ) );
  		else if( message.startsWith( SrvParams->commandPrefix() ) )
! 			Commands::instance()->process( player->socket(), message.right( message.length()-1 ) );
  		else if( PyTuple_Size( args ) == 2 && PyInt_Check( PyTuple_GetItem( args, 1 ) ) )
  			player->message( message, PyInt_AsLong( PyTuple_GetItem( args, 1 ) ) );

Index: global.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** global.cpp	11 Sep 2003 16:19:50 -0000	1.91
--- global.cpp	13 Sep 2003 13:08:41 -0000	1.92
***************
*** 1304,1309 ****
  	PyObject *list = PyList_New( 0 );
  
! 	QMap< QString, cAcl* >::const_iterator it = cCommands::instance()->aclbegin();
! 	while( it != cCommands::instance()->aclend() )
  	{
  		QString name = it.key();
--- 1304,1309 ----
  	PyObject *list = PyList_New( 0 );
  
! 	QMap< QString, cAcl* >::const_iterator it = Commands::instance()->aclbegin();
! 	while( it != Commands::instance()->aclend() )
  	{
  		QString name = it.key();
***************
*** 1328,1332 ****
  	}
  
! 	cAcl *acl = cCommands::instance()->getACL( getArgStr( 0 ) );
  	if( !acl )
  	{
--- 1328,1332 ----
  	}
  
! 	cAcl *acl = Commands::instance()->getACL( getArgStr( 0 ) );
  	if( !acl )
  	{