[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.237,1.238
Travis Howell
kirben at users.sourceforge.net
Sat Aug 14 04:50:10 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.236,1.237
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.176,2.177 script_v6.cpp,1.377,1.378 script_v6he.cpp,2.83,2.84 script_v7he.cpp,2.32,2.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30142/scumm
Modified Files:
string.cpp
Log Message:
Wrong order
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- string.cpp 14 Aug 2004 11:31:36 -0000 1.237
+++ string.cpp 14 Aug 2004 11:49:01 -0000 1.238
@@ -589,7 +589,7 @@
void ScummEngine::initCharset(int charsetno) {
int i;
- if ((!getResourceAddress(rtCharset, charsetno)) || (_version >= 7 && !isResourceLoaded(rtCharset, charsetno)))
+ if ((_version >= 7 && !isResourceLoaded(rtCharset, charsetno)) || !getResourceAddress(rtCharset, charsetno))
loadCharset(charsetno);
_string[0]._default.charset = charsetno;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.236,1.237
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.176,2.177 script_v6.cpp,1.377,1.378 script_v6he.cpp,2.83,2.84 script_v7he.cpp,2.32,2.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list