aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2008-09-09 06:47:41 +0000
committerFilippos Karapetis2008-09-09 06:47:41 +0000
commit814e27fe406a6fdc380ad426e9e3c3955514f571 (patch)
tree84b9fa15465a60d7d6334933a0f9c440413347b9
parent83e09d1aa499c827d167642de0a8ffb783c4818e (diff)
downloadscummvm-rg350-814e27fe406a6fdc380ad426e9e3c3955514f571.tar.gz
scummvm-rg350-814e27fe406a6fdc380ad426e9e3c3955514f571.tar.bz2
scummvm-rg350-814e27fe406a6fdc380ad426e9e3c3955514f571.zip
Fix for bug #2101083 - "ANY - MSVC71 compilation fails due to warnings-as-errors"
svn-id: r34457
-rw-r--r--engines/parallaction/gui_br.cpp5
-rw-r--r--engines/queen/journal.cpp8
2 files changed, 7 insertions, 6 deletions
diff --git a/engines/parallaction/gui_br.cpp b/engines/parallaction/gui_br.cpp
index b0beb5f953..c687a15026 100644
--- a/engines/parallaction/gui_br.cpp
+++ b/engines/parallaction/gui_br.cpp
@@ -216,7 +216,7 @@ public:
virtual void enter() {
_vm->_gfx->clearScreen();
- int x = 0, y = 0;
+ int x = 0, y = 0, i = 0;
if (_vm->getPlatform() == Common::kPlatformPC) {
x = 20;
y = 50;
@@ -227,10 +227,9 @@ public:
bool complete[3];
_vm->_saveLoad->getGamePartProgress(complete, 3);
- for (int i = 0; i < 3 && complete[i]; i++, _availItems++) ;
+ for (i = 0; i < 3 && complete[i]; i++, _availItems++) ;
// TODO: keep track of and destroy menu item frames/surfaces
- int i;
for (i = 0; i < _availItems; i++) {
_lines[i] = new GfxObj(0, renderMenuItem(_menuStrings[i]), "MenuItem");
uint id = _vm->_gfx->setItem(_lines[i], MENUITEMS_X, MENUITEMS_Y + MENUITEM_HEIGHT * i, 0xFF);
diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp
index ead759cdb6..7846fa5c36 100644
--- a/engines/queen/journal.cpp
+++ b/engines/queen/journal.cpp
@@ -385,16 +385,18 @@ void Journal::drawPanelText(int y, const char *text) {
char s[128];
strncpy(s, text, 127);
s[127] = 0;
+ char *p;
+
// remove leading and trailing spaces (necessary for spanish version)
- for (char *p = s + strlen(s) - 1; p >= s && *p == ' '; --p) {
+ for (p = s + strlen(s) - 1; p >= s && *p == ' '; --p) {
*p = 0;
}
text = s;
- for (char *p = s; *p == ' '; ++p) {
+ for (p = s; *p == ' '; ++p) {
text = p + 1;
}
// draw the substrings
- char *p = (char *)strchr(text, ' ');
+ p = (char *)strchr(text, ' ');
if (!p) {
int x = (128 - _vm->display()->textWidth(text)) / 2;
_vm->display()->setText(x, y, text, false);