diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-04-20 16:24:06 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-04-20 16:24:06 +0000 |
commit | 843cfe68a7dc43f14522f80725627599c949b70d (patch) | |
tree | 73d8bf633b234f39a525d8646b60e4b172e002c2 /src/gui/scrollarea.cpp | |
parent | b94970f6f79980a9b386cf499da31880006247b0 (diff) | |
download | mana-843cfe68a7dc43f14522f80725627599c949b70d.tar.gz mana-843cfe68a7dc43f14522f80725627599c949b70d.tar.bz2 mana-843cfe68a7dc43f14522f80725627599c949b70d.tar.xz mana-843cfe68a7dc43f14522f80725627599c949b70d.zip |
Merged revisions 3962-3983,3985-3999,4001-4021 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0
........
r3962 | crush_tmw | 2008-03-09 16:35:00 +0100 (Sun, 09 Mar 2008) | 1 line
Applied some patches by peavey related to chatlog and the quit dialog.
........
r3968 | umperio | 2008-03-11 14:56:47 +0100 (Tue, 11 Mar 2008) | 1 line
Removed unused image.
........
r3969 | b_lindeijer | 2008-03-11 17:44:20 +0100 (Tue, 11 Mar 2008) | 2 lines
Also removed unused image from the files to be installed.
........
r4006 | crush_tmw | 2008-03-26 00:28:05 +0100 (Wed, 26 Mar 2008) | 1 line
Initialized some uninitialized variables (patch by peavey).
........
r4008 | b_lindeijer | 2008-03-27 15:51:10 +0100 (Thu, 27 Mar 2008) | 2 lines
Applied patch by peavey and added his name to the ChangeLog some more.
........
r4010 | b_lindeijer | 2008-03-30 16:06:14 +0200 (Sun, 30 Mar 2008) | 2 lines
Updated configure.ac for tmwdata split (patch by peavey).
........
r4018 | crush_tmw | 2008-04-01 03:02:30 +0200 (Tue, 01 Apr 2008) | 1 line
Added makefile for TMXCopy by jaxad.
........
r4019 | crush_tmw | 2008-04-01 03:34:29 +0200 (Tue, 01 Apr 2008) | 1 line
compilation fixes suggested by peavey.
........
r4020 | crush_tmw | 2008-04-01 03:37:51 +0200 (Tue, 01 Apr 2008) | 1 line
renaming makefile to Makefile
........
r4021 | crush_tmw | 2008-04-01 03:38:35 +0200 (Tue, 01 Apr 2008) | 1 line
renaming makefile to Makefile
........
Diffstat (limited to 'src/gui/scrollarea.cpp')
-rw-r--r-- | src/gui/scrollarea.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp index 97384fa3..9c88f8e3 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++) { |