From c571279f1bcfa48b939768046ee4315e41638b31 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko <sev@scummvm.org>
Date: Wed, 2 Jun 2021 00:40:57 +0200
Subject: [PATCH] SAGA2: Reduced header dependency for fta.h

---
 engines/saga2/automap.cpp  | 3 ++-
 engines/saga2/beegee.cpp   | 1 +
 engines/saga2/bitarray.h   | 4 ++--
 engines/saga2/button.cpp   | 3 ++-
 engines/saga2/button.h     | 1 +
 engines/saga2/calender.cpp | 1 +
 engines/saga2/contain.cpp  | 2 ++
 engines/saga2/document.cpp | 1 +
 engines/saga2/floating.h   | 1 +
 engines/saga2/fta.h        | 4 ----
 engines/saga2/gamemode.cpp | 1 +
 engines/saga2/gtextbox.cpp | 2 +-
 engines/saga2/intrface.cpp | 5 +++--
 engines/saga2/loadsave.cpp | 1 +
 engines/saga2/magic.cpp    | 1 +
 engines/saga2/msgbox.cpp   | 2 ++
 engines/saga2/oncall.h     | 2 +-
 engines/saga2/playmode.cpp | 1 +
 engines/saga2/property.h   | 3 +--
 engines/saga2/spelcast.cpp | 1 +
 engines/saga2/task.cpp     | 1 +
 engines/saga2/terrain.cpp  | 1 +
 engines/saga2/tileload.cpp | 1 +
 engines/saga2/towerfta.cpp | 1 +
 engines/saga2/transit.cpp  | 2 ++
 engines/saga2/uidialog.cpp | 2 ++
 engines/saga2/vpal.cpp     | 1 +
 27 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/engines/saga2/automap.cpp b/engines/saga2/automap.cpp
index ed6ee61ebdc..85d4b0befa9 100644
--- a/engines/saga2/automap.cpp
+++ b/engines/saga2/automap.cpp
@@ -27,6 +27,7 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL // FIXME: Remove
 
 #include "saga2/std.h"
+#include "saga2/hresmgr.h"
 #include "saga2/automap.h"
 #include "saga2/blitters.h"
 #include "saga2/tile.h"
@@ -35,7 +36,7 @@
 #include "saga2/grequest.h"
 #include "saga2/mapfeatr.h"
 #include "saga2/grabinfo.h"
-#include "saga2/hresmgr.h"
+#include "saga2/rmemfta.h"
 
 namespace Saga2 {
 
diff --git a/engines/saga2/beegee.cpp b/engines/saga2/beegee.cpp
index 9938e088c0c..a6cd94570f9 100644
--- a/engines/saga2/beegee.cpp
+++ b/engines/saga2/beegee.cpp
@@ -27,6 +27,7 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL // FIXME: Remove
 
 #include "saga2/std.h"
+#include "saga2/idtypes.h"
 #include "saga2/fta.h"
 #include "saga2/tile.h"
 #include "saga2/annoy.h"
diff --git a/engines/saga2/bitarray.h b/engines/saga2/bitarray.h
index 1ba3664f4f5..a1bcbc489e0 100644
--- a/engines/saga2/bitarray.h
+++ b/engines/saga2/bitarray.h
@@ -41,7 +41,7 @@ private:
 public:
 
 	BitArray(uint16 newSize = 0) {
-		if (newSize) b = (uint32 *) TALLOC(sizeof(uint32) * (newSize / 32 + 1), memBitArray);
+		if (newSize) b = (uint32 *)malloc(sizeof(uint32) * (newSize / 32 + 1));
 		size = newSize;
 		clear(newSize);
 	}
@@ -53,7 +53,7 @@ public:
 	void resize(uint16 newSize) {
 		uint32  *t = b;
 		if (newSize) {
-			b = (uint32 *) TALLOC(sizeof(uint32) * (newSize / 32 + 1), memBitArray);
+			b = (uint32 *)malloc(sizeof(uint32) * (newSize / 32 + 1));
 			clear(newSize);
 			if (size)  for (int i = 0; i < MIN(size, newSize) / 32 + 1; i++)  b[i] = t[i];
 		}
diff --git a/engines/saga2/button.cpp b/engines/saga2/button.cpp
index e605af935fa..39f2d650267 100644
--- a/engines/saga2/button.cpp
+++ b/engines/saga2/button.cpp
@@ -29,11 +29,12 @@
 #include "saga2/std.h"
 #include "saga2/rmemfta.h"
 #include "saga2/cmisc.h"
+#include "saga2/hresmgr.h"
 #include "saga2/button.h"
 #include "saga2/rmem.h"
 #include "saga2/objects.h"
 #include "saga2/grabinfo.h"
-#include "saga2/hresmgr.h"
+#include "saga2/fontlib.h"
 
 namespace Saga2 {
 
diff --git a/engines/saga2/button.h b/engines/saga2/button.h
index 0cee9bc345e..51d5882911c 100644
--- a/engines/saga2/button.h
+++ b/engines/saga2/button.h
@@ -28,6 +28,7 @@
 #define SAGA2_BUTTON_H
 
 #include "saga2/fta.h"
+#include "saga2/hresmgr.h"
 #include "saga2/panel.h"
 #include "saga2/cmisc.h"
 #include "saga2/sprite.h"
diff --git a/engines/saga2/calender.cpp b/engines/saga2/calender.cpp
index c31a3787d05..ea9d8c7d195 100644
--- a/engines/saga2/calender.cpp
+++ b/engines/saga2/calender.cpp
@@ -27,6 +27,7 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL // FIXME: Remove
 
 #include "saga2/std.h"
+#include "saga2/hresmgr.h"
 #include "saga2/calender.h"
 #include "saga2/intrface.h"
 #include "saga2/config.h"
diff --git a/engines/saga2/contain.cpp b/engines/saga2/contain.cpp
index 7bfaf11ffb1..08343e2d407 100644
--- a/engines/saga2/contain.cpp
+++ b/engines/saga2/contain.cpp
@@ -41,6 +41,8 @@
 #include "saga2/spellbuk.h"
 #include "saga2/imagcach.h"
 #include "saga2/hresmgr.h"
+#include "saga2/fontlib.h"
+#include "saga2/rmemfta.h"
 
 #include "saga2/pclass.r"
 
diff --git a/engines/saga2/document.cpp b/engines/saga2/document.cpp
index 6590312d08a..67626667fb6 100644
--- a/engines/saga2/document.cpp
+++ b/engines/saga2/document.cpp
@@ -39,6 +39,7 @@
 #include "saga2/program.h"
 #include "saga2/version.h"
 #include "saga2/hresmgr.h"
+#include "saga2/fontlib.h"
 
 namespace Saga2 {
 
diff --git a/engines/saga2/floating.h b/engines/saga2/floating.h
index f683d786adf..3e57b651090 100644
--- a/engines/saga2/floating.h
+++ b/engines/saga2/floating.h
@@ -28,6 +28,7 @@
 #define SAGA2_FLOATING_H
 
 #include "saga2/fta.h"
+#include "saga2/hresmgr.h"
 #include "saga2/panel.h"
 
 namespace Saga2 {
diff --git a/engines/saga2/fta.h b/engines/saga2/fta.h
index 6e91ab732c8..2e789b438a5 100644
--- a/engines/saga2/fta.h
+++ b/engines/saga2/fta.h
@@ -27,11 +27,7 @@
 #ifndef SAGA2_FTA_H
 #define SAGA2_FTA_H
 
-#include "saga2/rmemfta.h"
-#include "saga2/vwpage.h"
-#include "saga2/vpal.h"
 #include "saga2/gpointer.h"
-#include "saga2/fontlib.h"
 #include "saga2/rmem.h"
 
 namespace Saga2 {
diff --git a/engines/saga2/gamemode.cpp b/engines/saga2/gamemode.cpp
index 20ac114c4c1..a7dfb254a63 100644
--- a/engines/saga2/gamemode.cpp
+++ b/engines/saga2/gamemode.cpp
@@ -35,6 +35,7 @@
 #include "saga2/floating.h"
 #include "saga2/images.h"
 #include "saga2/setup.h"
+#include "saga2/vpal.h"
 #include "saga2/palette.h"
 #include "saga2/transit.h"
 #include "saga2/mouseimg.h"
diff --git a/engines/saga2/gtextbox.cpp b/engines/saga2/gtextbox.cpp
index 0da11b839ef..0cf7c721993 100644
--- a/engines/saga2/gtextbox.cpp
+++ b/engines/saga2/gtextbox.cpp
@@ -183,7 +183,7 @@ gTextBox::gTextBox(
 	flags                   = flg;
 	currentLen[ index ]     = buffer ? strlen(buffer) : 0;
 	cursorPos               = anchorPos = scrollPixels = 0;
-	undoBuffer              = (char *) TALLOC(sizeof(char) * (maxLen + 1), memInterface);
+	undoBuffer              = (char *)malloc(sizeof(char) * (maxLen + 1));
 	textFont                = font;
 	fontHeight              = height;
 	fontOffset              = fontHeight + 2;
diff --git a/engines/saga2/intrface.cpp b/engines/saga2/intrface.cpp
index 35d18b41e0c..03aa9130e1f 100644
--- a/engines/saga2/intrface.cpp
+++ b/engines/saga2/intrface.cpp
@@ -45,6 +45,7 @@
 #include "saga2/display.h"
 #include "saga2/localize.h"
 #include "saga2/imagcach.h"
+#include "saga2/fontlib.h"
 
 namespace Saga2 {
 
@@ -1596,7 +1597,7 @@ void writePlaqTextPos(gPort         &port,
 void **loadButtonRes(hResContext *con, int16 resID, int16 numRes) {
 	int16   i, k;
 
-	void **images = (void **) TALLOC(sizeof(void *)*numRes, memInterface);
+	void **images = (void **)malloc(sizeof(void *)*numRes);
 
 	for (i = 0, k = resID; i < numRes; i++, k++) {
 		// get an image from the image cache
@@ -1613,7 +1614,7 @@ void **loadButtonRes(hResContext *con, int16 resID, int16 numRes, char a, char b
 	int16   i, k;
 
 
-	void **images = (void **) TALLOC(sizeof(void *)*numRes, memInterface);
+	void **images = (void **)malloc(sizeof(void *)*numRes);
 
 	for (i = 0, k = resID; i < numRes; i++, k++) {
 		images[i] = ImageCache.requestImage(con, MKTAG(a, b, c, k));
diff --git a/engines/saga2/loadsave.cpp b/engines/saga2/loadsave.cpp
index bfffa5e6ec9..0474715b321 100644
--- a/engines/saga2/loadsave.cpp
+++ b/engines/saga2/loadsave.cpp
@@ -46,6 +46,7 @@
 #include "saga2/tilemode.h"
 #include "saga2/magic.h"
 #include "saga2/intrface.h"
+#include "saga2/vpal.h"
 #include "saga2/palette.h"
 #include "saga2/contain.h"
 #include "saga2/ioerrors.h"
diff --git a/engines/saga2/magic.cpp b/engines/saga2/magic.cpp
index 6b1c9305a40..ffc37169674 100644
--- a/engines/saga2/magic.cpp
+++ b/engines/saga2/magic.cpp
@@ -29,6 +29,7 @@
 #include "saga2/std.h"
 #include "saga2/rmemfta.h"
 #include "saga2/magic.h"
+#include "saga2/idtypes.h"
 #include "saga2/speldefs.h"
 #include "saga2/spellbuk.h"
 #include "saga2/spelshow.h"
diff --git a/engines/saga2/msgbox.cpp b/engines/saga2/msgbox.cpp
index f14639b50ea..c75c4354eec 100644
--- a/engines/saga2/msgbox.cpp
+++ b/engines/saga2/msgbox.cpp
@@ -32,6 +32,8 @@
 #include "saga2/msgbox.h"
 #include "saga2/floating.h"
 #include "saga2/gbevel.h"
+#include "saga2/fontlib.h"
+#include "saga2/rmemfta.h"
 
 namespace  Saga2 {
 
diff --git a/engines/saga2/oncall.h b/engines/saga2/oncall.h
index 9e79ada8276..da02ca432ed 100644
--- a/engines/saga2/oncall.h
+++ b/engines/saga2/oncall.h
@@ -85,7 +85,7 @@ public:
 		wanted.resize(newSize);
 		locked.resize(newSize);
 		recent.resize(newSize);
-		handle = (RESTYPE *) TALLOC(sizeof(RESTYPE) * newSize, memPrgResMan);
+		handle = (RESTYPE *)malloc(sizeof(RESTYPE) * newSize);
 		handles = newSize;
 		loader = loadfunction;
 		for (uint16 i = 0; i < newSize; i++)
diff --git a/engines/saga2/playmode.cpp b/engines/saga2/playmode.cpp
index 56c5ffc6456..4151e9a832f 100644
--- a/engines/saga2/playmode.cpp
+++ b/engines/saga2/playmode.cpp
@@ -48,6 +48,7 @@
 #include "saga2/cmisc.h"
 #include "saga2/button.h"
 #include "saga2/hresmgr.h"
+#include "saga2/fontlib.h"
 
 namespace Saga2 {
 
diff --git a/engines/saga2/property.h b/engines/saga2/property.h
index 2d60c22fb9f..213e36444cd 100644
--- a/engines/saga2/property.h
+++ b/engines/saga2/property.h
@@ -26,7 +26,6 @@
 
 #ifndef SAGA2_PROPERTY_H
 #define SAGA2_PROPERTY_H
-
 namespace Saga2 {
 
 /* ===================================================================== *
@@ -115,7 +114,7 @@ CompoundProperty< T >::CompoundProperty(
 	uint16  arrayBytes = sizeof(Property< T > *) * size;
 
 	//  Allocate memory to copy the array.
-	propertyArray = (Property< T > **)TALLOC(arrayBytes, memPropList);
+	propertyArray = (Property< T > **)malloc(arrayBytes);
 #if DEBUG
 	assert(propertyArray);
 #endif
diff --git a/engines/saga2/spelcast.cpp b/engines/saga2/spelcast.cpp
index 08b487438a3..391a1e41517 100644
--- a/engines/saga2/spelcast.cpp
+++ b/engines/saga2/spelcast.cpp
@@ -29,6 +29,7 @@
 #include "saga2/std.h"
 #include "saga2/rmemfta.h"
 #include "saga2/magic.h"
+#include "saga2/idtypes.h"
 #include "saga2/speldefs.h"
 #include "saga2/spellbuk.h"
 #include "saga2/spelshow.h"
diff --git a/engines/saga2/task.cpp b/engines/saga2/task.cpp
index d9e981c7bc2..54d7c5648ab 100644
--- a/engines/saga2/task.cpp
+++ b/engines/saga2/task.cpp
@@ -34,6 +34,7 @@
 #include "saga2/band.h"
 #include "saga2/sensor.h"
 #include "saga2/tilemode.h"
+#include "saga2/rmemfta.h"
 
 namespace Saga2 {
 
diff --git a/engines/saga2/terrain.cpp b/engines/saga2/terrain.cpp
index 35ccf5e4284..e675c459f3a 100644
--- a/engines/saga2/terrain.cpp
+++ b/engines/saga2/terrain.cpp
@@ -28,6 +28,7 @@
 
 #include "saga2/std.h"
 #include "saga2/tcoords.h"
+#include "saga2/idtypes.h"
 #include "saga2/tile.h"
 #include "saga2/terrain.h"
 #include "saga2/objects.h"
diff --git a/engines/saga2/tileload.cpp b/engines/saga2/tileload.cpp
index 739e9ec3dfe..43a68935900 100644
--- a/engines/saga2/tileload.cpp
+++ b/engines/saga2/tileload.cpp
@@ -32,6 +32,7 @@
 #include "saga2/input.h"
 #include "saga2/cmisc.h"
 #include "saga2/tcoords.h"
+#include "saga2/idtypes.h"
 #include "saga2/tile.h"
 #include "saga2/objects.h"
 #include "saga2/tileload.h"
diff --git a/engines/saga2/towerfta.cpp b/engines/saga2/towerfta.cpp
index 090bea18f06..d6774abd736 100644
--- a/engines/saga2/towerfta.cpp
+++ b/engines/saga2/towerfta.cpp
@@ -37,6 +37,7 @@
 #include "saga2/audio.h"
 #include "saga2/annoy.h"
 #include "saga2/script.h"
+#include "saga2/vpal.h"
 #include "saga2/palette.h"
 #include "saga2/intrface.h"
 #include "saga2/mouseimg.h"
diff --git a/engines/saga2/transit.cpp b/engines/saga2/transit.cpp
index 4cd9787a462..556d4a8b567 100644
--- a/engines/saga2/transit.cpp
+++ b/engines/saga2/transit.cpp
@@ -29,8 +29,10 @@
 #include "saga2/std.h"
 #include "saga2/fta.h"
 #include "saga2/floating.h"
+#include "saga2/idtypes.h"
 #include "saga2/tile.h"
 #include "saga2/transit.h"
+#include "saga2/vpal.h"
 #include "saga2/palette.h"
 #include "saga2/calender.h"
 #include "saga2/cmisc.h"
diff --git a/engines/saga2/uidialog.cpp b/engines/saga2/uidialog.cpp
index 7ed51e5da7d..c8875251a75 100644
--- a/engines/saga2/uidialog.cpp
+++ b/engines/saga2/uidialog.cpp
@@ -52,6 +52,7 @@
 #include "saga2/tilemode.h"
 #include "saga2/display.h"
 #include "saga2/uitext.h"
+#include "saga2/vpal.h"
 #include "saga2/palette.h"
 #include "saga2/display.h"
 #include "saga2/program.h"
@@ -59,6 +60,7 @@
 
 #include "saga2/config.h"
 #include "saga2/hresmgr.h"
+#include "saga2/fontlib.h"
 
 namespace Saga2 {
 
diff --git a/engines/saga2/vpal.cpp b/engines/saga2/vpal.cpp
index f2fbca270f2..76294248f56 100644
--- a/engines/saga2/vpal.cpp
+++ b/engines/saga2/vpal.cpp
@@ -28,6 +28,7 @@
 
 #include "saga2/std.h"
 #include "saga2/fta.h"
+#include "saga2/vpal.h"
 #include "saga2/palette.h"
 #include "saga2/transit.h"
 #include "saga2/cmisc.h"