Fill in some Player properties.

Author: goto-bus-stop

TechTree/BitmapInfo.h

@@ -11,7 +11,7 @@
 // Represents an unknown class type with a length of 1064 bytes. It is related to the DirectDrawArea class and widely used.
 
 struct BITMAPINFO256 {
-  BITMAPINFOHEADER bmiHeader;
-  RGBQUAD bmiColors[256];
+	BITMAPINFOHEADER bmiHeader;
+	RGBQUAD bmiColors[256];
 };
 #pragma pack(pop)

TechTree/ColorTable.h

@@ -13,23 +13,24 @@ class ColorTable : public GameType
 {
 protected: // Member variables
 	DWORD _VTable;
-	int resource_id_;
-	int type_;
-	char* table_;
-	int color_transform_base_;
-	int unit_outline_color_;
-	int selection_color_1_;
-	int selection_color_2_;
-	int minimap_color_1_;
-	int minimap_color_2_;
-	int minimap_color_3_;
-	int text_color1_;
-	int text_color2_;
-	char text_color_r_;
-	char text_color_g_;
-	char text_color_b_;
-	char reserved_;
 
 public:
+	int ResourceId;
+	int Type;
+	char* Table;
+	int ColorTransformBase;
+	int UnitOutlineColor;
+	int SelectionColor1;
+	int SelectionColor2;
+	int MinimapColor1;
+	int MinimapColor2;
+	int MinimapColor3;
+	int TextColor1;
+	int TextColor2;
+	char TextColorR;
+	char TextColorG;
+	char TextColorB;
+private:
+	char reserved_;
 };
 #pragma pack(pop)

TechTree/GameDataHandler.h

@@ -38,9 +38,9 @@ class GameDataHandler : public GameType
 	short _graphicCount;
 	char _gap_42[2];
 	int _graphics;
-	short _unknown_ProbablyPlayerCount;
+	short _playerCount;
 	char _gap_4A[2];
-	int *_dword4C;
+	Player **_players;
 	short _civCount;
 	char _gap_52[2];
 	CivData **_civs;

TechTree/Player.h

@@ -0,0 +1,36 @@
+#pragma once
+
+/* INCLUDES */
+
+// Base class header
+#include "GameType.h"
+#include "VTableType.h"
+
+#include "ColorTable.h"
+
+/* DEFINITIONS */
+
+class PlayerVTable;
+
+class Player : public GameType
+{
+public:
+	PlayerVTable *_VTable;
+
+private:
+	char _padding[345];
+	char _civId;
+	char _padding2[2];
+	ColorTable *_colorTable;
+	char _padding3[6102];
+	char _diplomaticStances[9];
+
+public:
+	int GetCivId() const { return _civId; }
+	ColorTable *GetColorTable() const { return _colorTable; }
+	char GetDiplomaticStance(int other) const { return _diplomaticStances[other]; }
+};
+
+class PlayerVTable : public VTableType
+{
+};

TechTree/TechTree.cpp

@@ -79,10 +79,10 @@ extern "C" __declspec(dllexport) void Init()
 
 // aoc-mmmod initialization.
 extern "C" __declspec(dllexport) void mmm_setup(mmm_mod_info* info) {
-  info->name = "Moddable Tech Tree";
-  info->version = TECH_TREE_VERSION;
+	info->name = "Moddable Tech Tree";
+	info->version = TECH_TREE_VERSION;
 }
 
 extern "C" __declspec(dllexport) void mmm_before_setup(mmm_mod_info* info) {
-  Init();
+	Init();
 }

TechTree/TechTreeData.cpp

@@ -11,10 +11,10 @@
 /* STATIC WRAPPER FUNCTIONS */
 
 static void THISCALL(TechTreeData_Constructor, TechTreeData *self, int datFileHandle) {
-  return self->Constructor(datFileHandle);
+	return self->Constructor(datFileHandle);
 }
 static void THISCALL(TechTreeData_Destructor, TechTreeData *self) {
-  return self->Destructor();
+	return self->Destructor();
 }
 
 /* FUNCTIONS */
@@ -39,7 +39,7 @@ void TechTreeData::__Install()
 		0xE8, 0x00, 0x00, 0x00, 0x00  // call TechTreeData::Constructor (address will be inserted in the next step)
 	};
 	CopyBytesToAddr(0x004268DD, patch1, sizeof(patch1));
-   CreateCodecave(0x004268ED, reinterpret_cast<void(*)()>(TechTreeData_Constructor));
+	 CreateCodecave(0x004268ED, reinterpret_cast<void(*)()>(TechTreeData_Constructor));
 
 	// Install destructor (overwrite VTable address assignment as that isn't neccessary)
 	BYTE patch2[] =
@@ -48,7 +48,7 @@ void TechTreeData::__Install()
 		0xE8, 0x00, 0x00, 0x00, 0x00  // call TechTreeData::Destructor (address will be inserted in the next step)
 	};
 	CopyBytesToAddr(0x00425F9F, patch2, sizeof(patch2));
-   CreateCodecave(0x00425FA0, reinterpret_cast<void(*)()>(TechTreeData_Destructor));
+	 CreateCodecave(0x00425FA0, reinterpret_cast<void(*)()>(TechTreeData_Destructor));
 }
 
 TechTreeData::TechTreeData(int datFileHandle)
@@ -107,11 +107,11 @@ void TechTreeData::Destructor()
 	_staticNewTechTreeDataObject = nullptr;
 }
 
-void TechTreeData::UpdateRenderStates(char selectedCivId, int unknownGameAndPlayerData)
+void TechTreeData::UpdateRenderStates(char selectedCivId, Player *player)
 {
 	// Update render state for all elements recursively
 	for(auto &r : _rootElements)
-		r->UpdateRenderState(selectedCivId, unknownGameAndPlayerData);
+		r->UpdateRenderState(selectedCivId, player);
 }
 
 const std::vector<TechTreeElement *> &TechTreeData::GetRootElements()

TechTree/TechTreeData.h

@@ -8,6 +8,7 @@
 // Other includes
 #include "TechTreeElement.h"
 #include "TechTreeDesign.h"
+#include "Player.h"
 #include <vector>
 
 /* DEFINITIONS */
@@ -42,8 +43,8 @@ class TechTreeData : GameType
 	// Updates the render states for the selected civ.
 	// Parameters:
 	// -> selectedCivId: The ID of the selected civ.
-	// -> unknownGameAndPlayerData: Data given ingame to highlight currently available units and researches.
-	void UpdateRenderStates(char selectedCivId, int unknownGameAndPlayerData);
+	// -> player: Data given ingame to highlight currently available units and researches.
+	void UpdateRenderStates(char selectedCivId, Player *player);
 
 	// Returns the root elements of the tech tree.
 	const std::vector<TechTreeElement *> &GetRootElements();
@@ -53,4 +54,4 @@ class TechTreeData : GameType
 };
 
 // The data of the new tech tree. This variable is initialized when the game data is loaded, else its value is nullptr.
-extern TechTreeData *_staticNewTechTreeDataObject;
+extern TechTreeData *_staticNewTechTreeDataObject;

TechTree/TechTreeElement.cpp

@@ -72,7 +72,7 @@ TechTreeElement::~TechTreeElement()
 		delete req;
 }
 
-void TechTreeElement::UpdateRenderState(char selectedCivId, int unknownGameAndPlayerData, bool forceNotResearched)
+void TechTreeElement::UpdateRenderState(char selectedCivId, Player *player, bool forceNotResearched)
 {
 	// Is the civ disabling this element?
 	_renderState = ItemRenderState::Visible;
@@ -84,25 +84,25 @@ void TechTreeElement::UpdateRenderState(char selectedCivId, int unknownGameAndPl
 		else
 			_renderState = ItemRenderState::Disabled;
 	}
-	else if(unknownGameAndPlayerData != 0 && selectedCivId == reinterpret_cast<char *>(unknownGameAndPlayerData)[349]) // Player-Civ? => Mark researched/not researched elements
+	else if(player != nullptr && selectedCivId == player->GetCivId()) // Player-Civ? => Mark researched/not researched elements
 	{
 		// Helper function to check whether research is done (parameters: some data object, research ID)
 		short(__thiscall *CheckResearchIsDone)(int, short) = reinterpret_cast<short(__thiscall *)(int, short)>(0x0040231B);
 
 		// Check if element is researched
-		if(forceNotResearched || (_age != 0 && CheckResearchIsDone(reinterpret_cast<int *>(unknownGameAndPlayerData)[1192], 100 + _age) != 3))
+		if(forceNotResearched || (_age != 0 && CheckResearchIsDone(reinterpret_cast<int *>(player)[1192], 100 + _age) != 3))
 			_renderState = ItemRenderState::NotResearched;
 		else if(_elementType == ItemType::Building)
 		{
 			// Check if building is researched
-			char *buildingData = reinterpret_cast<char ***>(unknownGameAndPlayerData)[29][_elementObjectID];
+			char *buildingData = reinterpret_cast<char ***>(player)[29][_elementObjectID];
 			if(buildingData == nullptr || buildingData[90] != 1)
 			{
 				// Check whether there is one required research that is completed
 				// One is enough - this way we don't have to hardcode anything, although there may be inaccuracies
 				bool researched = _requiredElements.empty();
 				for(TechTreeElement::RequiredElement *req : _requiredElements)
-					if(req->_elementType == TechTreeElement::ItemType::Research && CheckResearchIsDone(reinterpret_cast<int *>(unknownGameAndPlayerData)[1192], req->_elementObjectID) == 3)
+					if(req->_elementType == TechTreeElement::ItemType::Research && CheckResearchIsDone(reinterpret_cast<int *>(player)[1192], req->_elementObjectID) == 3)
 					{
 						// Found
 						researched = true;
@@ -115,13 +115,13 @@ void TechTreeElement::UpdateRenderState(char selectedCivId, int unknownGameAndPl
 		else if(_elementType == ItemType::Creatable)
 		{
 			// Check if unit is researched
-			char *unitData = reinterpret_cast<char ***>(unknownGameAndPlayerData)[29][_elementObjectID];
+			char *unitData = reinterpret_cast<char ***>(player)[29][_elementObjectID];
 			if(unitData == nullptr || unitData[90] != 1)
 			{
 				// Check whether there is one required research that is completed
 				bool researched = _requiredElements.empty();
 				for(TechTreeElement::RequiredElement *req : _requiredElements)
-					if(req->_elementType == TechTreeElement::ItemType::Research && CheckResearchIsDone(reinterpret_cast<int *>(unknownGameAndPlayerData)[1192], req->_elementObjectID) == 3)
+					if(req->_elementType == TechTreeElement::ItemType::Research && CheckResearchIsDone(reinterpret_cast<int *>(player)[1192], req->_elementObjectID) == 3)
 					{
 						// Found
 						researched = true;
@@ -134,7 +134,7 @@ void TechTreeElement::UpdateRenderState(char selectedCivId, int unknownGameAndPl
 		else if(_elementType == ItemType::Research)
 		{
 			// Check if research is completed
-			if(CheckResearchIsDone(reinterpret_cast<int *>(unknownGameAndPlayerData)[1192], _elementObjectID) != 3)
+			if(CheckResearchIsDone(reinterpret_cast<int *>(player)[1192], _elementObjectID) != 3)
 				_renderState = ItemRenderState::NotResearched;
 		}
 	}
@@ -208,7 +208,7 @@ void TechTreeElement::UpdateRenderState(char selectedCivId, int unknownGameAndPl
 
 	// Update render state for all children recursively
 	for(auto &c : _children)
-		c->UpdateRenderState(selectedCivId, unknownGameAndPlayerData, _renderState == ItemRenderState::NotResearched);
+		c->UpdateRenderState(selectedCivId, player, _renderState == ItemRenderState::NotResearched);
 }
 
 TechTreeElement::RequiredElement::RequiredElement(int datFileHandle)

TechTree/TechTreeElement.h

@@ -5,6 +5,7 @@
 // Other includes
 #include <vector>
 #include "DrawUtilities.h"
+#include "Player.h"
 
 /* DEFINITIONS */
 
@@ -131,7 +132,7 @@ class TechTreeElement
 	// Updates the render state for the selected civ.
 	// Parameters:
 	// -> selectedCivId: The ID of the selected civ.
-	// -> unknownGameAndPlayerData: Data given ingame to highlight currently available units and researches.
+	// -> player: Data given ingame to highlight currently available units and researches.
 	// -> forceNotResearched: Optional. When set, all child elements are marked as not researched recursively.
-	void UpdateRenderState(char selectedCivId, int unknownGameAndPlayerData, bool forceNotResearched = false);
-};
+	void UpdateRenderState(char selectedCivId, Player *player, bool forceNotResearched = false);
+};

TechTree/TechTreeRenderer.cpp

@@ -8,11 +8,11 @@
 
 /* FUNCTIONS */
 
-TechTreeRenderer::TechTreeRenderer(GameDataHandler *gameData, int unknownGameAndPlayerData)
+TechTreeRenderer::TechTreeRenderer(GameDataHandler *gameData, Player *player)
 {
 	// Remember parameters
 	_gameData = gameData;
-	_unknownGameAndPlayerData = unknownGameAndPlayerData;
+	_player = player;
 
 	// Initialize selected civ member
 	_selectedCivId = 0;
@@ -44,11 +44,11 @@ void TechTreeRenderer::SetCurrentCiv(int civId)
 	_selectedCivId = civId;
 
 	// Update render states
-	_staticNewTechTreeDataObject->UpdateRenderStates(civId, _unknownGameAndPlayerData);
+	_staticNewTechTreeDataObject->UpdateRenderStates(civId, _player);
 }
 
 int TechTreeRenderer::GetAgeCount()
 {
 	// Return age count
 	return _ageCount;
-}
+}