Applied patch by peavey and added his name to the ChangeLog some more.

4 files changed, 18 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index be80f204..dec2befd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,21 @@
-2008-03-26  Philipp Sehmisch  <tmw@crushnet.org>
+2008-03-27  Dennis Friis  <peavey@placid.dk>
+
+	* src/gui/progressbar.cpp, src/gui/scrollarea.cpp: Revert progress bar
+	changes and initialize mWalkTime.
+
+2008-03-26  Dennis Friis  <peavey@placid.dk>
 
 	* src/gui/progressbar.cpp, src/localplayer.cpp: Initialized some
-	uninitialized variables (patch by peavey).
+	uninitialized variables.
 
 2008-03-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/engine.h, src/gui/viewport.h, src/engine.cpp,
 	src/net/playerhandler.cpp: Removed unnecessary forwarding method.
 
-2008-03-16  Eugenio Favalli  <elvenprogrammer@themanaworld.org>
+2008-03-16  Dennis Friis  <peavey@placid.dk>
 
-	* The Mana World.dev: Updated Dev-C++ project file. Patch by peavey.
+	* The Mana World.dev: Updated Dev-C++ project file.
 
 2008-03-11  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
@@ -21,14 +26,12 @@
 
 	* data/graphics/gui/attack_target.png: Removed unused image.
 
-2008-03-09  Philipp Sehmisch  <tmw@crushnet.org>
+2008-03-09  Dennis Friis  <peavey@placid.dk>
 
 	* src/game.cpp: Pressing escape in the quit dialog closes the dialog.
-	(patch by peavey)
 	* src/gui/chat.cpp, src/gui/chat.h: Fixed a bug with chat messages
-	without a sender which include semicolons (patch by peavey).
-	* src/chat.cpp: Added "/clear" command to clear chat window
-	(patch by peavey).
+	without a sender which include semicolons.
+	* src/chat.cpp: Added "/clear" command to clear chat window.
 
 2008-03-08  Philipp Sehmisch  <tmw@crushnet.org>
 
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 6851484f..6d18b2f7 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -35,9 +35,10 @@ ProgressBar::ProgressBar(float progress,
                          unsigned int width, unsigned int height,
                          Uint8 red, Uint8 green, Uint8 blue):
     gcn::Widget(),
-    mProgress(progress), mRed(red), mGreen(green), mBlue(blue),
+    mRed(red), mGreen(green), mBlue(blue),
     mRedToGo(red), mGreenToGo(green), mBlueToGo(blue)
 {
+    setProgress(progress);
     setWidth(width);
     setHeight(height);
 
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index cf555ef4..cd83b565 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -86,8 +86,8 @@ void ScrollArea::init()
         // Load the background skin
         ResourceManager *resman = ResourceManager::getInstance();
         Image *textbox = resman->getImage("graphics/gui/deepbox.png");
-        int bggridx[4] = {0, 3, 28, 31};
-        int bggridy[4] = {0, 3, 28, 31};
+        const int bggridx[4] = {0, 3, 28, 31};
+        const int bggridy[4] = {0, 3, 28, 31};
         int a = 0, x, y;
 
         for (y = 0; y < 3; y++) {
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 3a297f66..ecd70d69 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -55,7 +55,8 @@ Viewport::Viewport():
     mTileViewX(0),
     mTileViewY(0),
     mShowDebugPath(false),
-    mPlayerFollowMouse(false)
+    mPlayerFollowMouse(false),
+    mWalkTime(0)
 {
     setOpaque(false);
     addMouseListener(this);