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

Ensure there is always book-spinning while linking

Browse Source 
This should help people realize that things are happening... Even if
whatever server they're connected to takes a very long time to process a
join request. At some point in the future, the linking process should be
de-serialized.
This commit is contained in:
Adam Johnson
2013-05-27 23:52:09 -04:00
parent f27cf09cf5
commit dcb0e2f046
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeJoiner.cpp
View File

@ -338,6 +338,7 @@ void plNCAgeJoiner::ExecNextOp () {
((plResManager*)hsgResMgr::ResMgr())->SetProgressBarProc(nil); ((plResManager*)hsgResMgr::ResMgr())->SetProgressBarProc(nil);
delete progressBar; delete progressBar;
progressBar = nil; progressBar = nil;
nc->EndTask();
nextOp = kEnableClickables; nextOp = kEnableClickables;
} }

1
Sources/Plasma/PubUtilLib/plNetClient/plNetCliAgeLeaver.cpp
View File

@ -216,6 +216,7 @@ void plNCAgeLeaver::ExecNextOp () {
//==================================================================== //====================================================================
case kUnloadAge: { case kUnloadAge: {
nc->BeginTask();
NetCliGameDisconnect(); NetCliGameDisconnect();
// Cull nodes that were part of this age vault (but not shared by the player's vault) // Cull nodes that were part of this age vault (but not shared by the player's vault)

15
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
View File

@ -131,8 +131,7 @@ plNetClientMgr::plNetClientMgr() :
fLocalPlayerKey(nil), fLocalPlayerKey(nil),
fMsgHandler(this), fMsgHandler(this),
fJoinOrder(0), fJoinOrder(0),
// fProgressBar( nil ), fTaskProgBar(nullptr),
fTaskProgBar( nil ),
fMsgRecorder(nil), fMsgRecorder(nil),
fServerTimeOffset(0), fServerTimeOffset(0),
fTimeSamples(0), fTimeSamples(0),
@ -168,8 +167,8 @@ plNetClientMgr::~plNetClientMgr()
if (this==GetInstance()) if (this==GetInstance())
SetInstance(nil); // we're going down boys SetInstance(nil); // we're going down boys
IClearPendingLoads(); IClearPendingLoads();
delete fTaskProgBar;
} }
// //
@ -1467,6 +1466,16 @@ void plNetClientMgr::ClearPendingPagingRoomMsgs()
fPendingPagingRoomMsgs.clear(); fPendingPagingRoomMsgs.clear();
} }
void plNetClientMgr::BeginTask()
{
fTaskProgBar = plProgressMgr::GetInstance()->RegisterOverallOperation(0.f);
}
void plNetClientMgr::EndTask()
{
delete fTaskProgBar;
fTaskProgBar = nullptr;
}
bool plNetClientMgr::DebugMsgV(const char* fmt, va_list args) const bool plNetClientMgr::DebugMsgV(const char* fmt, va_list args) const
{ {

11
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
View File

@ -134,9 +134,8 @@ public:
}; };
private: private:
// plOperationProgress *fProgressBar; plOperationProgress* fTaskProgBar;
plOperationProgress *fTaskProgBar;
typedef std::list<PendingLoad*> PendingLoadsList; typedef std::list<PendingLoad*> PendingLoadsList;
PendingLoadsList fPendingLoads; PendingLoadsList fPendingLoads;
@ -369,8 +368,10 @@ public:
void NotifyRcvdAllSDLStates(); void NotifyRcvdAllSDLStates();
plOperationProgress* GetTaskProgBar() { return fTaskProgBar; } plOperationProgress* GetTaskProgBar() { return fTaskProgBar; }
void BeginTask();
void EndTask();
bool DebugMsgV(const char* fmt, va_list args) const; bool DebugMsgV(const char* fmt, va_list args) const;
bool ErrorMsgV(const char* fmt, va_list args) const; bool ErrorMsgV(const char* fmt, va_list args) const;
bool WarningMsgV(const char* fmt, va_list args) const; bool WarningMsgV(const char* fmt, va_list args) const;