From c4fc0cee96ed4e287385fdb75d6c81f0d4a552dc Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 18 Feb 2014 02:34:17 +0100
Subject: AGOS: Make GPL headers consistent in themselves.

---
 engines/agos/script.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/agos/script.cpp')

diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp
index 1c36454278..c6aa4c9246 100644
--- a/engines/agos/script.cpp
+++ b/engines/agos/script.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- 
cgit v1.2.3


From 41d46f07ef0f93c131644cd4dc3a00752df05c12 Mon Sep 17 00:00:00 2001
From: Kirben
Date: Wed, 5 Mar 2014 09:17:54 +1100
Subject: AGOS: Correct typos in comments.

---
 engines/agos/script.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/agos/script.cpp')

diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp
index c6aa4c9246..6f809d9e2d 100644
--- a/engines/agos/script.cpp
+++ b/engines/agos/script.cpp
@@ -264,7 +264,7 @@ void AGOSEngine::o_add() {
 	uint var = getVarWrapper();
 	writeVariable(var, readVariable(var) + getVarOrWord());
 
-	// WORKAROUND: The converation of the male in Vid-Phone Booth at Dave's Space Bar
+	// WORKAROUND: The conversation of the male in Vid-Phone Booth at Dave's Space Bar
 	// is based on variable 116, but stops due to a missing option (37).
 	if (getGameType() == GType_FF && _currentTable->id == 10538 && readVariable(116) == 37)
 			writeVariable(116, 38);
-- 
cgit v1.2.3


From 6856b09d5a0024397895984aeb8d79d4a77e9111 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Sun, 11 May 2014 12:27:38 +0100
Subject: AGOS: Switch opcode debugging to a debug flag, rather than level 2
 hack.

This is now set by --debugflags=opcode rather than -d 2, though it will
still require a debug level greater than 0.
---
 engines/agos/script.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines/agos/script.cpp')

diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp
index 6f809d9e2d..1dbb9c255a 100644
--- a/engines/agos/script.cpp
+++ b/engines/agos/script.cpp
@@ -22,6 +22,7 @@
 
 // Item script opcodes for Simon1/Simon2
 
+#include "common/debug-channels.h"
 #include "common/endian.h"
 #include "common/system.h"
 #include "common/textconsole.h"
@@ -987,7 +988,7 @@ int AGOSEngine::runScript() {
 		return 1;
 
 	do {
-		if (_dumpOpcodes)
+		if (DebugMan.isDebugChannelEnabled(kDebugOpcode))
 			dumpOpcode(_codePtr);
 
 		if (getGameType() == GType_ELVIRA1) {
-- 
cgit v1.2.3