[Scummvm-cvs-logs] CVS: scummvm/gui ThemeNew.cpp,1.21,1.22 newgui.cpp,1.124,1.125
Pawel Kolodziejski
aquadran at users.sourceforge.net
Thu Feb 2 23:31:19 CET 2006
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6269/gui
Modified Files:
ThemeNew.cpp newgui.cpp
Log Message:
fixes allow compile with emsvc4 again
Index: ThemeNew.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ThemeNew.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ThemeNew.cpp 1 Feb 2006 22:39:54 -0000 1.21
+++ ThemeNew.cpp 3 Feb 2006 07:30:29 -0000 1.22
@@ -1032,11 +1032,12 @@
_lastUsedBitMask = gBitFormat;
- for (int i = 0; i < kImageHandlesMax; ++i) {
+ int i;
+ for (i = 0; i < kImageHandlesMax; ++i) {
ImageMan.unregisterSurface(_imageHandles[i]);
}
- for (int i = 0; i < kImageHandlesMax; ++i) {
+ for (i = 0; i < kImageHandlesMax; ++i) {
ImageMan.registerSurface(_imageHandles[i], 0);
_images[i] = ImageMan.getSurface(_imageHandles[i]);
}
Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- newgui.cpp 27 Jan 2006 15:43:23 -0000 1.124
+++ newgui.cpp 3 Feb 2006 07:30:29 -0000 1.125
@@ -113,10 +113,12 @@
// This is necessary to get the blending right.
_theme->clearAll();
- for (int i = 0; i < _dialogStack.size(); ++i) {
+ int i;
+
+ for (i = 0; i < _dialogStack.size(); ++i) {
_theme->closeDialog();
}
- for (int i = 0; i < _dialogStack.size(); i++) {
+ for (i = 0; i < _dialogStack.size(); i++) {
_theme->openDialog();
_dialogStack[i]->drawDialog();
}
More information about the Scummvm-git-logs
mailing list