@ -7001,38 +7001,6 @@ PF_CONSOLE_CMD( KI, // Group name
PF_CONSOLE_GROUP ( Python ) // Defines a main command group
PF_CONSOLE_GROUP ( Python ) // Defines a main command group
PF_CONSOLE_CMD ( Python , // Group name
RunFile , // Function name
" string filename " , // Params
" Run the specified Python file program " ) // Help string
{
// now evaluate this mess they made
PyObject * mymod = PythonInterface : : FindModule ( " __main__ " ) ;
// make sure the filename doesn't have the .py extension (import doesn't need it)
char importname [ 200 ] ;
int i ;
for ( i = 0 ; i < 199 ; i + + )
{
char ch = ( ( const char * ) params [ 0 ] ) [ i ] ;
// if we are at the end of the string or at a dot, truncate here
if ( ch = = ' . ' | | ch = = 0 )
break ;
else
importname [ i ] = ( ( const char * ) params [ 0 ] ) [ i ] ;
}
importname [ i ] = 0 ;
// create the line to execute the file
char runline [ 256 ] ;
sprintf ( runline , " import %s " , importname ) ;
PythonInterface : : RunString ( runline , mymod ) ;
std : : string output ;
// get the messages
PythonInterface : : getOutputAndReset ( & output ) ;
PrintString ( output . c_str ( ) ) ;
}
# include "../pfPython/cyMisc.h"
# include "../pfPython/cyMisc.h"
PF_CONSOLE_CMD ( Python , // Group name
PF_CONSOLE_CMD ( Python , // Group name
@ -7074,16 +7042,18 @@ PF_CONSOLE_CMD( Python,
" string functions, ... " , // Params
" string functions, ... " , // Params
" Run a cheat command " )
" Run a cheat command " )
{
{
const char * extraParms = " " ;
std : : string extraParms ;
if ( numParams > 1 )
if ( numParams > 1 )
extraParms = params [ 1 ] ;
{
// now evaluate this mess they made
extraParms = " ( " ;
PyObject * mymod = PythonInterface : : FindModule ( " __main__ " ) ;
extraParms . append ( params [ 1 ] ) ;
extraParms . append ( " ,) " ) ;
}
else
extraParms = " () " ;
PythonInterface : : RunFunctionSafe ( " xCheat " , params [ 0 ] , extraParms . c_str ( ) ) ;
// create the line to execute the file
char runline [ 256 ] ;
sprintf ( runline , " import xCheat;xCheat.%s('%s') " , ( const char * ) params [ 0 ] , extraParms ) ;
PythonInterface : : RunString ( runline , mymod ) ;
std : : string output ;
std : : string output ;
// get the messages
// get the messages
PythonInterface : : getOutputAndReset ( & output ) ;
PythonInterface : : getOutputAndReset ( & output ) ;