[Scummvm-cvs-logs] CVS: scummvm/sword1 objectman.cpp,1.7,1.8 objectman.h,1.6,1.7
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Wed Oct 20 23:50:17 CEST 2004
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2646
Modified Files:
objectman.cpp objectman.h
Log Message:
Fixed warnings. (Maybe it should be "const char *" instead, but then I got
warnings from a different part of the code. Ho, hum...)
Index: objectman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/objectman.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- objectman.cpp 21 Oct 2004 03:47:14 -0000 1.7
+++ objectman.cpp 21 Oct 2004 06:44:25 -0000 1.8
@@ -157,6 +157,6 @@
memcpy(dest, _liveList, TOTAL_SECTIONS * sizeof(uint16));
}
-char *ObjectMan::_errorStr = "Error: Text not found.";
+char ObjectMan::_errorStr[] = "Error: Text not found.";
} // End of namespace Sword1
Index: objectman.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/objectman.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- objectman.h 21 Oct 2004 03:47:15 -0000 1.6
+++ objectman.h 21 Oct 2004 06:44:25 -0000 1.7
@@ -57,7 +57,7 @@
static const uint32 _textList[TOTAL_SECTIONS][7]; //a table of pointers to text files
uint16 _liveList[TOTAL_SECTIONS]; //which sections are active
uint8 *_cptData[TOTAL_SECTIONS];
- static char *_errorStr;
+ static char _errorStr[];
};
} // End of namespace Sword1
More information about the Scummvm-git-logs
mailing list