TOOLS: Make lab.{h,cpp} detect if it is a Grim or EMI lab and move them in tools/.

Author: giucam

tools/emi/animb2txt.cpp

@@ -21,7 +21,7 @@
 #include <string>
 #include <iostream>
 #include "filetools.h"
-#include "lab.h"
+#include "tools/lab.h"
 
 using namespace std;
 

tools/emi/meshb2obj.cpp

@@ -19,7 +19,7 @@
 #include <string>
 #include <iostream>
 #include "filetools.h"
-#include "lab.h"
+#include "tools/lab.h"
 
 int main(int argc, char **argv) {
 	if (argc < 2) {

tools/emi/setb2set.cpp

@@ -11,7 +11,7 @@
 #include <fstream>
 #include <vector>
 #include <sstream>
-#include "lab.h"
+#include "tools/lab.h"
 
 using namespace std;
 

tools/emi/sklb2txt.cpp

@@ -2,7 +2,7 @@
 #include <string>
 #include <iostream>
 #include "filetools.h"
-#include "lab.h"
+#include "tools/lab.h"
 // Based on Benjamin Haischs work on sklb-files.
 
 using namespace std;

tools/emi/til2bmp.cpp

@@ -26,7 +26,7 @@
 #include <cstdio>
 #include <cstring>
 #include "common/endian.h"
-#include "lab.h"
+#include "tools/lab.h"
 
 /*
 This tool converts EMI-TILEs into BMP-files, and supports both the format used in the Windows

tools/emi/lab.cpp renamed to tools/lab.cpp

@@ -36,8 +36,6 @@ uint32 READ_LE_UINT32(const void *ptr) {
 }
 
 void Lab::Load(std::string filename) {
-	g_type = GT_EMI; // FIXME, detect game-type properly.
-	
 	infile = fopen(filename.c_str(), "rb");
 	if (infile == 0) {
 		std::cout << "Can not open source file: " << filename << std::endl;
@@ -49,8 +47,17 @@ void Lab::Load(std::string filename) {
 	uint32 num, s_size, s_offset;
 	fread(&num, 1, 4, infile);
 	fread(&s_size, 1, 4, infile);
-	if(g_type == GT_EMI)
-		fread(&s_offset,1,4,infile);
+
+	uint32 typeTest = 0;
+	fread(&typeTest, 1, 4, infile);
+	if (typeTest == 0) { // First entry of the table has offset 0 for Grim
+		g_type = GT_GRIM;
+		fseek(infile, -4, SEEK_CUR);
+	} else { // EMI has an offset instead.
+		s_offset = typeTest;
+		g_type = GT_EMI;
+	}
+
 	head.num_entries = READ_LE_UINT32(&num);
 	head.string_table_size = READ_LE_UINT32(&s_size);
 	if (0 != memcmp(&head.magic, "LABN", 4)) {

tools/emi/lab.h renamed to tools/lab.h

@@ -72,27 +72,27 @@ TOOL_OBJS := emi/cosb2cos.o
 include $(srcdir)/rules.mk
 
 TOOL := meshb2obj
-TOOL_OBJS := emi/meshb2obj.o emi/lab.o
+TOOL_OBJS := emi/meshb2obj.o lab.o
 include $(srcdir)/rules.mk
 
 TOOL := animb2txt
-TOOL_OBJS := emi/animb2txt.o emi/lab.o
+TOOL_OBJS := emi/animb2txt.o lab.o
 include $(srcdir)/rules.mk
 
 TOOL := setb2set
-TOOL_OBJS := emi/setb2set.o emi/lab.o
+TOOL_OBJS := emi/setb2set.o lab.o
 include $(srcdir)/rules.mk
 
 TOOL := sklb2txt
-TOOL_OBJS := emi/sklb2txt.o emi/lab.o
+TOOL_OBJS := emi/sklb2txt.o lab.o
 include $(srcdir)/rules.mk
 
 TOOL := set2fig
 TOOL_OBJS := set2fig.o
 include $(srcdir)/rules.mk
 
 TOOL := til2bmp
-TOOL_OBJS := emi/til2bmp.o emi/lab.o
+TOOL_OBJS := emi/til2bmp.o lab.o
 TOOL_LDFLAGS := -lz
 include $(srcdir)/rules.mk