diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/updatewindow.cpp | 8 | ||||
| -rw-r--r-- | src/playerinfo.h | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index b0e2a2b8..e0c098f0 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -69,7 +69,7 @@ UpdaterWindow::UpdaterWindow(): mPlayButton->setEnabled(false); mPlayButton->addActionListener(this); mProgressBar = new ProgressBar(0.0, 5, mCancelButton->getY() - 20 - 5, - w - 10, 20, 37, 70, 23); + w - 10, 20, 37, 70, 200); mLabel = new gcn::Label("Connecting..."); mLabel->setPosition(5, mProgressBar->getY() - mLabel->getHeight() - 5); mScrollArea = new ScrollArea(mBrowserBox); @@ -194,10 +194,8 @@ int UpdaterWindow::updateProgress(void *ptr, float progress = dn / dt; UpdaterWindow *uw = reinterpret_cast<UpdaterWindow *>(ptr); - if (progress < 0) - { - progress = 0.0f; - } + if (progress < 0) progress = 0.0f; + if (progress > 1) progress = 1.0f; std::stringstream progressString; progressString << uw->mCurrentFile diff --git a/src/playerinfo.h b/src/playerinfo.h index b351b083..f0509e51 100644 --- a/src/playerinfo.h +++ b/src/playerinfo.h @@ -37,8 +37,8 @@ struct PLAYER_INFO short statPoint, skillPoint, hairColor, hairStyle; char STR, AGI, VIT, INT, DEX, LUK; char STRUp, AGIUp, VITUp, INTUp, DEXUp, LUKUp; - char ATK, ATKBonus, MATK, MATKBonus, DEF, DEFBonus, MDEF; - char MDEFBonus, HIT, FLEE, FLEEBonus; + int ATK, ATKBonus, MATK, MATKBonus, DEF, DEFBonus, MDEF; + int MDEFBonus, HIT, FLEE, FLEEBonus; char characterNumber; int totalWeight, maxWeight; short weapon; |