Fix bug in IWindow::GetFillColor and GetShadeColor.

Add cPlanetRecord::GetCitizenSpeciesKey()

Author: emd4600

Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp

@@ -842,6 +842,7 @@ namespace Simulator
 		DefineAddress(GetTerrainScriptSource, SelectAddress(0xB8D690, 0xB8DEB0));
 		DefineAddress(HasControlledCity, SelectAddress(0xC6F4B0, 0xC702F0));
 		DefineAddress(GetTypeIconKey, SelectAddress(0xE2EBE0, 0xE2EB70));
+		DefineAddress(GetCitizenSpeciesKey, SelectAddress(0xB8D9C0, 0xB8E1E0));
 	}
 
 	namespace Addresses(cCivData) {

Spore ModAPI/SourceCode/Simulator/Planets.cpp

@@ -80,7 +80,7 @@ namespace Simulator
 		return key;
 	}
 
-	ResourceKey cPlanetRecord::GetTerrainScriptSource() const {
+	ResourceKey cPlanetRecord::GetTerrainScriptSource() {
 		ResourceKey key;
 		STATIC_CALL(GetAddress(cPlanetRecord, GetTerrainScriptSource), void, Args(ResourceKey&), Args(key));
 		return key;
@@ -90,6 +90,8 @@ namespace Simulator
 		Args(cPlanetRecord* planetRecord, cEmpire* empire, bool requireMoreThanOneTurret), 
 		Args(planetRecord, empire, requireMoreThanOneTurret));
 
-	auto_METHOD_(cPlanetRecord, const ResourceKey&, GetTypeIconKey);
+	auto_STATIC_METHOD(cPlanetRecord, const ResourceKey&, GetTypeIconKey, Args(cPlanetRecord* record), Args(record));
+
+	auto_METHOD_(cPlanetRecord, const ResourceKey&, GetCitizenSpeciesKey);
 }
 #endif

Spore ModAPI/SourceCode/UTFWin/Window.cpp

@@ -128,7 +128,7 @@ namespace UTFWin
 	auto_METHOD_VIRTUAL_const_(Window, IWindow, uint32_t, GetCursorID);
 	auto_METHOD_VIRTUAL_const_(Window, IWindow, WindowFlags, GetFlags);
 	auto_METHOD_VIRTUAL_const_(Window, IWindow, int, GetState);
-	auto_METHOD_VIRTUAL_const_(Window, IWindow, Math::Color, GetShadeColor);
+	auto_METHOD_VIRTUAL_const_(Window, IWindow, int, GetShadeColor);
 	auto_METHOD_VIRTUAL_const_(Window, IWindow, const Math::Rectangle&, GetArea);
 	auto_METHOD_VIRTUAL_const_(Window, IWindow, const Math::Rectangle&, GetRealArea);
 	auto_METHOD_VIRTUAL_const_(Window, IWindow, const char16_t*, GetCaption);
@@ -157,7 +157,7 @@ namespace UTFWin
 	auto_METHOD_VIRTUAL_(Window, IWindow, int, InvalidateTransform);
 	auto_METHOD_VIRTUAL_(Window, IWindow, int, func39);
 	auto_METHOD_VIRTUAL_(Window, IWindow, int, func40);
-	auto_METHOD_VIRTUAL_const_(Window, IWindow, Color, GetFillColor);
+	auto_METHOD_VIRTUAL_const_(Window, IWindow, int, GetFillColor);
 	auto_METHOD_VIRTUAL_const_(Window, IWindow, IDrawable*, GetDrawable);
 	auto_METHOD_VIRTUAL_VOID(Window, IWindow, SetFillColor, Args(Color color), Args(color));
 	auto_METHOD_VIRTUAL_VOID(Window, IWindow, SetDrawable, Args(IDrawable* drawable), Args(drawable));

Spore ModAPI/Spore/Simulator/cPlanetRecord.h

@@ -190,9 +190,13 @@ namespace Simulator
 
 		ResourceKey GetTerrainScriptSource();
 
+		/// Return the key of the sentient species that inhabits this planet.
+		/// Only for tribe or greater tech level.
+		const ResourceKey& GetCitizenSpeciesKey();
+
 		/// Returns the key to the icon that is displayed in planet tooltip.
 		/// This depends on tech level, and whether it has an adventure.
-		const ResourceKey& GetTypeIconKey();
+		static const ResourceKey& GetTypeIconKey(cPlanetRecord* record);
 
 		/// Generates a `.prop` file ResourceKey that is currently unused in game packages, so that 
 		/// the planet terrain can be saved there.
@@ -311,6 +315,7 @@ namespace Simulator
 		DeclareAddress(GetTerrainScriptSource);  // 0xB8D690 0xB8DEB0
 		DeclareAddress(HasControlledCity);  // 0xC6F4B0 0xC702F0
 		DeclareAddress(GetTypeIconKey);  // 0xE2EBE0 0xE2EB70
+		DeclareAddress(GetCitizenSpeciesKey);  // 0xB8D9C0 0xB8E1E0
 	}
 
 	inline ResourceKey cPlanetRecord::GenerateTerrainKey()

Spore ModAPI/Spore/UTFWin/IWindow.h

@@ -140,7 +140,7 @@ namespace UTFWin
 		/// Returns the color modulation value. This color acts as a tint: after the window is painted, it gets multiplied by this color.
 		/// @returns The integer color representation of the value of the 'shadeColor' property.
 		///
-		/* 30h */	virtual Math::Color GetShadeColor() const = 0;
+		/* 30h */	virtual int GetShadeColor() const = 0;
 
 		///
 		/// Gets the rectangular extent of this window, relative to the window's parent. Note this is the 'area' property, 
@@ -305,7 +305,7 @@ namespace UTFWin
 		/// the area will be filled with the fill color and then the fill drawable will be drawn on top of it.
 		/// @returns The integer color representation of the value of the 'fillColor' property.
 		///
-		/* A4h */	virtual Math::Color GetFillColor() const = 0;
+		/* A4h */	virtual int GetFillColor() const = 0;
 
 		///
 		/// Returns the fill drawable of this window. When rendering the window,

Spore ModAPI/Spore/UTFWin/Window.h

@@ -65,7 +65,7 @@ namespace UTFWin
 		virtual uint32_t GetCursorID() const override;
 		virtual WindowFlags GetFlags() const override;
 		virtual int GetState() const override;
-		virtual Math::Color GetShadeColor() const override;
+		virtual int GetShadeColor() const override;
 		virtual const Math::Rectangle& GetArea() const override;
 		virtual const Math::Rectangle& GetRealArea() const override;
 		virtual const char16_t* GetCaption() const override;
@@ -94,7 +94,7 @@ namespace UTFWin
 		virtual int InvalidateTransform() override;
 		virtual int func39() override;
 		virtual int func40() override;
-		virtual Color GetFillColor() const override;
+		virtual int GetFillColor() const override;
 		virtual IDrawable* GetDrawable() const override;
 		virtual void SetFillColor(Color color) override;
 		virtual void SetDrawable(IDrawable* drawable) override;