Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#include <Spore\Simulator\cSpaceInventoryItem.h>
#include <Spore\Simulator\cSpaceNames.h>
#include <Spore\Simulator\cStarRecord.h>
#include <Spore\Simulator\cScenarioAsset.h>
#include <Spore\Simulator\cScenarioData.h>
#include <Spore\Simulator\cScenarioPlayMode.h>
#include <Spore\Simulator\cScenarioResource.h>
Expand Down Expand Up @@ -902,6 +903,11 @@ namespace Simulator
DefineAddress(ptr, SelectAddress(0x160A850, 0x16065D8));
}

namespace Addresses(cScenarioAsset)
{
DefineAddress(GetThumbnail, SelectAddress(0xEF92F0, 0xF24FE0));
}

namespace Addresses(cScenarioData)
{
DefineAddress(Initialize, SelectAddress(0xF44AC0, 0xF44690));
Expand Down
3 changes: 3 additions & 0 deletions Spore ModAPI/SourceCode/Simulator/Scenario.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

namespace Simulator
{
auto_METHOD_VOID(cScenarioAsset, GetThumbnail, Args(ResourceKey& dst), Args(dst));


auto_METHOD_VOID(cScenarioData, Initialize, Args(bool index), Args(index));

auto_METHOD_VOID_(cScenarioData, StartHistoryEntry);
Expand Down
46 changes: 23 additions & 23 deletions Spore ModAPI/Spore/App/Canvas.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,29 @@ namespace App
/* 9Ch */ virtual HMONITOR GetMonitor();

public:
/* 04h */ int field_4; // 0xF
/* 08h */ int mOptions; // 0x2A
/* 0Ch */ bool mIsFullscreen;
/* 0Dh */ bool field_D;
/* 0Eh */ bool field_E;
/* 0Fh */ bool field_F;
/* 10h */ bool field_10;
/* 11h */ bool field_11;
/* 14h */ int field_14;
/* 18h */ int field_18;
/* 1Ch */ bool field_1C;
/* 20h */ int field_20;
/* 24h */ eastl::string16 mCaption;
/* 34h */ int field_34;
/* 38h */ int field_38;
/* 3Ch */ tagRECT field_3C;
/* 4Ch */ bool field_4C; // true
/* 4Dh */ bool field_4D;
/* 4Eh */ bool field_4E;
/* 4Fh */ bool field_4F;
/* 50h */ int field_50; // 2000
/* 54h */ HKL mKeyboardLayout;
/* 58h */ int mDefaultAnsiCodeForLocale;
/* 04h */ uint32_t mnStyleFlags; // 0xF
/* 08h */ uint32_t mnOptionFlags; // 0x2A
/* 0Ch */ bool mbFullscreen;
/* 0Dh */ bool mbBlockInput;
/* 0Eh */ bool mbInMovingSizeLoop;
/* 0Fh */ bool mbInSizingLoop;
/* 10h */ bool mbInMovingLoop;
/* 11h */ bool mbMouseInClientArea;
/* 14h */ int mnLastMouseX;
/* 18h */ int mnLastMouseY;
/* 1Ch */ bool mbEnablePaint;
/* 20h */ uint32_t mnUpdateLockCount;
/* 24h */ eastl::string16 msCaption;
/* 34h */ uint32_t mnMinWidth;
/* 38h */ uint32_t mnMinHeight;
/* 3Ch */ tagRECT mRectDesiredClient;
/* 4Ch */ bool mbCursorVisible; // true
/* 4Dh */ bool mbCursorShadowSupported;
/* 4Eh */ bool mbMouseTrailsSupported;
/* 4Fh */ bool mbMouseSonarSupported;
/* 50h */ uint32_t mnIdleTimerIntervalMs; // 2000
/* 54h */ HKL mnKeyboardLayout;
/* 58h */ int mnDefaultAnsiCodeForLocale;
/* 5Ch */ IMessageManager* mpMessageServer;
/* 60h */ int field_60;
/* 64h */ int field_64;
Expand Down
2 changes: 1 addition & 1 deletion Spore ModAPI/Spore/App/IDGenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace App
/* 08h */ virtual void GenerateForGroup(ResourceKey& dst, uint32_t typeID, uint32_t groupID);

public:
/* 04h */ int field_4; // time?
/* 04h */ uint32_t mnStartInstance;
/* 08h */ eastl::map<int, int> field_8;
/* 28h */ eastl::map<int, int> field_24;
};
Expand Down
10 changes: 10 additions & 0 deletions Spore ModAPI/Spore/Simulator/cScenarioAsset.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,21 @@ namespace Simulator
class cScenarioAsset
{
public:

/// Gets the ResourceKey of an asset thumbnail to display in the editor palette.
/// @param[out] dst The destination value that will be assigned with the ResourceKey of a thumbnail.
void GetThumbnail(ResourceKey& dst);

/* 00h */ ResourceKey mKey;
/* 0Ch */ uint32_t mMachineId;
/* 10h */ uint64_t mServerId;
/* 18h */ uint32_t mModelType;
/* 1Ch */ bool field_1C;
};
ASSERT_SIZE(cScenarioAsset, 0x20);

namespace Addresses(cScenarioAsset)
{
DeclareAddress(GetThumbnail);
}
}
Loading