[Scummvm-git-logs] scummvm master -> 7537528034f217e674bbdebf83e40918e9f0d639

[sev-]

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:
7537528034 JANITORIAL: Whitespace fixes


Commit: 7537528034f217e674bbdebf83e40918e9f0d639
    https://github.com/scummvm/scummvm/commit/7537528034f217e674bbdebf83e40918e9f0d639
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-06T18:43:18+02:00

Commit Message:
JANITORIAL: Whitespace fixes

Changed paths:
    engines/director/lingo/lingo-bytecode.cpp
    engines/director/lingo/lingo-codegen.cpp
    engines/director/lingo/lingo-object.cpp
    engines/director/lingo/lingo.h
    engines/director/stxt.cpp


diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index 8273956da7..d24110f2d8 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -103,7 +103,7 @@ static LingoV4Bytecode lingoV4[] = {
 	{ 0x82, LC::c_argcnoretpush,"w" },
 	{ 0x83, LC::c_argcpush,		"w" },
 	// 0x84, push a constant
-	{ 0x85, LC::c_namepush,     "w" },
+	{ 0x85, LC::c_namepush,		"w" },
 	{ 0x86, LC::cb_objectpush,  "w" },
 	{ 0x89, LC::cb_globalpush,	"w" },
 	{ 0x8a, LC::cb_thepush,		"w" },
diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index e9919cce57..65bda39db2 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -408,7 +408,7 @@ void Lingo::processIf(int toplabel, int endlabel) {
 
 		WRITE_UINT32(&iend, endlabel - label + 1);
 
-		(*_currentScript)[label] = iend;      /* end, if cond fails */
+		(*_currentScript)[label] = iend;	/* end, if cond fails */
 	}
 }
 
@@ -647,7 +647,7 @@ void Lingo::codeFactory(Common::String &name) {
 	obj->disposed = false;
 	obj->inheritanceLevel = 1;
 	obj->scriptContext = _currentScriptContext;
-	obj->objArray = new Common::HashMap<uint32, Datum>; 
+	obj->objArray = new Common::HashMap<uint32, Datum>;
 
 	_currentFactory = obj;
 	if (!_globalvars.contains(name)) {
diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index 4f1a03d26c..1f81d9438a 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -34,17 +34,17 @@ static struct MethodProto {
 	int maxArgs;
 	int version;
 } predefinedMethods[] = {
-    // "mAtFrame"                                                   // D2 - XObject or user-defined
-    // "mDescribe",			                                        // D2 - XObject
-	{ "mDispose",               LM::m_dispose,       0, 0, 2 },	    // D2
-	{ "mGet",			        LM::m_get,           1, 1, 2 },	    // D2
-	// "mInstanceRespondsTo",                                       // D2 - XObject
-	// "mMessageList",			                                    // D2 - XObject
-	// "mName",				                                        // D2 - XObject
-	{ "mNew",				    LM::m_new,           -1, 0, 2 },    // D2
-	// "mPerform",				                                    // D2 - XObject
-	{ "mPut",				    LM::m_put,           2, 2, 2 },	    // D2
-	// "mRespondsTo",		                                        // D2 - XObject
+	// "mAtFrame"													// D2 - XObject or user-defined
+	// "mDescribe",													// D2 - XObject
+	{ "mDispose",				LM::m_dispose,		 0, 0, 2 },		// D2
+	{ "mGet",					LM::m_get,			 1, 1, 2 },		// D2
+	// "mInstanceRespondsTo",										// D2 - XObject
+	// "mMessageList",			 									// D2 - XObject
+	// "mName",														// D2 - XObject
+	{ "mNew",					LM::m_new,			-1, 0, 2 },		// D2
+	// "mPerform",				 									// D2 - XObject
+	{ "mPut",					LM::m_put,			 2, 2, 2 },		// D2
+	// "mRespondsTo",		 										// D2 - XObject
 	{ 0, 0, 0, 0, 0 }
 };
 
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index d4e1c56d72..02514496c7 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -246,23 +246,23 @@ typedef Common::HashMap<Common::String, TheEntity *, Common::IgnoreCase_Hash, Co
 typedef Common::HashMap<Common::String, TheEntityField *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> TheEntityFieldHash;
 
 enum ObjectType {
-    kFactoryObj = 0,
-    kScriptObj = 1
+	kFactoryObj = 0,
+	kScriptObj = 1
 };
 
 struct Object {
 	Common::String *name;
-    ObjectType type;
+	ObjectType type;
 	bool disposed;
 
-    Object *prototype;
-    SymbolHash properties;
-    SymbolHash methods;
-    int inheritanceLevel; // 1 for original object
-    ScriptContext *scriptContext;
+	Object *prototype;
+	SymbolHash properties;
+	SymbolHash methods;
+	int inheritanceLevel; // 1 for original object
+	ScriptContext *scriptContext;
 
-    // used only for factories
-    Common::HashMap<uint, Datum> *objArray;
+	// used only for factories
+	Common::HashMap<uint, Datum> *objArray;
 
 	Object *clone();
 	Symbol getMethod(const Common::String &methodName);
diff --git a/engines/director/stxt.cpp b/engines/director/stxt.cpp
index 34f38244e6..1226d95185 100644
--- a/engines/director/stxt.cpp
+++ b/engines/director/stxt.cpp
@@ -75,7 +75,7 @@ Stxt::Stxt(Common::SeekableSubReadStreamEndian &textStream) {
 		_palinfo3 = textStream.readUint16();
 
 		debugC(3, kDebugText, "Stxt init: formattingCount: %u, formatStartOffset: %d, height: %d ascent: %d, fontId: %d, textSlant: %d padding: 0x%02x",
-			   formattingCount, formatStartOffset, height, ascent, _fontId, _textSlant, padding);
+				formattingCount, formatStartOffset, height, ascent, _fontId, _textSlant, padding);
 
 		debugC(3, kDebugText, "        fontSize: %d, p0: %x p1: %x p2: %x", _fontSize, _palinfo1, _palinfo2, _palinfo3);
 
@@ -86,7 +86,7 @@ Stxt::Stxt(Common::SeekableSubReadStreamEndian &textStream) {
 			_ftext += text.firstChar();
 			text.deleteChar(0);
 
-			if (f == '\001')    // Insert two \001s as a replacement
+			if (f == '\001')	// Insert two \001s as a replacement
 				_ftext += '\001';
 
 			prevPos++;