Valla another fixes and features PR

Projects/Example Projects/ModCreatorKit/AnimEditorMode.cpp

@@ -64,6 +64,10 @@ bool AnimEditorMode::Initialize(App::IGameModeManager* pManager)
 				GameModeManager.SetActiveMode(MODE_ID);
 			}
 			else {
+				if (auto args = line.GetOption("help", 1))
+				{
+					App::ConsolePrintF("Params: -add, -remove, -play [hash], -default, -help, -exit");
+				}
 				if (auto args = line.GetOption("remove", 1)) 
 				{
 					int index = mpFormatParser->ParseInt(args[0]);
@@ -75,7 +79,7 @@ bool AnimEditorMode::Initialize(App::IGameModeManager* pManager)
 					request.shopperID = id("CreatureShopper");
 					Sporepedia::ShopperRequest::Show(request);
 				}
-				else if (line.HasFlag("exit"))
+				else if (line.HasFlag("exit") || line.HasFlag("quit"))
 				{
 					GameModeManager.SetActiveMode(kGGEMode);
 				}

Projects/Example Projects/ModCreatorKit/Cheats.cpp

@@ -23,10 +23,12 @@
 #include "AddressCheat.h"
 #include "AnimLogCheat.h"
 #include "EffectLogCheat.h"
+#include "SFXLogCheat.h"
 #include "PackageCheat.h"
 #include "PrintCursorCheat.h"
 #include "UILogCheat.h"
 #include "UIInspectCheat.h"
+#include "PlaySoundCheat.h"
 
 #include <Spore\App\ICheatManager.h>
 #include <Spore\Editors\BakeManager.h>
@@ -49,11 +51,13 @@ void AddCheats()
 {
 	CheatManager.AddCheat("devContext", new ContextCheat());
 	CheatManager.AddCheat("devAnimLog", new AnimLogCheat());
+	CheatManager.AddCheat("devSFXLog", new SFXLogCheat());
 	CheatManager.AddCheat("devEffectLog", new EffectLogCheat());
 	CheatManager.AddCheat("devPackage", new PackageCheat());
 	CheatManager.AddCheat("devLogUI", new UILogCheat());
 	CheatManager.AddCheat("devInspectUI", new UIInspectCheat());
 	CheatManager.AddCheat("devPrintCursor", new PrintCursorCheat());
+	CheatManager.AddCheat("devPlaySound", new PlaySoundCheat());
 
 	AddressCheat::AddCheat(Address(ModAPI::ChooseAddress(0x1498444, 0x1493E5C)), "devRaid");
 	AddressCheat::AddCheat(Address(ModAPI::ChooseAddress(0x149845C, 0x1493E74)), "devSpace");

Projects/Example Projects/ModCreatorKit/ModCreatorKit.vcxproj

@@ -126,10 +126,18 @@
       <SubType>
       </SubType>
     </ClInclude>
+    <ClInclude Include="PlaySoundCheat.h">
+      <SubType>
+      </SubType>
+    </ClInclude>
     <ClInclude Include="PrintCursorCheat.h">
       <SubType>
       </SubType>
     </ClInclude>
+    <ClInclude Include="SFXLogCheat.h">
+      <SubType>
+      </SubType>
+    </ClInclude>
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="ThumbnailCaptureScript.h" />
@@ -174,10 +182,18 @@
       <SubType>
       </SubType>
     </ClCompile>
+    <ClCompile Include="PlaySoundCheat.cpp">
+      <SubType>
+      </SubType>
+    </ClCompile>
     <ClCompile Include="PrintCursorCheat.cpp">
       <SubType>
       </SubType>
     </ClCompile>
+    <ClCompile Include="SFXLogCheat.cpp">
+      <SubType>
+      </SubType>
+    </ClCompile>
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

Projects/Example Projects/ModCreatorKit/ModCreatorKit.vcxproj.filters

@@ -94,6 +94,12 @@
     <ClInclude Include="EffectLogCheat.h">
       <Filter>ModCreatorKit\Cheats</Filter>
     </ClInclude>
+    <ClInclude Include="SFXLogCheat.h">
+      <Filter>ModCreatorKit\Cheats</Filter>
+    </ClInclude>
+    <ClInclude Include="PlaySoundCheat.h">
+      <Filter>ModCreatorKit\Cheats</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="DetouredDBPF.cpp">
@@ -165,6 +171,12 @@
     <ClCompile Include="EffectLogCheat.cpp">
       <Filter>ModCreatorKit\Cheats</Filter>
     </ClCompile>
+    <ClCompile Include="SFXLogCheat.cpp">
+      <Filter>ModCreatorKit\Cheats</Filter>
+    </ClCompile>
+    <ClCompile Include="PlaySoundCheat.cpp">
+      <Filter>ModCreatorKit\Cheats</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="SdkPathConfig.props" />

Projects/Example Projects/ModCreatorKit/PlaySoundCheat.cpp

@@ -0,0 +1,27 @@
+#include "stdafx.h"
+#include "PlaySoundCheat.h"
+
+PlaySoundCheat::PlaySoundCheat()
+{
+}
+
+
+PlaySoundCheat::~PlaySoundCheat()
+{
+}
+
+
+void PlaySoundCheat::ParseLine(const ArgScript::Line& line)
+{
+	mParameter = line.GetArguments(1)[0];
+	if (string16(mParameter).find(u"0x") == 0) {
+		Audio::PlayAudio(mpFormatParser->ParseUInt(mParameter));
+	}
+
+	Audio::PlayAudio(id(mParameter));
+}
+
+const char* PlaySoundCheat::GetDescription(ArgScript::DescriptionMode mode) const
+{
+	return "Plays an SNR sound file by name or hash.";
+}

Projects/Example Projects/ModCreatorKit/PlaySoundCheat.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <Spore\BasicIncludes.h>
+
+class PlaySoundCheat 
+	: public ArgScript::ICommand
+{
+public:
+	PlaySoundCheat();
+	~PlaySoundCheat();
+
+	// Called when the cheat is invoked
+	void ParseLine(const ArgScript::Line& line) override;
+
+	// Returns a string containing the description. If mode != DescriptionMode::Basic, return a more elaborated description
+	const char* GetDescription(ArgScript::DescriptionMode mode) const override;
+private:
+	const char* mParameter;
+};
+

Projects/Example Projects/ModCreatorKit/SFXLogCheat.cpp

@@ -0,0 +1,31 @@
+#include "stdafx.h"
+#include "SFXLogCheat.h"
+
+
+bool SFXLogCheat::IsEnabled = false;
+
+// Detour the audio playing func
+static_detour(PlayAudio_detour, void(uint32_t, Audio::AudioTrack)) {
+	void detoured(uint32_t soundID, Audio::AudioTrack track) {
+		original_function(soundID, track);
+		if (SFXLogCheat::IsEnabled && soundID != 0)
+		{
+			App::ConsolePrintF("devSFXLog: playing Audio ID:    0x%x", soundID);
+		}
+	}
+};
+
+void SFXLogCheat::AttachDetour() {
+	PlayAudio_detour::attach(GetAddress(Audio, PlayAudio));
+}
+
+void SFXLogCheat::ParseLine(const ArgScript::Line& line)
+{
+	auto args = line.GetArguments(1);
+	SFXLogCheat::IsEnabled = mpFormatParser->ParseBool(args[0]);
+}
+
+const char* SFXLogCheat::GetDescription(ArgScript::DescriptionMode mode) const
+{
+	return "Usage: sfxLog on/off. If enabled, every time a UI sound effect is played it will print its ID. Does not include creature voices or world sounds.";
+}

Projects/Example Projects/ModCreatorKit/SFXLogCheat.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <Spore\BasicIncludes.h>
+
+class SFXLogCheat 
+	: public ArgScript::ICommand
+{
+public:
+	void ParseLine(const ArgScript::Line& line) override;
+	const char* GetDescription(ArgScript::DescriptionMode mode) const override;
+
+	static bool IsEnabled;
+
+	static void AttachDetour();
+};
+

Projects/Example Projects/ModCreatorKit/ThumbnailCaptureScript.cpp

@@ -34,7 +34,7 @@ ThumbnailCaptureScript::ThumbnailCaptureScript()
 	, mItemViewers()
 	, mpItemViewer(nullptr)
 	, mFolderPath()
-	, mIsEnabled(false)
+	, mbIsEnabled(false)
 {
 }
 
@@ -199,16 +199,20 @@ void ThumbnailCaptureScript::InjectListeners() {
 					// standard editor/planner
 					if (pageUI.page->mStandardItems.size() > 0) {
 						for (StandardItemUIPtr itemUI : pageUI.page->mStandardItems) {
-							itemUI->field_18->AddWinProc(this);
-							mItemViewers[itemUI->field_18.get()] = itemUI->mpViewer.get();
+							itemUI->mpWindow->AddWinProc(this);
+							mItemViewers[itemUI->mpWindow.get()] = itemUI->mpViewer.get();
 						}
 					}
 					// adventure editor
 					/*
 					else {
-						for (eastl::intrusive_ptr<Palettes::IAdvancedItemUI> itemUI : pageUI.page->mAdvancedItems) {
-							itemUI->mpWindow
-							mItemViewers[itemUI->field_18.get()] = itemUI->mpViewer.get();
+						for (IAdvancedItemUIPtr itemUI : pageUI.page->mAdvancedItems) {
+							auto item = object_cast<Palettes::DefaultItemFrameUI>(itemUI.get());
+							if (item && item->mpWindow) {
+								item->mpWindow->AddWinProc(this);
+								mItemViewers[item->mpWindow.get()] = itemUI->mpViewer.get();
+							}
+
 						}
 					}*/
 
@@ -218,9 +222,11 @@ void ThumbnailCaptureScript::InjectListeners() {
 		// simple category
 		else {
 			for (auto pageUI : catUI->mPageUIs) {
-				for (StandardItemUIPtr itemUI : pageUI.page->mStandardItems) {
-					itemUI->field_18->AddWinProc(this);
-					mItemViewers[itemUI->field_18.get()] = itemUI->mpViewer.get();
+				if (pageUI.page->mStandardItems.size() > 0) {
+					for (StandardItemUIPtr itemUI : pageUI.page->mStandardItems) {
+						itemUI->mpWindow->AddWinProc(this);
+						mItemViewers[itemUI->mpWindow.get()] = itemUI->mpViewer.get();
+					}
 				}
 			}
 		}
@@ -247,14 +253,14 @@ void ThumbnailCaptureScript::RemoveListeners() {
 					// standard editor/planner
 					if (pageUI.page->mStandardItems.size() > 0) {
 						for (StandardItemUIPtr itemUI : pageUI.page->mStandardItems) {
-							itemUI->field_18->RemoveWinProc(this);
+							itemUI->mpWindow->RemoveWinProc(this);
 						}
 					}
 					/*
 					// adventure editor
 					else {
 						for (StandardItemUIPtr itemUI : pageUI.page->mpPage->mItems) {
-							itemUI->field_18->RemoveWinProc(this);
+							itemUI->mpWindow->RemoveWinProc(this);
 						}
 					}
 					*/
@@ -265,8 +271,8 @@ void ThumbnailCaptureScript::RemoveListeners() {
 		else {
 			for (auto pageUI : catUI->mPageUIs) {
 				for (StandardItemUIPtr itemUI : pageUI.page->mStandardItems) {
-					if (itemUI && itemUI->field_18) {
-						itemUI->field_18->RemoveWinProc(this);
+					if (itemUI && itemUI->mpWindow) {
+						itemUI->mpWindow->RemoveWinProc(this);
 					}
 				}
 			}
@@ -279,10 +285,10 @@ void ThumbnailCaptureScript::RemoveListeners() {
 }
 
 void ThumbnailCaptureScript::ParseLine(const ArgScript::Line& line) {
-	if (mIsEnabled) {
+	if (mbIsEnabled) {
 		RemoveListeners();
 		App::ConsolePrintF("Icon capture disabled.");
-		mIsEnabled = false;
+		mbIsEnabled = false;
 		return;
 	}
 
@@ -327,7 +333,7 @@ void ThumbnailCaptureScript::ParseLine(const ArgScript::Line& line) {
 	InjectListeners();
 
 	App::ConsolePrintF("Icon capture enabled: hover a palette item and wait until it starts rotating to generate the icon.");
-	mIsEnabled = true;
+	mbIsEnabled = true;
 }
 
 const char* ThumbnailCaptureScript::GetDescription(ArgScript::DescriptionMode mode) const {

Projects/Example Projects/ModCreatorKit/ThumbnailCaptureScript.h

@@ -73,6 +73,6 @@ class ThumbnailCaptureScript
 	ColorRGB mOldColor;
 	ColorRGB mIdentityColor;
 	string16 mFolderPath;
-	bool mIsEnabled;
+	bool mbIsEnabled;
 };
 

Projects/Example Projects/ModCreatorKit/dllmain.cpp

@@ -8,6 +8,8 @@
 #include "Cheats.h"
 #include "ThumbnailCaptureScript.h"
 #include "AnimLogCheat.h"
+#include "EffectLogCheat.h"
+#include "SFXLogCheat.h"
 #include "UILogCheat.h"
 #include "AnimEditorMode.h"
 
@@ -108,6 +110,8 @@ void AttachDetours()
 	Debugging::AttachDetour();
 	cEffectsManager_detour::attach(GetAddress(Swarm::cSwarmManager, GetDirectoryAndEffectIndex));
 	AnimLogCheat::AttachDetour();
+	EffectLogCheat::AttachDetour();
+	SFXLogCheat::AttachDetour();
 	UILogCheat::AttachDetour();
 	ThumbnailCaptureScript::AttachDetour();
 }

Spore ModAPI/SourceCode/Editors/EditorCamera.cpp

@@ -54,7 +54,7 @@ namespace Editors
 		, mbEditorCameraTurntableStyle()
 		, field_94()
 		, field_98()
-		, field_9C()
+		, mbFOVisCurrent()
 		, mInput()
 		, mpViewer(nullptr)
 	{

Spore ModAPI/SourceCode/Editors/EditorPalettes.cpp

@@ -226,14 +226,14 @@ namespace Palettes
 	PaletteUI::PaletteUI()
 		: mpLayout(nullptr)
 		, mpCategoryButtonsWindow()
-		, field_14()
-		, field_18()
-		, field_1C()
+		, mpWindowLeft()
+		, mpWindowRight()
+		, mpWindowBehind()
 		, mpAnimatedWindow(nullptr)
 		, mpCategoryContent()
 		, mpPalette(nullptr)
 		, mCategories()
-		, field_48()
+		, mCategorySlots()
 		, field_5C()
 		, field_60()
 		, mpActiveCategory()
@@ -278,6 +278,13 @@ namespace Palettes
 		return paint;
 	}
 
+	void PaletteUI::SetActiveCategory(int categoryIndex)
+	{
+		CALL(GetAddress(PaletteUI, SetActiveCategory), void,
+			Args(PaletteUI*, int),
+			Args(this, categoryIndex));
+	}
+
 	auto_METHOD_VOID(PaletteUI, Load, Args(PaletteMain* pPalette, UTFWin::IWindow* pWindow, bool arg_8, PaletteInfo* arg_C),
 		Args(pPalette, pWindow, arg_8, arg_C));