Fix intermittent spawn bug

Flush the transform when avatars are explicitly spawned on load. e.g. Ahnonay quabs.

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp

@@ -7001,6 +7001,38 @@ PF_CONSOLE_CMD( KI,								// Group name
 
 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"
 
 PF_CONSOLE_CMD( Python,							// Group name
@@ -7042,18 +7074,16 @@ PF_CONSOLE_CMD( Python,
 				"string functions, ...",	// Params
 				"Run a cheat command" )
 {
-	std::string extraParms;
+	const char* extraParms = "";
 	if (numParams > 1)
-	{
-		extraParms = "(";
-		extraParms.append(params[1]);
-		extraParms.append(",)");
-	}
-	else
-		extraParms = "()";
-
-	PythonInterface::RunFunctionSafe("xCheat", params[0], extraParms.c_str());
+		extraParms = params[1];
+	// now evaluate this mess they made
+	PyObject* mymod = PythonInterface::FindModule("__main__");
 
+	// 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;
 	// get the messages
 	PythonInterface::getOutputAndReset(&output);

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp

@@ -1718,20 +1718,6 @@ void PythonInterface::WriteToStdErr(const char* text)
 	}
 }
 
-PyObject* PythonInterface::ImportModule(const char* module) 
-{
-	PyObject* result = nil;
-	PyObject* name = PyString_FromString(module);
-
-	if (name != nil) 
-	{
-		result = PyImport_Import(name);
-		Py_DECREF(name);
-	}
-
-	return result;
-}
-
 /////////////////////////////////////////////////////////////////////////////
 //
 //  Function   : FindModule
@@ -2075,78 +2061,6 @@ hsBool PythonInterface::RunPYC(PyObject* code, PyObject* module)
 	return true;
 }
 
-/////////////////////////////////////////////////////////////////////////////
-//
-//  Function   : RunFunction
-//  PARAMETERS : module - module name to run 'name' in
-//             : name - name of function
-//             : args - tuple with arguments
-//
-//
-PyObject* PythonInterface::RunFunction(PyObject* module, const char* name, PyObject* args)
-{
-	if (module == NULL)
-		return NULL;
-
-	PyObject* function = PyObject_GetAttrString(module, const_cast<char*>(name));
-
-	PyObject* result = NULL;
-	if (function != nil) 
-	{
-		result = PyObject_Call(function, args, NULL);
-		Py_DECREF(function);
-	}
-
-	return result;
-}
-
-PyObject* PythonInterface::ParseArgs(const char* args)
-{
-	PyObject* result = NULL;
-	PyObject* scope = PyDict_New();
-	if (scope) 
-	{
-		//- Py_eval_input makes this function accept only single expresion (not statement)
-		//- When using empty scope, functions and classes like 'file' or '__import__' are not visible
-		result = PyRun_String(args, Py_eval_input, scope, NULL);
-		Py_DECREF(scope);
-	}
-   
-	return result;
-}
-
-bool PythonInterface::RunFunctionSafe(const char* module, const char* function, const char* args) 
-{
-	PyObject* moduleObj = ImportModule(module);
-	bool result = false;
-	if (moduleObj) 
-	{
-		PyObject* argsObj = ParseArgs(args);
-		if (argsObj) 
-		{
-			PyObject* callResult = RunFunction(moduleObj, function, argsObj);
-			if (callResult) 
-			{
-				result = true;
-				Py_DECREF(callResult);
-			}
-
-			Py_DECREF(argsObj);
-		}
-		Py_DECREF(moduleObj);
-	}
-
-	if (!result)
-	{
-		PyErr_Print();
-
-		if (Py_FlushLine())
-			PyErr_Clear();
-	}
-
-	return result;
-}
-
 /////////////////////////////////////////////////////////////////////////////
 //
 //  Function   : GetpyKeyFromPython

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.h

@@ -138,8 +138,6 @@ public:
 	// Writes 'text' to stderr specified in the python interface
 	static void WriteToStdErr(const char* text);
 
-	static PyObject* ImportModule(const char* module);
-
 	// Find module. If it doesn't exist then don't create, return nil.
 	static PyObject* FindModule(char* module);
 
@@ -221,12 +219,6 @@ public:
 	//
 	static hsBool RunPYC(PyObject* code, PyObject* module);
 
-	static PyObject* RunFunction(PyObject* module, const char* name, PyObject* args);
-
-	static PyObject* ParseArgs(const char* args);
-
-	static bool RunFunctionSafe(const char* module, const char* function, const char* args);
-
 	/////////////////////////////////////////////////////////////////////////////
 	//
 	//  Function   : GetpyKeyFromPython

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp

@@ -1302,7 +1302,7 @@ hsBool plArmatureMod::MsgReceive(plMessage* msg)
 				if(spawnSO)
 				{
 					hsMatrix44 l2w = spawnSO->GetLocalToWorld();
-					plWarpMsg *warpM = TRACKED_NEW plWarpMsg(nil, GetTarget(0)->GetKey(), 0, l2w);
+					plWarpMsg *warpM = TRACKED_NEW plWarpMsg(nil, GetTarget(0)->GetKey(), plWarpMsg::kFlushTransform, l2w);
 					warpM->Send();
 					fWaitFlags &= ~kNeedSpawn;
 				}