summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-03-27 14:51:10 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-03-27 14:51:10 +0000
commit479dcf7e5c79cae48deebb613cd951df7d8d2b46 (patch)
tree433189fc106f6e49328173e2a3b36f737641a2c4 /src/gui
parentadb2d7987c0395ae9814dc6f8adccc3f0ef7afe4 (diff)
downloadmana-479dcf7e5c79cae48deebb613cd951df7d8d2b46.tar.gz
mana-479dcf7e5c79cae48deebb613cd951df7d8d2b46.tar.bz2
mana-479dcf7e5c79cae48deebb613cd951df7d8d2b46.tar.xz
mana-479dcf7e5c79cae48deebb613cd951df7d8d2b46.zip
Applied patch by peavey and added his name to the ChangeLog some more.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/progressbar.cpp3
-rw-r--r--src/gui/scrollarea.cpp4
-rw-r--r--src/gui/viewport.cpp3
3 files changed, 6 insertions, 4 deletions
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);