* Make Script Arguments fixed size to work with Dark Forces allocators.

  * This means that string arguments are limited to 31 characters.

Author: luciusDXL

TheForceEngine/TFE_ForceScript/forceScript.cpp

@@ -919,7 +919,8 @@ namespace TFE_ForceScript
 				} break;
 				case ARG_STRING:
 				{
-					context->SetArgObject(i, (void*)&arg[i].stdStr);
+					std::string stdStr(arg[i].strValue);
+					context->SetArgObject(i, (void*)&stdStr);
 				} break;
 				case ARG_FLOAT2:
 				{

TheForceEngine/TFE_ForceScript/forceScript.h

@@ -54,8 +54,8 @@ namespace TFE_ForceScript
 			Vec2f float2Value;
 			Vec3f float3Value;
 			Vec4f float4Value;
+			char strValue[32];
 		};
-		std::string stdStr;
 	};
 
 	// Opaque Handles.
@@ -109,8 +109,8 @@ namespace TFE_ForceScript
 	inline ScriptArg scriptArg(u32 value) { ScriptArg arg; arg.type = ARG_U32; arg.uValue = value; return arg; }
 	inline ScriptArg scriptArg(f32 value) { ScriptArg arg; arg.type = ARG_F32; arg.fValue = value; return arg; }
 	inline ScriptArg scriptArg(bool value) { ScriptArg arg; arg.type = ARG_BOOL; arg.bValue = value; return arg; }
-	inline ScriptArg scriptArg(const std::string& value) { ScriptArg arg; arg.type = ARG_STRING; arg.stdStr = value; return arg; }
-	inline ScriptArg scriptArg(const char* value) { ScriptArg arg; arg.type = ARG_STRING; arg.stdStr = value; return arg; }
+	inline ScriptArg scriptArg(const std::string& value) { ScriptArg arg; arg.type = ARG_STRING; strcpy(arg.strValue, value.c_str()); return arg; }
+	inline ScriptArg scriptArg(const char* value) { ScriptArg arg; arg.type = ARG_STRING; strcpy(arg.strValue, value); return arg; }
 	inline ScriptArg scriptArg(Vec2f value) { ScriptArg arg; arg.type = ARG_FLOAT2; arg.float2Value = value; return arg; }
 	inline ScriptArg scriptArg(Vec3f value) { ScriptArg arg; arg.type = ARG_FLOAT3; arg.float3Value = value; return arg; }
 	inline ScriptArg scriptArg(Vec4f value) { ScriptArg arg; arg.type = ARG_FLOAT4; arg.float4Value = value; return arg; }

TheForceEngine/TFE_Jedi/InfSystem/infSystem.cpp

@@ -2034,7 +2034,9 @@ namespace TFE_Jedi
 					memcpy(unquotedStr, &value[1], newLen);
 					unquotedStr[newLen] = 0;
 
-					arg[argCount].stdStr = std::string(unquotedStr);
+					// Force string to fixed-size.
+					unquotedStr[31] = 0;
+					strcpy(arg[argCount].strValue, unquotedStr);
 					arg[argCount].type = TFE_ForceScript::ARG_STRING;
 					argCount++;
 				}

TheForceEngine/TFE_Jedi/Level/level.cpp

@@ -1108,7 +1108,7 @@ namespace TFE_Jedi
 		{
 			TFE_ForceScript::ScriptArg arg;
 			arg.type = TFE_ForceScript::ARG_STRING;
-			arg.stdStr = levelName;
+			strcpy(arg.strValue, levelName);
 			TFE_ForceScript::execFunc(s_levelState.levelScriptStart, 1, &arg);
 		}
 	}

TheForceEngine/TFE_Jedi/Serialization/serialization.cpp

@@ -181,7 +181,7 @@ namespace TFE_Jedi
 			TFE_System::logWrite(LOG_ERROR, "ScriptArg Serialization", "Cannot serialize type \"object\"");
 			break;
 		case TFE_ForceScript::ARG_STRING:
-			SERIALIZE_STRING(version, arg->stdStr);
+			SERIALIZE_CSTRING(version, arg->strValue);
 			break;
 		case TFE_ForceScript::ARG_FLOAT2:
 			SERIALIZE_BUF(version, arg->float2Value.m, sizeof(Vec2f));