[Scummvm-git-logs] scummvm master -> 0a3e3d837219886142db3f7eb89a1172266e7616

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e187a37d95 SLUDGE: Avoid direct use of remove()
0a3e3d8372 SLUDGE: Remove superfluous C string conversions


Commit: e187a37d955466a15a95822714009c5c198906de
    https://github.com/scummvm/scummvm/commit/e187a37d955466a15a95822714009c5c198906de
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-08-10T13:04:09+03:00

Commit Message:
SLUDGE: Avoid direct use of remove()

Changed paths:
    engines/sludge/builtin.cpp


diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 03f94e26dd..800c2100c0 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -2074,7 +2074,8 @@ builtIn(deleteFile) {
 	namNormal.clear();
 	if (failSecurityCheck(nam))
 		return BR_ERROR;
-	fun->reg.setVariable(SVT_INT, remove(nam.c_str()));
+
+	fun->reg.setVariable(SVT_INT, !g_system->getSavefileManager()->removeSavefile(nam.c_str()));
 
 	return BR_CONTINUE;
 }


Commit: 0a3e3d837219886142db3f7eb89a1172266e7616
    https://github.com/scummvm/scummvm/commit/0a3e3d837219886142db3f7eb89a1172266e7616
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-08-10T13:04:09+03:00

Commit Message:
SLUDGE: Remove superfluous C string conversions

Changed paths:
    engines/sludge/builtin.cpp


diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index 800c2100c0..4d394e4e6d 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -2075,7 +2075,7 @@ builtIn(deleteFile) {
 	if (failSecurityCheck(nam))
 		return BR_ERROR;
 
-	fun->reg.setVariable(SVT_INT, !g_system->getSavefileManager()->removeSavefile(nam.c_str()));
+	fun->reg.setVariable(SVT_INT, !g_system->getSavefileManager()->removeSavefile(nam));
 
 	return BR_CONTINUE;
 }
@@ -2098,7 +2098,7 @@ builtIn(renameFile) {
 	if (failSecurityCheck(nam))
 		return BR_ERROR;
 
-	fun->reg.setVariable(SVT_INT, !g_system->getSavefileManager()->renameSavefile(nam.c_str(), newnam.c_str()));
+	fun->reg.setVariable(SVT_INT, !g_system->getSavefileManager()->renameSavefile(nam, newnam));
 
 	return BR_CONTINUE;
 }