[Scummvm-cvs-logs] SF.net SVN: scummvm:[43885] scummvm/branches/branch-1-0-0/engines/scumm/he/ script_v60he.cpp

[fingolfin at users.sourceforge.net]

Revision: 43885
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43885&view=rev
Author:   fingolfin
Date:     2009-09-01 13:04:38 +0000 (Tue, 01 Sep 2009)

Log Message:
-----------
Backported snprintf change from trunk r43879

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/scumm/he/script_v60he.cpp

Modified: scummvm/branches/branch-1-0-0/engines/scumm/he/script_v60he.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/he/script_v60he.cpp	2009-09-01 13:04:00 UTC (rev 43884)
+++ scummvm/branches/branch-1-0-0/engines/scumm/he/script_v60he.cpp	2009-09-01 13:04:38 UTC (rev 43885)
@@ -122,19 +122,17 @@
 	int r = 0;
 	if (dst[len - 3] == 's' && dst[len - 2] == 'g') { // Save Game File
 		// Change filename prefix to target name, for save game files.
-		char saveName[40];
-		memset(saveName, 0, sizeof(saveName));
-		sprintf(saveName, "%s.sg%c", _targetName.c_str(), dst[len - 1]);
-		memcpy(dst, saveName, 40);
+		const char c = dst[len - 1];
+		snprintf((char *)dst, dstSize, "%s.sg%c", _targetName.c_str(), c);
 	} else if (dst[0] == '.' && dst[1] == '/') { // Game Data Path
 		// The default game data path is set to './' by ScummVM
 		r = 2;
  	} else if (dst[0] == '*' && dst[1] == '/') { // Save Game Path (Windows HE72 - HE100)
 		// The default save game path is set to '*/' by ScummVM
 		r = 2;
- 	} else if (dst[0] == '*' && dst[1] == ':') { // Save Game Path (Macintosh HE72 - HE100)
+	} else if (dst[0] == '*' && dst[1] == ':') { // Save Game Path (Macintosh HE72 - HE100)
 		// The default save game path is set to ':/' by ScummVM
- 		r = 2;
+		r = 2;
 	} else if (dst[0] == 'c' && dst[1] == ':') { // Save Game Path (HE60 - HE71)
 		// The default save path is game path (DOS) or 'c:/hegames/' (Windows)
 		for (r = len; r != 0; r--) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.