X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fop.cpp;h=8708d9b34418c81a28ca6f279f5a81e65a51d953;hb=26044acf8a4fe70772bd6e69afb8b8d20b5a6af5;hp=682c023edbdbe6d2b8b15c160d453d0cba627700;hpb=4906545f5d77d6d7a006fa0d765dc0ae522e477f;p=virtualjaguar

diff --git a/src/op.cpp b/src/op.cpp
index 682c023..8708d9b 100644
--- a/src/op.cpp
+++ b/src/op.cpp
@@ -20,7 +20,7 @@
 #include "gpu.h"
 #include "jaguar.h"
 #include "log.h"
-#include "m68k.h"
+#include "m68000/m68kinterface.h"
 #include "memory.h"
 #include "tom.h"
 
@@ -36,9 +36,9 @@
 #define OBJECT_TYPE_BRANCH	3					// 011
 #define OBJECT_TYPE_STOP	4					// 100
 
-#define CONDITION_EQUAL				0
-#define CONDITION_LESS_THAN			1
-#define CONDITION_GREATER_THAN		2
+#define CONDITION_EQUAL				0			// VC == YPOS
+#define CONDITION_LESS_THAN			1			// VC < YPOS
+#define CONDITION_GREATER_THAN		2			// VC > YPOS
 #define CONDITION_OP_FLAG_SET		3
 #define CONDITION_SECOND_HALF_LINE	4
 
@@ -180,6 +180,10 @@ void OPDone(void)
 
 	WriteLog("\n");
 #else
+#warning "!!! Fix lockup in OPDiscoverObjects() !!!"
+//temp, to keep the following function from locking up on bad/weird OLs
+return;
+
 	numberOfObjects = 0;
 	OPDiscoverObjects(olp);
 	OPDumpObjectList();