OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-22 05:09:13 +00:00
Code Releases Activity

Merge pull request #233 from Hoikas/py_system_error

Browse Source 
Fix Scary SystemErrors
This commit is contained in:
Branan Purvine-Riley
2012-12-20 20:23:41 -08:00
parent 75793e5182 c13a12c58e
commit a76cb3f18d
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp
View File

@ -859,14 +859,14 @@ void plPythonFileMod::AddTarget(plSceneObject* sobj)
// We should really let the script know about that via OnServerInitComplete anyway because it's // We should really let the script know about that via OnServerInitComplete anyway because it's
// not good to make assumptions about game state in workarounds for that method not being called // not good to make assumptions about game state in workarounds for that method not being called
plNetClientApp* na = plNetClientApp::GetInstance(); plNetClientApp* na = plNetClientApp::GetInstance();
if (!na->GetFlagsBit(plNetClientApp::kLoadingInitialAgeState) && if (!na->GetFlagsBit(plNetClientApp::kLoadingInitialAgeState) && na->GetFlagsBit(plNetClientApp::kPlayingGame))
na->GetFlagsBit(plNetClientApp::kPlayingGame))
{ {
plgDispatch::Dispatch()->UnRegisterForExactType(plInitialAgeStateLoadedMsg::Index(), GetKey()); plgDispatch::Dispatch()->UnRegisterForExactType(plInitialAgeStateLoadedMsg::Index(), GetKey());
if (fPyFunctionInstances[kfunc_OnServerInitComplete])
{
plProfile_BeginTiming(PythonUpdate); plProfile_BeginTiming(PythonUpdate);
// call it // call it
PyObject* retVal = PyObject_CallMethod( PyObject* retVal = PyObject_CallMethod(fPyFunctionInstances[kfunc_OnServerInitComplete],
fPyFunctionInstances[kfunc_OnServerInitComplete],
(char*)fFunctionNames[kfunc_OnServerInitComplete], nil); (char*)fFunctionNames[kfunc_OnServerInitComplete], nil);
if ( retVal == nil ) if ( retVal == nil )
{ {
@ -882,6 +882,7 @@ void plPythonFileMod::AddTarget(plSceneObject* sobj)
// display any output (NOTE: this would be disabled in production) // display any output (NOTE: this would be disabled in production)
DisplayPythonOutput(); DisplayPythonOutput();
} }
}
// display python output // display python output
DisplayPythonOutput(); DisplayPythonOutput();