diff --git a/Spore ModAPI/Spore/Editors/BakeManager.h b/Spore ModAPI/Spore/Editors/BakeManager.h index 6b05270e..087401fa 100644 --- a/Spore ModAPI/Spore/Editors/BakeManager.h +++ b/Spore ModAPI/Spore/Editors/BakeManager.h @@ -58,7 +58,7 @@ namespace Editors /* 40h */ virtual void func40h(); /* 44h */ virtual void func44h(); /* 48h */ virtual void func48h(); - /* 4Ch */ virtual void func4Ch(const ResourceKey& nameKey, const BakeParameters& params); // bake? + /* 4Ch */ virtual void Bake(const ResourceKey& nameKey, const BakeParameters& params); // 60h returns IModelWorld diff --git a/Spore ModAPI/Spore/Simulator/SerializationTypes.h b/Spore ModAPI/Spore/Simulator/SerializationTypes.h index d6262c28..dea9cfa3 100644 --- a/Spore ModAPI/Spore/Simulator/SerializationTypes.h +++ b/Spore ModAPI/Spore/Simulator/SerializationTypes.h @@ -182,7 +182,7 @@ namespace Simulator if (count > 0) { *dst = eastl::string16(count, ' '); for (size_t i = 0; i < count; ++i) { - IO::ReadInt16(s, (int16_t*)(*dst)[i], 1, IO::Endian::Little); + IO::ReadInt16(s, (int16_t*)(dst->c_str() + i), 1, IO::Endian::Little); } } return true; diff --git a/Spore ModAPI/Spore/Simulator/cTribe.h b/Spore ModAPI/Spore/Simulator/cTribe.h index 1d59f393..16ef4e2e 100644 --- a/Spore ModAPI/Spore/Simulator/cTribe.h +++ b/Spore ModAPI/Spore/Simulator/cTribe.h @@ -106,7 +106,7 @@ namespace Simulator /* 2A8h */ eastl::vector field_2A8; /* 2BCh */ int field_2BC; /* 2C0h */ float mEggPenFoodValue; - /* 2C4h */ float mInitialRelationship; + /* 2C4h */ float mInitialRelationship; // does not seem to change from 0 /* 2C8h */ float mChieftainRespawnTimer; /* 2CCh */ float mGiftRelationshipDecayTimer; /* 2D0h */ ObjectPtr field_2D0; @@ -129,7 +129,7 @@ namespace Simulator /* 310h */ float mClosestWaterDistance; /* 314h */ eastl::vector mClosestForests; /* 328h */ int field_328; // not initialized - /* 32Ch */ int mUpgradeLevel; + /* 32Ch */ int mUpgradeLevel; // may be a uint32 or have errors? /* 330h */ float mZoningRadius; // 30.0 /* 334h */ bool mbRoboTribe; /* 338h */ int mRoboPopulationCount; @@ -151,7 +151,7 @@ namespace Simulator /* 550h */ int mTribeArchetype; //TODO /* 554h */ bool field_554; /* 555h */ bool field_555; - /* 556h */ bool mbMembersFlee; // if true, creatures run away in fear + /* 556h */ bool mbDefeated; // if true, creatures run away in fear then die. /* 557h */ bool mGoodyPopped; /* 558h */ char _padding_558[0x1310]; /* 1868h */ int field_1868; diff --git a/Spore ModAPI/Spore/UI/EditorNamePanel.h b/Spore ModAPI/Spore/UI/EditorNamePanel.h index aecf1a1a..6093dd90 100644 --- a/Spore ModAPI/Spore/UI/EditorNamePanel.h +++ b/Spore ModAPI/Spore/UI/EditorNamePanel.h @@ -20,8 +20,11 @@ namespace UI EditorNamePanel(); ~EditorNamePanel(); + /// Creates a functional renaming UI for a nameable entity (eg Tribes and Cities) + /// allowRename when set to false will gray-out the name field + /// randomNameType when set to 0x0 will hide the randomization button void Initialize(Editors::INameableEntity* pEntity, UTFWin::IWindow* pContainer, uint32_t layoutID, - bool, uint32_t randomNameType); + bool allowRename = true, uint32_t randomNameType = 0x0); void Dispose(); virtual void SetExtended(bool extended);