[Scummvm-git-logs] scummvm master -> 2fa13bb14975c396a8770e56027bcff438049468

[dreammaster]

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

Summary:
2fa13bb149 AGS: Compilation fix


Commit: 2fa13bb14975c396a8770e56027bcff438049468
    https://github.com/scummvm/scummvm/commit/2fa13bb14975c396a8770e56027bcff438049468
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-04-13T22:12:16-07:00

Commit Message:
AGS: Compilation fix

Changed paths:
    engines/ags/engine/script/cc_instance.cpp
    engines/ags/engine/script/script_api.cpp


diff --git a/engines/ags/engine/script/cc_instance.cpp b/engines/ags/engine/script/cc_instance.cpp
index 4af04790a20..29aab984b13 100644
--- a/engines/ags/engine/script/cc_instance.cpp
+++ b/engines/ags/engine/script/cc_instance.cpp
@@ -1495,7 +1495,7 @@ bool ccInstance::ResolveScriptImports(const ccScript *scri) {
 	}
 
 	resolved_imports = new int[numimports];
-	int errors = 0, last_err_idx;
+	int errors = 0, last_err_idx = 0;
 	for (int import_idx = 0; import_idx < scri->numimports; ++import_idx) {
 		if (scri->imports[import_idx] == nullptr) {
 			resolved_imports[import_idx] = -1;
diff --git a/engines/ags/engine/script/script_api.cpp b/engines/ags/engine/script/script_api.cpp
index e478e37d82d..2b9e21a7ea3 100644
--- a/engines/ags/engine/script/script_api.cpp
+++ b/engines/ags/engine/script/script_api.cpp
@@ -201,7 +201,7 @@ const char *ScriptSprintf(char *buffer, size_t buf_length, const char *format,
 					const char *p = GetArgPtr(sc_args, varg_ptr, arg_idx);
 					// Do extra checks for %s placeholder
 					if (fmt_done == kFormatParseArgString && !p) {
-						if (loaded_game_file_version < kGameVersion_320) {
+						if (_G(loaded_game_file_version) < kGameVersion_320) {
 							// explicitly put "(null)" into the placeholder
 							p = "(null)";
 						} else {