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

Replace hardcoded frame number in plDTProgressMgr.

Browse Source 
This was overlooked when the consolidation was done in 3027e0605c.
With this fix, the number of frames to be loaded is entirely defined
in a single place.  This also prepares the code for a future commit
to remove the necessity of the compile-time definition entirely.
This commit is contained in:
Joseph Davies
2013-12-20 08:11:49 -08:00
parent 09cc4b8259
commit 77266066ff
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/PubUtilLib/plPipeline/plDTProgressMgr.cpp
View File

@ -157,7 +157,7 @@ void plDTProgressMgr::Draw( plPipeline *p )
if ((currentMs - fLastDraw) > 30) if ((currentMs - fLastDraw) > 30)
{ {
fCurrentImage++; fCurrentImage++;
if (fCurrentImage >= 18) if (fCurrentImage >= plProgressMgr::NumLoadingFrames())
fCurrentImage = 0; fCurrentImage = 0;
fLastDraw = currentMs; fLastDraw = currentMs;

5
Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.cpp
View File

@ -246,6 +246,11 @@ char* plProgressMgr::GetLoadingFrameID(int index)
return fImageRotation[0]; return fImageRotation[0];
} }
uint32_t plProgressMgr::NumLoadingFrames() const
{
return LOADING_RES_COUNT;
}
const char* plProgressMgr::GetStaticTextID(StaticText staticTextType) const char* plProgressMgr::GetStaticTextID(StaticText staticTextType)
{ {
return fStaticTextIDs[staticTextType]; return fStaticTextIDs[staticTextType];

1
Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h
View File

@ -236,6 +236,7 @@ class plProgressMgr
static plProgressMgr* GetInstance() { return fManager; } static plProgressMgr* GetInstance() { return fManager; }
static char* GetLoadingFrameID(int index); static char* GetLoadingFrameID(int index);
uint32_t plProgressMgr::NumLoadingFrames() const;
static const char* GetStaticTextID(StaticText staticTextType); static const char* GetStaticTextID(StaticText staticTextType);
virtual void Draw( plPipeline *p ) { } virtual void Draw( plPipeline *p ) { }