diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/control | 4 | ||||
-rw-r--r-- | src/gui/updatewindow.cpp | 8 | ||||
-rw-r--r-- | src/playerinfo.h | 4 |
5 files changed, 16 insertions, 9 deletions
@@ -9,6 +9,9 @@ an adequate name. * src/gui/updatewindow.cpp: Corrected a bug in the determination of the update host I had. + * src/gui/updatewindow.cpp, src/playerinfo.h, debian/control, + debian/changelog: Corrected a range value bug for derived stats. + Fixed the percentage of the update win, updated debian information. 2005-09-18 Björn Steinbrink <B.Steinbrink@gmx.de> diff --git a/debian/changelog b/debian/changelog index b00f35bb..97a0bb0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tmw (0.0.16-1) unstable; urgency=low + + * Eighth Release + + -- FERREIRA Yohann <bertram@cegetel.net> Tue, 6 Sep 2005 00:14:33 +0200 + tmw (0.0.15-1) unstable; urgency=low * Seventh Release diff --git a/debian/control b/debian/control index 3699f0d2..a9f552dd 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Source: tmw Section: games Priority: optional Maintainer: FERREIRA Yohann <bertram@cegetel.net> -Build-Depends: debhelper (>= 4.0.0), autotools-dev, docbook-to-man, libsdl1.2-dev (>= 1.2.7), libsdl-image1.2-dev (>= 1.2.3), libsdl-mixer1.2-dev (>= 1.2.5), libguichan-dev (>= 0.4.0-2), libcurl3-dev (>= 7.14.0-2), libxml2-dev (>= 2.4.19), libphysfs-dev (>= 1.0.0-1), xlibmesa-gl-dev (>= 6.8.2.dfsg.1-4) +Build-Depends: debhelper (>= 4.0.0), autotools-dev, docbook-to-man, libsdl1.2-dev (>= 1.2.7), libsdl-image1.2-dev (>= 1.2.3), libsdl-mixer1.2-dev (>= 1.2.5), libguichan-dev (>= 0.4.0-2), libcurl3-dev (>= 7.14.0-2), libxml2-dev (>= 2.4.19), libphysfs-dev (>= 1.0.0-1), xlibmesa-gl-dev (>= 6.8.2.dfsg.1-4), libpng3-dev (>= 1.2.8), libsdl-net1.2-dev (>= 1.2.5) Standards-Version: 3.6.1 Package: tmw Architecture: i386 -Depends: libsdl1.2debian (>= 1.2.7), libsdl-image1.2 (>= 1.2.3), libsdl-mixer1.2 (>= 1.2.5), libguichan (>= 0.4.0-2), libxml2 (>= 2.4.19), libphysfs-1.0-0 (>= 1.0.0-1), libcurl3 (>= 7.14.0-2), tmw-data (>= 0.0.15) +Depends: libsdl1.2debian (>= 1.2.7), libsdl-image1.2 (>= 1.2.3), libsdl-mixer1.2 (>= 1.2.5), libguichan (>= 0.4.0-2), libxml2 (>= 2.4.19), libphysfs-1.0-0 (>= 1.0.0-1), libcurl3 (>= 7.14.0-2), tmw-data (>= 0.0.16), libpng3 (>= 1.2.8), libsdl-net1.2 (>= 1.2.5) Suggests: tmw-music Maintainer: Ferreira Yohann <bertram@cegetel.net> Description: The Mana World is a Great Online Game 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; |