[Scummvm-git-logs] scummvm master -> 5c0af779ca03d09c78e0252f1356632aa9e85a52

dreammaster noreply at scummvm.org
Fri Jun 3 01:31:15 UTC 2022


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:
5c0af779ca GLK: Fix bad indentation


Commit: 5c0af779ca03d09c78e0252f1356632aa9e85a52
    https://github.com/scummvm/scummvm/commit/5c0af779ca03d09c78e0252f1356632aa9e85a52
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2022-06-02T18:31:13-07:00

Commit Message:
GLK: Fix bad indentation

Reported by GCC 12:
../scummvm/engines/glk/zcode/processor.cpp: In member function 'void Glk::ZCode::Processor::call(Glk::ZCode::zword, int, Glk::ZCode::zword*, int)':
../scummvm/engines/glk/zcode/processor.cpp:349:17: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
  349 |                 if (h_version <= V4)            // V1 to V4 games provide default
      |                 ^~
../scummvm/engines/glk/zcode/processor.cpp:352:25: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'
  352 |                         *--_sp = (zword)((argc-- > 0) ? args[i] : value);
      |                         ^

Changed paths:
    engines/glk/zcode/processor.cpp


diff --git a/engines/glk/zcode/processor.cpp b/engines/glk/zcode/processor.cpp
index ea2ad58e06a..39738e8d489 100644
--- a/engines/glk/zcode/processor.cpp
+++ b/engines/glk/zcode/processor.cpp
@@ -349,7 +349,7 @@ void Processor::call(zword routine, int argc, zword *args, int ct) {
 		if (h_version <= V4)		// V1 to V4 games provide default
 			CODE_WORD(value);		// values for all local variables
 
-			*--_sp = (zword)((argc-- > 0) ? args[i] : value);
+		*--_sp = (zword)((argc-- > 0) ? args[i] : value);
 	}
 
 	// Start main loop for direct calls




More information about the Scummvm-git-logs mailing list