[wpdev-commits] wolfpack/python engine.cpp,1.35,1.36 gump.h,1.28,1.29

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

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

Modified Files:
	engine.cpp gump.h 
Log Message:
Fixed bug #0000348 ( Guards should kill instantly )

Index: engine.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/engine.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** engine.cpp	19 Aug 2004 01:59:16 -0000	1.35
--- engine.cpp	9 Oct 2004 14:32:22 -0000	1.36
***************
*** 142,146 ****
  	catch ( ... )
  	{
! 		Console::instance()->send( "Failed to initialize the python extension modules\n" );
  	}
  }
--- 142,146 ----
  	catch ( ... )
  	{
! 		Console::instance()->send( tr("Failed to initialize the python extension modules\n") );
  	}
  }
***************
*** 192,200 ****
  			if ( !moduleName.isNull() )
  			{
! 				Console::instance()->log( LOG_ERROR, QString( "An error occured while compiling \"%1\": %2" ).arg( moduleName ).arg( PyString_AsString( exceptionName ) ) );
  			}
  			else
  			{
! 				Console::instance()->log( LOG_ERROR, QString( "An error occured: %1" ).arg( PyString_AsString( exceptionName ) ) );
  			}
  		}
--- 192,200 ----
  			if ( !moduleName.isNull() )
  			{
! 				Console::instance()->log( LOG_ERROR, tr( "An error occured while compiling \"%1\": %2" ).arg( moduleName ).arg( PyString_AsString( exceptionName ) ) );
  			}
  			else
  			{
! 				Console::instance()->log( LOG_ERROR, tr( "An error occured: %1" ).arg( PyString_AsString( exceptionName ) ) );
  			}
  		}
***************
*** 203,211 ****
  			if ( !moduleName.isNull() )
  			{
! 				Console::instance()->log( LOG_ERROR, QString( "An error occured in \"%1\": %2" ).arg( moduleName ).arg( PyString_AsString( exceptionName ) ) );
  			}
  			else
  			{
! 				Console::instance()->log( LOG_ERROR, QString( "An error occured: %1" ).arg( PyString_AsString( exceptionName ) ) );
  			}
  
--- 203,211 ----
  			if ( !moduleName.isNull() )
  			{
! 				Console::instance()->log( LOG_ERROR, tr( "An error occured in \"%1\": %2" ).arg( moduleName ).arg( PyString_AsString( exceptionName ) ) );
  			}
  			else
  			{
! 				Console::instance()->log( LOG_ERROR, tr( "An error occured: %1" ).arg( PyString_AsString( exceptionName ) ) );
  			}
  
***************
*** 261,265 ****
  
  			// Print it
! 			Console::instance()->log( LOG_PYTHON, QString( "File '%1',%2 in '%3'" ).arg( filename ).arg( line ).arg( function ), false );
  
  			// Switch Frames
--- 261,265 ----
  
  			// Print it
! 			Console::instance()->log( LOG_PYTHON, tr( "File '%1',%2 in '%3'" ).arg( filename ).arg( line ).arg( function ), false );
  
  			// Switch Frames

Index: gump.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/gump.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** gump.h	25 Sep 2004 02:03:22 -0000	1.28
--- gump.h	9 Oct 2004 14:32:22 -0000	1.29
***************
*** 179,183 ****
  			else
  			{
! 				Console::instance()->log( LOG_ERROR, QString( "Couldn't find code module %1 for a gump callback." ).arg( sModule ) );
  			}
  		}
--- 179,183 ----
  			else
  			{
! 				Console::instance()->log( LOG_ERROR, tr( "Couldn't find code module %1 for a gump callback." ).arg( sModule ) );
  			}
  		}