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

Merge pull request #370 from Deledrius/framenum_fix

Browse Source 
Replace hardcoded frame number in plDTProgressMgr.
This commit is contained in:
Adam Johnson
2013-12-20 13:51:22 -08:00
parent 358ae8dc84 77266066ff
commit 67448aad66
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)
{
fCurrentImage++;
if (fCurrentImage >= 18)
if (fCurrentImage >= plProgressMgr::NumLoadingFrames())
fCurrentImage = 0;
fLastDraw = currentMs;

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

@ -246,6 +246,11 @@ char* plProgressMgr::GetLoadingFrameID(int index)
return fImageRotation[0];
}
uint32_t plProgressMgr::NumLoadingFrames() const
{
return LOADING_RES_COUNT;
}
const char* plProgressMgr::GetStaticTextID(StaticText 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 char* GetLoadingFrameID(int index);
uint32_t plProgressMgr::NumLoadingFrames() const;
static const char* GetStaticTextID(StaticText staticTextType);
virtual void Draw( plPipeline *p ) { }