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

[criezy]

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:
5b35830ea1 NANCY: Fix 'expected unqualified-id' compilation error


Commit: 5b35830ea10967716906db2d28ec6eb3b2480752
    https://github.com/scummvm/scummvm/commit/5b35830ea10967716906db2d28ec6eb3b2480752
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2023-08-22T23:31:17+01:00

Commit Message:
NANCY: Fix 'expected unqualified-id' compilation error

'or', 'and', and 'not' are keywords in C++ (they are alternatives
to ||, && and ! respectively) and thus should not be used as
variable names.

Changed paths:
    engines/nancy/console.cpp


diff --git a/engines/nancy/console.cpp b/engines/nancy/console.cpp
index 44f5914b5e0..a291f6effdb 100644
--- a/engines/nancy/console.cpp
+++ b/engines/nancy/console.cpp
@@ -882,9 +882,9 @@ bool NancyConsole::Cmd_setDifficulty(int argc, const char **argv) {
 bool NancyConsole::Cmd_soundInfo(int argc, const char **argv) {
 	if (g_nancy->getGameType() >= kGameTypeNancy3) {
 		const Math::Vector3d &pos = NancySceneState.getSceneSummary().listenerPosition;
-		const Math::Vector3d &or = g_nancy->_sound->_orientation;
+		const Math::Vector3d &ori = g_nancy->_sound->_orientation;
 		debugPrintf("3D listener position: %f, %f, %f\n", pos.x(), pos.y(), pos.z());
-		debugPrintf("3D listener orientation: %f, %f, %f\n\n", or.x(), or.y(), or.z());
+		debugPrintf("3D listener orientation: %f, %f, %f\n\n", ori.x(), ori.y(), ori.z());
 	}
 
 	Common::Array<byte> channelIDs;