[Scummvm-cvs-logs] SF.net SVN: scummvm: [27136] scummvm/branches/branch-0-10-0/engines/agi
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed Jun 6 15:34:32 CEST 2007
Revision: 27136
http://scummvm.svn.sourceforge.net/scummvm/?rev=27136&view=rev
Author: sev
Date: 2007-06-06 06:34:31 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
oops.
Modified Paths:
--------------
scummvm/branches/branch-0-10-0/engines/agi/agi_v3.cpp
scummvm/branches/branch-0-10-0/engines/agi/detection.cpp
Modified: scummvm/branches/branch-0-10-0/engines/agi/agi_v3.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/agi/agi_v3.cpp 2007-06-06 13:30:47 UTC (rev 27135)
+++ scummvm/branches/branch-0-10-0/engines/agi/agi_v3.cpp 2007-06-06 13:34:31 UTC (rev 27136)
@@ -64,7 +64,7 @@
if (f.hasSuffix("vol.0")) {
memset(_vm->_game.name, 0, 8);
- strncpy(_vm->_game.name, f.c_str(), MAX((uint)8, f.size() > 5 ? f.size() - 5 : f.size()));
+ strncpy(_vm->_game.name, f.c_str(), MIN((uint)8, f.size() > 5 ? f.size() - 5 : f.size()));
debugC(3, kDebugLevelMain, "game.name = %s", _vm->_game.name);
_intVersion = 0x3149; // setup for 3.002.149
ec = _vm->v3IdGame();
Modified: scummvm/branches/branch-0-10-0/engines/agi/detection.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/agi/detection.cpp 2007-06-06 13:30:47 UTC (rev 27135)
+++ scummvm/branches/branch-0-10-0/engines/agi/detection.cpp 2007-06-06 13:34:31 UTC (rev 27136)
@@ -1907,7 +1907,7 @@
for (IntMap::const_iterator f = allFiles.begin(); f != allFiles.end(); ++f) {
if (f->_key.hasSuffix("vol.0")) {
memset(name, 0, 8);
- strncpy(name, f->_key.c_str(), MAX((uint)8, f->_key.size() > 5 ? f->_key.size() - 5 : f->_key.size()));
+ strncpy(name, f->_key.c_str(), MIN((uint)8, f->_key.size() > 5 ? f->_key.size() - 5 : f->_key.size()));
if (allFiles.contains("object") && allFiles.contains("words.tok") &&
allFiles.contains(Common::String(name) + "dir")) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list