From bbc19e4e4b2faa896dd6362c8289e01c7962395d Mon Sep 17 00:00:00 2001 From: puzl Date: Thu, 29 Jun 2006 18:08:09 +0000 Subject: [PATCH] o Updated sprite for generic progressbar. git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@545 67975925-1194-0748-b3d5-c16f83f1a3a1 --- releases/3.2.0/source/mod/AvHHud.h | 3 ++- releases/3.2.0/source/mod/AvHHudRender.cpp | 20 ++++++++++++++------ releases/3.2.0/source/mod/AvHSprites.h | 3 ++- releases/3.2.0/sprites/640progress.spr | Bin 0 -> 17274 bytes 4 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 releases/3.2.0/sprites/640progress.spr diff --git a/releases/3.2.0/source/mod/AvHHud.h b/releases/3.2.0/source/mod/AvHHud.h index ad9d4cf..d3a6555 100644 --- a/releases/3.2.0/source/mod/AvHHud.h +++ b/releases/3.2.0/source/mod/AvHHud.h @@ -363,7 +363,7 @@ public: void RenderMarineUI(); void RenderCommanderUI(); void RenderAlienUI(); - void RenderProgressBar(); + void RenderProgressBar(char *spriteName); void RenderMiniMap(int inX, int inY, int inWidth, int inHeight); void RenderStructureRanges(); @@ -772,6 +772,7 @@ private: float mFogStart; float mFogEnd; + HSPRITE mExperienceBarSprite; HSPRITE mProgressBarSprite; AvHBaseInfoLocationListType mInfoLocationList; diff --git a/releases/3.2.0/source/mod/AvHHudRender.cpp b/releases/3.2.0/source/mod/AvHHudRender.cpp index 728b807..b257bef 100644 --- a/releases/3.2.0/source/mod/AvHHudRender.cpp +++ b/releases/3.2.0/source/mod/AvHHudRender.cpp @@ -2726,7 +2726,7 @@ void AvHHud::Render() DrawWarpedOverlaySprite(mDigestingSprite, 4, 3, .02, .02, .3, .15); } - RenderProgressBar(); + RenderProgressBar(kProgressBarSprite); } else { @@ -2766,7 +2766,7 @@ void AvHHud::Render() RenderAlienUI(); } - RenderProgressBar(); + RenderProgressBar(kProgressBarSprite); } } @@ -3093,13 +3093,20 @@ void AvHHud::RenderCommonUI() } -void AvHHud::RenderProgressBar() +void AvHHud::RenderProgressBar(char *spriteName) { // Draw the progress bars const float progressBarStayTime = 0.2f; if (this->mProgressBarLastDrawn + progressBarStayTime > this->GetTimeOfLastUpdate()) { - if (this->mProgressBarSprite) + HSPRITE currentSprite=0; + if ( spriteName && ( strcmp(spriteName, kExperienceBarSprite) == 0 ) ) { + currentSprite=this->mExperienceBarSprite; + } + if ( spriteName && ( strcmp(spriteName, kProgressBarSprite) == 0 ) ) { + currentSprite=this->mProgressBarSprite; + } + if (currentSprite) { const float kNormalizedWidth = .1f; const float kNormalizedYInset = .89f; @@ -3112,13 +3119,13 @@ void AvHHud::RenderProgressBar() AvHSpriteSetColor(1,1,1); AvHSpriteSetRenderMode(kRenderTransAlpha); - AvHSpriteDraw(this->mProgressBarSprite, this->mProgressBarDrawframe + 1, kXStart, kYStart, kXStart + kNormalizedWidth*ScreenWidth(), kYStart + kNormalizedHeight*ScreenHeight(), 0, 0, 1, 1); + AvHSpriteDraw(currentSprite, this->mProgressBarDrawframe + 1, kXStart, kYStart, kXStart + kNormalizedWidth*ScreenWidth(), kYStart + kNormalizedHeight*ScreenHeight(), 0, 0, 1, 1); // Draw overlay showing progress float theProgress = this->mProgressBarStatus; if((theProgress >= 0.0f) && (theProgress <= 1.0f)) { - AvHSpriteDraw(this->mProgressBarSprite, this->mProgressBarDrawframe, kXStart, kYStart, kXStart + theProgress*kNormalizedWidth*ScreenWidth(), kYStart + kNormalizedHeight*ScreenHeight(), 0, 0, theProgress, 1.0f); + AvHSpriteDraw(currentSprite, this->mProgressBarDrawframe, kXStart, kYStart, kXStart + theProgress*kNormalizedWidth*ScreenWidth(), kYStart + kNormalizedHeight*ScreenHeight(), 0, 0, theProgress, 1.0f); } } } @@ -4405,6 +4412,7 @@ void AvHHud::VidInit(void) this->mTeammateOrderSprite = Safe_SPR_Load(kTeammateOrderSprite); // :tankefugl + this->mExperienceBarSprite = Safe_SPR_Load(kExperienceBarSprite); this->mProgressBarSprite = Safe_SPR_Load(kProgressBarSprite); this->mEnemyBlips.VidInit(); diff --git a/releases/3.2.0/source/mod/AvHSprites.h b/releases/3.2.0/source/mod/AvHSprites.h index db4715e..bcacbd3 100644 --- a/releases/3.2.0/source/mod/AvHSprites.h +++ b/releases/3.2.0/source/mod/AvHSprites.h @@ -93,7 +93,8 @@ #define kTeammateOrderSprite "sprites/query.spr" -#define kProgressBarSprite "sprites/640experience.spr" +#define kExperienceBarSprite "sprites/640experience.spr" +#define kProgressBarSprite "sprites/640progress.spr" #define PROGRESS_BAR_ALIEN 0 #define PROGRESS_BAR_GESTATE PROGRESS_BAR_ALIEN diff --git a/releases/3.2.0/sprites/640progress.spr b/releases/3.2.0/sprites/640progress.spr new file mode 100644 index 0000000000000000000000000000000000000000..3f5bb95ed7194365eedf52d0d0eb1d638d689462 GIT binary patch literal 17274 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 literal 0 HcmV?d00001