Big endian fixes

TheForceEngine/TFE_Archive/gobArchive.cpp

@@ -1,6 +1,7 @@
 #include <cstring>
 
 #include <TFE_System/system.h>
+#include <TFE_System/endian.h>
 #include "gobArchive.h"
 #include <assert.h>
 #include <algorithm>
@@ -53,8 +54,10 @@ bool GobArchive::validate(const char *archivePath, s32 minFileCount)
 		file.close();
 		return false;
 	}
+	header.MASTERX = TFE_Endian::le32_to_cpu(header.MASTERX);
 	file.seek(header.MASTERX);
 	file.readBuffer(&MASTERN, sizeof(long));
+	MASTERN = TFE_Endian::le32_to_cpu(MASTERN);
 	file.close();
 
 	return MASTERN >= minFileCount;
@@ -68,11 +71,18 @@ bool GobArchive::open(const char *archivePath)
 
 	// Read the directory.
 	m_file.readBuffer(&m_header, sizeof(GOB_Header_t));
+	m_header.MASTERX = TFE_Endian::le32_to_cpu(m_header.MASTERX);
 	m_file.seek(m_header.MASTERX);
 
 	m_file.readBuffer(&m_fileList.MASTERN, sizeof(u32));
+	m_fileList.MASTERN = TFE_Endian::le32_to_cpu(m_fileList.MASTERN);
 	m_fileList.entries = new GOB_Entry_t[m_fileList.MASTERN];
 	m_file.readBuffer(m_fileList.entries, sizeof(GOB_Entry_t), m_fileList.MASTERN);
+	for (s32 i = 0; i < m_fileList.MASTERN; i++)
+	{
+		m_fileList.entries[i].IX = TFE_Endian::le32_to_cpu(m_fileList.entries[i].IX);
+		m_fileList.entries[i].LEN = TFE_Endian::le32_to_cpu(m_fileList.entries[i].LEN);
+	}
 
 	strcpy(m_archivePath, archivePath);
 	m_file.close();

TheForceEngine/TFE_Archive/labArchive.cpp

@@ -1,6 +1,7 @@
 #include <cstring>
 
 #include <TFE_System/system.h>
+#include <TFE_System/endian.h>
 #include "labArchive.h"
 #include <assert.h>
 #include <algorithm>
@@ -25,11 +26,20 @@ bool LabArchive::open(const char *archivePath)
 
 	// Read the directory.
 	m_file.readBuffer(&m_header, sizeof(LAB_Header_t));
+	m_header.version = TFE_Endian::le32_to_cpu(m_header.version);
+	m_header.fileCount = TFE_Endian::le32_to_cpu(m_header.fileCount);
+	m_header.stringTableSize = TFE_Endian::le32_to_cpu(m_header.stringTableSize);
 	m_stringTable = new char[m_header.stringTableSize + 1];
 	m_entries = new LAB_Entry_t[m_header.fileCount];
 
 	// Read the file entries.
 	m_file.readBuffer(m_entries, sizeof(LAB_Entry_t), m_header.fileCount);
+	for (u32 i = 0; i < m_header.fileCount; i++)
+	{
+		m_entries[i].nameOffset = TFE_Endian::le32_to_cpu(m_entries[i].nameOffset);
+		m_entries[i].dataOffset = TFE_Endian::le32_to_cpu(m_entries[i].dataOffset);
+		m_entries[i].len = TFE_Endian::le32_to_cpu(m_entries[i].len);
+	}
 
 	// Read string table.
 	m_file.readBuffer(m_stringTable, m_header.stringTableSize);

TheForceEngine/TFE_Archive/lfdArchive.cpp

@@ -1,6 +1,7 @@
 #include <cstring>
 
 #include <TFE_System/system.h>
+#include <TFE_System/endian.h>
 #include "lfdArchive.h"
 #include <assert.h>
 #include <algorithm>
@@ -39,13 +40,15 @@ bool LfdArchive::open(const char *archivePath)
 	// Read the directory.
 	LFD_Entry_t root, entry;
 	m_file.readBuffer(&root, sizeof(LFD_Entry_t));
+	root.LENGTH = TFE_Endian::le32_to_cpu(root.LENGTH);
 	m_fileList.MASTERN = root.LENGTH / sizeof(LFD_Entry_t);
 	m_fileList.entries = new LFD_EntryFinal_t[m_fileList.MASTERN];
 
 	s32 IX = sizeof(LFD_Entry_t) + root.LENGTH;
 	for (s32 i = 0; i < m_fileList.MASTERN; i++)
 	{
 		m_file.readBuffer(&entry, sizeof(LFD_Entry_t));
+		entry.LENGTH = TFE_Endian::le32_to_cpu(entry.LENGTH);
 
 		char name[9] = { 0 };
 		char ext[5]  = { 0 };

TheForceEngine/TFE_Asset/modelAsset_jedi.cpp

@@ -402,14 +402,14 @@ namespace TFE_Model_Jedi
 		const char* buffer = parser.readLine(bufferPos, true);
 		if (!buffer) { return false; }
 
-		f32 version;
-		if (sscanf(buffer, "3DO %f", &version) != 1)
+		s32 versionMajor, versionMinor;
+		if (sscanf(buffer, "3DO %d.%d", &versionMajor, &versionMinor) != 2)
 		{
 			TFE_System::logWrite(LOG_ERROR, "Object3D_Load", "'%s' has no valid name.", name);
 			assert(0);
 			return false;
 		}
-		if (version < 1.2f)
+		if (versionMajor < 1 || (versionMajor == 1 && versionMinor < 2))
 		{
 			TFE_System::logWrite(LOG_ERROR, "Object3D_Load", "'%s' has inavlid version", name);
 			assert(0);

TheForceEngine/TFE_Asset/spriteAsset_Jedi.cpp

@@ -2,6 +2,7 @@
 
 #include "spriteAsset_Jedi.h"
 #include <TFE_System/system.h>
+#include <TFE_System/endian.h>
 #include <TFE_FileSystem/filestream.h>
 #include <TFE_FileSystem/paths.h>
 #include <TFE_Asset/assetSystem.h>
@@ -62,8 +63,20 @@ namespace TFE_Sprite_Jedi
 		const u8* data = s_buffer.data();
 
 		// Determine ahead of time how much we need to allocate.
-		const WaxFrame* base_frame = (WaxFrame*)data;
-		const WaxCell* base_cell = WAX_CellPtr(data, base_frame);
+		WaxFrame* base_frame = (WaxFrame*)data;
+		base_frame->offsetX = TFE_Endian::le32_to_cpu(base_frame->offsetX);
+		base_frame->offsetY = TFE_Endian::le32_to_cpu(base_frame->offsetY);
+		base_frame->flip = TFE_Endian::le32_to_cpu(base_frame->flip);
+		base_frame->cellOffset = TFE_Endian::le32_to_cpu(base_frame->cellOffset);
+		base_frame->widthWS = TFE_Endian::le32_to_cpu(base_frame->widthWS);
+		base_frame->heightWS = TFE_Endian::le32_to_cpu(base_frame->heightWS);
+
+		WaxCell* base_cell = WAX_CellPtr(data, base_frame);
+		base_cell->sizeX = TFE_Endian::le32_to_cpu(base_cell->sizeX);
+		base_cell->sizeY = TFE_Endian::le32_to_cpu(base_cell->sizeY);
+		base_cell->compressed = TFE_Endian::le32_to_cpu(base_cell->compressed);
+		base_cell->dataSize = TFE_Endian::le32_to_cpu(base_cell->dataSize);
+		base_cell->columnOffset = TFE_Endian::le32_to_cpu(base_cell->columnOffset);
 		const u32 columnSize = base_cell->sizeX * sizeof(u32);
 
 		// This is a "load in place" format in the original code.
@@ -90,6 +103,11 @@ namespace TFE_Sprite_Jedi
 		{
 			// Update the column offset, it starts right after the cell data.
 			cell->columnOffset = frame->cellOffset + sizeof(WaxCell);
+			u32* columns = (u32*)((u8*)asset + cell->columnOffset);
+			for (s32 c = 0; c < cell->sizeX; c++)
+			{
+				columns[c] = TFE_Endian::le32_to_cpu(columns[c]);
+			}
 		}
 		else
 		{
@@ -211,7 +229,18 @@ namespace TFE_Sprite_Jedi
 		file.close();
 
 		const u8* data = s_buffer.data();
-		const Wax* srcWax = (Wax*)data;
+		Wax* srcWax = (Wax*)data;
+		srcWax->version = TFE_Endian::le32_to_cpu(srcWax->version);
+		srcWax->animCount = TFE_Endian::le32_to_cpu(srcWax->animCount);
+		srcWax->frameCount = TFE_Endian::le32_to_cpu(srcWax->frameCount);
+		srcWax->cellCount = TFE_Endian::le32_to_cpu(srcWax->cellCount);
+		srcWax->xScale = TFE_Endian::le32_to_cpu(srcWax->xScale);
+		srcWax->yScale = TFE_Endian::le32_to_cpu(srcWax->yScale);
+		srcWax->xtraLight = TFE_Endian::le32_to_cpu(srcWax->xtraLight);
+		for (s32 animIdx = 0; animIdx < WAX_MAX_ANIM; animIdx++)
+		{
+			srcWax->animOffsets[animIdx] = TFE_Endian::le32_to_cpu(srcWax->animOffsets[animIdx]);
+		}
 
 		// every animation is filled out until the end, so no animations = no wax.
 		if (!srcWax->animOffsets[0])
@@ -221,20 +250,71 @@ namespace TFE_Sprite_Jedi
 		s_cellOffsets.clear();
 
 		// First determine the size to allocate (note that this will overallocate a bit because cells are shared).
+		std::vector<u32> swappedAnims;
+		std::vector<u32> swappedViews;
+		std::vector<u32> swappedFrames;
+		std::vector<u32> swappedCells;
 		u32 sizeToAlloc = sizeof(JediWax) + (u32)s_buffer.size();
 		const s32* animOffset = srcWax->animOffsets;
 		for (s32 animIdx = 0; animIdx < 32 && animOffset[animIdx]; animIdx++)
 		{
 			WaxAnim* anim = (WaxAnim*)(data + animOffset[animIdx]);
+			if (animOffset[animIdx] && std::find(swappedAnims.begin(), swappedAnims.end(), animOffset[animIdx]) == swappedAnims.end())
+			{
+				swappedAnims.push_back(animOffset[animIdx]);
+				anim->worldWidth = TFE_Endian::le32_to_cpu(anim->worldWidth);
+				anim->worldHeight = TFE_Endian::le32_to_cpu(anim->worldHeight);
+				anim->frameRate = TFE_Endian::le32_to_cpu(anim->frameRate);
+				anim->frameCount = TFE_Endian::le32_to_cpu(anim->frameCount);
+				for (s32 v = 0; v < WAX_MAX_VIEWS; v++)
+				{
+					anim->viewOffsets[v] = TFE_Endian::le32_to_cpu(anim->viewOffsets[v]);
+				}
+			}
 			const s32* viewOffsets = anim->viewOffsets;
 			for (s32 v = 0; v < 32; v++)
 			{
-				const WaxView* view = (WaxView*)(data + viewOffsets[v]);
+				WaxView* view = (WaxView*)(data + viewOffsets[v]);
+				if (viewOffsets[v] && std::find(swappedViews.begin(), swappedViews.end(), viewOffsets[v]) == swappedViews.end())
+				{
+					swappedViews.push_back(viewOffsets[v]);
+					for (s32 f = 0; f < WAX_MAX_FRAMES; f++)
+					{
+						view->frameOffsets[f] = TFE_Endian::le32_to_cpu(view->frameOffsets[f]);
+					}
+				}
 				const s32* frameOffset = view->frameOffsets;
 				for (s32 f = 0; f < 32 && frameOffset[f]; f++)
 				{
-					const WaxFrame* frame = (WaxFrame*)(data + frameOffset[f]);
-					const WaxCell* cell = frame->cellOffset ? (WaxCell*)(data + frame->cellOffset) : nullptr;
+					WaxFrame* frame = (WaxFrame*)(data + frameOffset[f]);
+					if (frameOffset[f] && std::find(swappedFrames.begin(), swappedFrames.end(), frameOffset[f]) == swappedFrames.end())
+					{
+						swappedFrames.push_back(frameOffset[f]);
+						frame->offsetX = TFE_Endian::le32_to_cpu(frame->offsetX);
+						frame->offsetY = TFE_Endian::le32_to_cpu(frame->offsetY);
+						frame->flip = TFE_Endian::le32_to_cpu(frame->flip);
+						frame->cellOffset = TFE_Endian::le32_to_cpu(frame->cellOffset);
+						frame->widthWS = TFE_Endian::le32_to_cpu(frame->widthWS);
+						frame->heightWS = TFE_Endian::le32_to_cpu(frame->heightWS);
+					}
+					WaxCell* cell = frame->cellOffset ? (WaxCell*)(data + frame->cellOffset) : nullptr;
+					if (frame->cellOffset && std::find(swappedCells.begin(), swappedCells.end(), frame->cellOffset) == swappedCells.end())
+					{
+						swappedCells.push_back(frame->cellOffset);
+						cell->sizeX = TFE_Endian::le32_to_cpu(cell->sizeX);
+						cell->sizeY = TFE_Endian::le32_to_cpu(cell->sizeY);
+						cell->compressed = TFE_Endian::le32_to_cpu(cell->compressed);
+						cell->dataSize = TFE_Endian::le32_to_cpu(cell->dataSize);
+						cell->columnOffset = TFE_Endian::le32_to_cpu(cell->columnOffset);
+						if (cell->compressed == 1)
+						{
+							u32* columns = (u32*)(data + frame->cellOffset + sizeof(WaxCell));
+							for (s32 c = 0; c < cell->sizeX; c++)
+							{
+								columns[c] = TFE_Endian::le32_to_cpu(columns[c]);
+							}
+						}
+					}
 					if (cell && cell->compressed == 0 && isUniqueCell(frame->cellOffset))
 					{
 						sizeToAlloc += cell->sizeX * sizeof(u32);

TheForceEngine/TFE_DarkForces/GameUI/delt.cpp

@@ -2,6 +2,7 @@
 #include <cstring>
 
 #include "delt.h"
+#include <TFE_System/endian.h>
 #include <TFE_Game/igame.h>
 #include <TFE_FileSystem/paths.h>
 #include <TFE_FileSystem/filestream.h>
@@ -93,7 +94,9 @@ namespace TFE_DarkForces
 		file.readBuffer(buffer, (u32)size);
 		file.close();
 
-		const s16 frameCount = *((s16*)buffer);
+		s16 frameCount = *((s16*)buffer);
+		frameCount = TFE_Endian::le16_to_cpu(frameCount);
+
 		const u8* frames = buffer + 2;
 
 		*outFrames = (DeltFrame*)game_alloc(sizeof(DeltFrame) * frameCount);
@@ -102,6 +105,7 @@ namespace TFE_DarkForces
 		for (s32 i = 0; i < frameCount; i++)
 		{
 			u32 size = *((u32*)frames);
+			size = TFE_Endian::le32_to_cpu(size);
 			frames += 4;
 
 			loadDeltIntoFrame(&outFramePtr[i], frames, size);
@@ -226,6 +230,10 @@ namespace TFE_DarkForces
 	void loadDeltIntoFrame(DeltFrame* frame, const u8* buffer, u32 size)
 	{
 		DeltHeader header = *((DeltHeader*)buffer);
+		header.offsetX = TFE_Endian::le16_to_cpu(header.offsetX);
+		header.offsetY = TFE_Endian::le16_to_cpu(header.offsetY);
+		header.sizeX = TFE_Endian::le16_to_cpu(header.sizeX);
+		header.sizeY = TFE_Endian::le16_to_cpu(header.sizeY);
 		header.sizeX++;
 		header.sizeY++;
 
@@ -255,10 +263,10 @@ namespace TFE_DarkForces
 
 			data += sizeof(DeltLine);
 
-			const s32 startX = line->xStart;
-			const s32 startY = line->yStart;
-			const bool rle = (line->sizeAndType & 1) ? true : false;
-			s32 pixelCount = (line->sizeAndType >> 1) & 0x3FFF;
+			const s32 startX = TFE_Endian::le16_to_cpu(line->xStart);
+			const s32 startY = TFE_Endian::le16_to_cpu(line->yStart);
+			const bool rle = (TFE_Endian::le16_to_cpu(line->sizeAndType) & 1) ? true : false;
+			s32 pixelCount = (TFE_Endian::le16_to_cpu(line->sizeAndType) >> 1) & 0x3FFF;
 
 			u8* image = frame->texture.image + startX + startY * header.sizeX;
 			while (pixelCount > 0)