OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Some fixes for pfConsole.

Browse Source
This commit is contained in:
Darryl Pogue
2012-01-30 23:59:20 -08:00
parent 704a49fe73
commit 2493cf8f73
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
View File

@ -45,6 +45,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// // // //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include "pfPython/cyPythonInterface.h"
#include "HeadSpin.h" #include "HeadSpin.h"
#include "pfConsole.h" #include "pfConsole.h"
#include "pfConsoleCore/pfConsoleEngine.h" #include "pfConsoleCore/pfConsoleEngine.h"
@ -62,7 +64,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plgDispatch.h" #include "plgDispatch.h"
#include "plPipeline.h" #include "plPipeline.h"
#include "pfPython/cyPythonInterface.h"
#include "plNetClient/plNetClientMgr.h" #include "plNetClient/plNetClientMgr.h"
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE

22
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
View File

@ -49,6 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define LIMIT_CONSOLE_COMMANDS 1 #define LIMIT_CONSOLE_COMMANDS 1
#endif #endif
#include "pfPython/cyPythonInterface.h"
#include "pfPython/plPythonSDLModifier.h"
#include "pfConsoleCore/pfConsoleCmd.h" #include "pfConsoleCore/pfConsoleCmd.h"
#include "plgDispatch.h" #include "plgDispatch.h"
@ -163,10 +165,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsStlUtils.h" #include "hsStlUtils.h"
#include "hsTemplates.h" #include "hsTemplates.h"
#include "pfPython/cyPythonInterface.h"
#include "pfPython/plPythonSDLModifier.h"
#include "plResMgr/plResManagerHelper.h" #include "plResMgr/plResManagerHelper.h"
#include "plResMgr/plResMgrSettings.h" #include "plResMgr/plResMgrSettings.h"
#include "plResMgr/plLocalization.h" #include "plResMgr/plLocalization.h"
@ -2466,11 +2464,10 @@ PF_CONSOLE_CMD( App, // groupName
"", // paramList "", // paramList
"Quit the client app" ) // helpString "Quit the client app" ) // helpString
{ {
if( plClient::GetInstance() ) if( plClient::GetInstance() ) {
PostMessage(plClient::GetInstance()->GetWindowHandle(), plClientMsg* msg = new plClientMsg(plClientMsg::kQuit);
WM_SYSCOMMAND, msg->Send(hsgResMgr::ResMgr()->FindKey(kClient_KEY));
SC_CLOSE, }
0);
} }
#ifndef LIMIT_CONSOLE_COMMANDS #ifndef LIMIT_CONSOLE_COMMANDS
@ -2510,8 +2507,12 @@ PF_CONSOLE_CMD(App,
"", "",
"Set low priority for this process") "Set low priority for this process")
{ {
#if HS_BUILD_FOR_WIN32
SetPriorityClass( GetCurrentProcess(), IDLE_PRIORITY_CLASS ); SetPriorityClass( GetCurrentProcess(), IDLE_PRIORITY_CLASS );
PrintString( "Set process priority to lowest setting" ); PrintString( "Set process priority to lowest setting" );
#else
PrintString("Not implemented on your platform!");
#endif
} }
@ -3933,6 +3934,8 @@ PF_CONSOLE_CMD( Nav, PageInNodeList, // Group name, Function name
"string roomNameBase", // Params "string roomNameBase", // Params
"Pages in all scene nodes that start with name." ) // Help string "Pages in all scene nodes that start with name." ) // Help string
{ {
/* This is really old and hasn't worked since 2002 anyways. */
#if HS_BUILD_FOR_WIN32
plSynchEnabler ps(false); // disable dirty tracking while paging in plSynchEnabler ps(false); // disable dirty tracking while paging in
std::string pageInNodesStr; std::string pageInNodesStr;
@ -3950,6 +3953,7 @@ PF_CONSOLE_CMD( Nav, PageInNodeList, // Group name, Function name
} }
pMsg1->AddReceiver( plClient::GetInstance()->GetKey() ); pMsg1->AddReceiver( plClient::GetInstance()->GetKey() );
plgDispatch::MsgSend(pMsg1); plgDispatch::MsgSend(pMsg1);
#endif
} }
#ifndef LIMIT_CONSOLE_COMMANDS #ifndef LIMIT_CONSOLE_COMMANDS

11
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommandsNet.cpp
View File

@ -50,6 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif #endif
#include "pfPython/plPythonSDLModifier.h"
#include "pfConsoleCore/pfConsoleCmd.h" #include "pfConsoleCore/pfConsoleCmd.h"
#include "plgDispatch.h" #include "plgDispatch.h"
@ -355,7 +356,8 @@ PF_CONSOLE_CMD( Net, // groupName
link.GetAgeInfo()->SetAgeFilename( params[0] ); link.GetAgeInfo()->SetAgeFilename( params[0] );
//link.GetAgeInfo()->SetAgeInstanceName( params[0] ); //link.GetAgeInfo()->SetAgeInstanceName( params[0] );
//link.GetAgeInfo()->SetAgeUserDefinedName( params[0] ); //link.GetAgeInfo()->SetAgeUserDefinedName( params[0] );
link.GetAgeInfo()->SetAgeInstanceGuid( &plUUID( params[1] ) ); plUUID guid(params[1]);
link.GetAgeInfo()->SetAgeInstanceGuid( &guid );
link.SetLinkingRules( plNetCommon::LinkingRules::kBasicLink ); link.SetLinkingRules( plNetCommon::LinkingRules::kBasicLink );
plNetLinkingMgr::GetInstance()->LinkToAge( &link ); plNetLinkingMgr::GetInstance()->LinkToAge( &link );
PrintString("Linking to age..."); PrintString("Linking to age...");
@ -637,7 +639,6 @@ PF_CONSOLE_CMD( Net_DebugObject, // groupName
plNetObjectDebugger::GetInstance()->ClearAllDebugObjects(); plNetObjectDebugger::GetInstance()->ClearAllDebugObjects();
} }
#include "pfPython/plPythonSDLModifier.h"
PF_CONSOLE_CMD( Net_DebugObject, // groupName PF_CONSOLE_CMD( Net_DebugObject, // groupName
DumpAgeSDLHook, // fxnName DumpAgeSDLHook, // fxnName
"bool dirtyOnly", // paramList "bool dirtyOnly", // paramList
@ -810,7 +811,8 @@ PF_CONSOLE_CMD( Net_Vault,
plAgeLinkStruct link; plAgeLinkStruct link;
link.GetAgeInfo()->SetAgeFilename( params[0] ); link.GetAgeInfo()->SetAgeFilename( params[0] );
link.GetAgeInfo()->SetAgeInstanceName( params[0] ); link.GetAgeInfo()->SetAgeInstanceName( params[0] );
link.GetAgeInfo()->SetAgeInstanceGuid( &plUUID(GuidGenerate())); plUUID guid(GuidGenerate());
link.GetAgeInfo()->SetAgeInstanceGuid( &guid);
link.SetSpawnPoint( kDefaultSpawnPoint ); link.SetSpawnPoint( kDefaultSpawnPoint );
bool success = VaultRegisterOwnedAgeAndWait(&link); bool success = VaultRegisterOwnedAgeAndWait(&link);
PrintStringF(PrintString, "Operation %s.", success ? "Successful" : "Failed"); PrintStringF(PrintString, "Operation %s.", success ? "Successful" : "Failed");
@ -837,7 +839,8 @@ PF_CONSOLE_CMD( Net_Vault,
plAgeLinkStruct link; plAgeLinkStruct link;
link.GetAgeInfo()->SetAgeFilename( params[0] ); link.GetAgeInfo()->SetAgeFilename( params[0] );
link.GetAgeInfo()->SetAgeInstanceName( params[0] ); link.GetAgeInfo()->SetAgeInstanceName( params[0] );
link.GetAgeInfo()->SetAgeInstanceGuid( &plUUID(GuidGenerate())); plUUID guid(GuidGenerate());
link.GetAgeInfo()->SetAgeInstanceGuid( &guid);
link.SetSpawnPoint( kDefaultSpawnPoint ); link.SetSpawnPoint( kDefaultSpawnPoint );
bool success = VaultRegisterOwnedAgeAndWait(&link); bool success = VaultRegisterOwnedAgeAndWait(&link);
PrintStringF(PrintString, "Operation %s.", success ? "Successful" : "Failed"); PrintStringF(PrintString, "Operation %s.", success ? "Successful" : "Failed");