diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | src/gui/browserbox.h | 2 | ||||
| -rw-r--r-- | src/gui/buysell.cpp | 4 | ||||
| -rw-r--r-- | src/gui/menuwindow.cpp | 4 | ||||
| -rw-r--r-- | src/resources/image.cpp | 4 |
5 files changed, 15 insertions, 10 deletions
@@ -1,3 +1,9 @@ +2006-03-08 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/gui/browserbox.h, src/gui/menuwindow.cpp, src/gui/buysell.cpp: + Some fixes for compiling with pedantic compiler settings and const + char* checks. + 2006-03-08 Björn Steinbrink <B.Steinbrink@gmx.de> * src/map.cpp, src/main.cpp, src/gui/button.cpp, @@ -23,9 +29,8 @@ 2006-03-07 Yohann Ferreira <bertram@cegetel.net> - * trunk/debian/rules, trunk/debian/changelog, - tags/0.0.19/debian/rules, tags/0.0.19/debian/changelog, - trunk/ChangeLog: Updating Debian files for 0.0.19 release. + * debian/rules, debian/changelog, ChangeLog: Updating Debian files for + 0.0.19 release. 2006-03-07 Eugenio Favalli <elvenprogrammer@gmail.com> diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h index c6d8f117..95b181ad 100644 --- a/src/gui/browserbox.h +++ b/src/gui/browserbox.h @@ -139,7 +139,7 @@ class BrowserBox : public gcn::Widget, public gcn::MouseListener */ enum { UNDERLINE = 1, - BACKGROUND = 2, + BACKGROUND = 2 }; private: diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp index ccd82db5..d4c33d30 100644 --- a/src/gui/buysell.cpp +++ b/src/gui/buysell.cpp @@ -31,12 +31,12 @@ BuySellDialog::BuySellDialog(): Window("Shop") { Button *buyButton = 0; - char *buttonNames[] = { + const char *buttonNames[] = { "Buy", "Sell", "Cancel", 0 }; int x = 10, y = 10; - for (char **curBtn = buttonNames; *curBtn; curBtn++) + for (const char **curBtn = buttonNames; *curBtn; curBtn++) { Button *btn = new Button(*curBtn); if (!buyButton) buyButton = btn; // For focus request diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp index cb5fc654..811a10ab 100644 --- a/src/gui/menuwindow.cpp +++ b/src/gui/menuwindow.cpp @@ -53,12 +53,12 @@ MenuWindow::MenuWindow(): // Buttons // ------------ - char *buttonNames[] = { + const char *buttonNames[] = { "Status", "Equipment", "Inventory", "Skills", "Setup", 0 }; int x = 0, y = 3, h = 0; - for (char **curBtn = buttonNames; *curBtn; curBtn++) { + for (const char **curBtn = buttonNames; *curBtn; curBtn++) { gcn::Button *btn = new Button(*curBtn); btn->setEventId(*curBtn); btn->addActionListener(&menuWindowListener); diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 5176ec7a..f5082c60 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -158,11 +158,11 @@ Image* Image::load(void *buffer, unsigned int bufferSize, int height = tmpImage->h; int realWidth = 1, realHeight = 1; - while (realWidth < width && realWidth < 2048) { + while (realWidth < width && realWidth < 1024) { realWidth *= 2; } - while (realHeight < height && realHeight < 2048) { + while (realHeight < height && realHeight < 1024) { realHeight *= 2; } |