5 files changed, 16 insertions, 16 deletions

diff --git a/src/saveload/ai_sl.cpp b/src/saveload/ai_sl.cpp
index 2a927504b..e8b5339c0 100644
--- a/src/saveload/ai_sl.cpp
+++ b/src/saveload/ai_sl.cpp
@@ -51,7 +51,7 @@ static void SaveReal_AIPL(int *index_ptr)
 
 	_ai_saveload_is_random = config->IsRandom();
 	_ai_saveload_settings[0] = '\0';
-	config->SettingsToString(_ai_saveload_settings, lengthof(_ai_saveload_settings));
+	config->SettingsToString(_ai_saveload_settings, lastof(_ai_saveload_settings));
 
 	SlObject(NULL, _ai_company);
 	/* If the AI was active, store his data too */
diff --git a/src/saveload/game_sl.cpp b/src/saveload/game_sl.cpp
index d9fc4ce2f..141353d81 100644
--- a/src/saveload/game_sl.cpp
+++ b/src/saveload/game_sl.cpp
@@ -50,7 +50,7 @@ static void SaveReal_GSDT(int *index_ptr)
 
 	_game_saveload_is_random = config->IsRandom();
 	_game_saveload_settings[0] = '\0';
-	config->SettingsToString(_game_saveload_settings, lengthof(_game_saveload_settings));
+	config->SettingsToString(_game_saveload_settings, lastof(_game_saveload_settings));
 
 	SlObject(NULL, _game_script);
 	Game::Save();
diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp
index 48a1459d9..95e278954 100644
--- a/src/script/script_config.cpp
+++ b/src/script/script_config.cpp
@@ -184,27 +184,27 @@ void ScriptConfig::StringToSettings(const char *value)
 	free(value_copy);
 }
 
-void ScriptConfig::SettingsToString(char *string, size_t size) const
+void ScriptConfig::SettingsToString(char *string, const char *last) const
 {
-	string[0] = '\0';
+	char *s = string;
+	*s = '\0';
 	for (SettingValueList::const_iterator it = this->settings.begin(); it != this->settings.end(); it++) {
 		char no[10];
 		seprintf(no, lastof(no), "%d", (*it).second);
 
 		/* Check if the string would fit in the destination */
-		size_t needed_size = strlen((*it).first) + 1 + strlen(no) + 1;
+		size_t needed_size = strlen((*it).first) + 1 + strlen(no);
 		/* If it doesn't fit, skip the next settings */
-		if (size <= needed_size) break;
-		size -= needed_size;
+		if (string + needed_size > last) break;
 
-		strcat(string, (*it).first);
-		strcat(string, "=");
-		strcat(string, no);
-		strcat(string, ",");
+		s = strecat(s, last, (*it).first);
+		s = strecat(s, last, "=");
+		s = strecat(s, last, no);
+		s = strecat(s, last, ",");
 	}
+
 	/* Remove the last ',', but only if at least one setting was saved. */
-	size_t len = strlen(string);
-	if (len > 0) string[len - 1] = '\0';
+	if (s != string) s[-1] = '\0';
 }
 
 const char *ScriptConfig::GetTextfile(TextfileType type, CompanyID slot) const
diff --git a/src/script/script_config.hpp b/src/script/script_config.hpp
index 0350f8ded..dfc675473 100644
--- a/src/script/script_config.hpp
+++ b/src/script/script_config.hpp
@@ -172,7 +172,7 @@ public:
 	 * Convert the custom settings to a string that can be stored in the config
 	 *  file or savegames.
 	 */
-	void SettingsToString(char *string, size_t size) const;
+	void SettingsToString(char *string, const char *last) const;
 
 	/**
 	 * Search a textfile file next to this script.
diff --git a/src/settings.cpp b/src/settings.cpp
index c7d9e2b32..27c3c910b 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1493,7 +1493,7 @@ static void AISaveConfig(IniFile *ini, const char *grpname)
 		AIConfig *config = AIConfig::GetConfig(c, AIConfig::SSS_FORCE_NEWGAME);
 		const char *name;
 		char value[1024];
-		config->SettingsToString(value, lengthof(value));
+		config->SettingsToString(value, lastof(value));
 
 		if (config->HasScript()) {
 			name = config->GetName();
@@ -1516,7 +1516,7 @@ static void GameSaveConfig(IniFile *ini, const char *grpname)
 	GameConfig *config = GameConfig::GetConfig(AIConfig::SSS_FORCE_NEWGAME);
 	const char *name;
 	char value[1024];
-	config->SettingsToString(value, lengthof(value));
+	config->SettingsToString(value, lastof(value));
 
 	if (config->HasScript()) {
 		name = config->GetName();