Skip to content

Commit 356dab2

Browse files
committed
Merge remote-tracking branch 'origin/master' into update4
2 parents 368fc71 + e3feecd commit 356dab2

2 files changed

Lines changed: 0 additions & 2 deletions

File tree

Spore ModAPI/SourceCode/DLL/AddressesEditors.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ namespace Editors
8282

8383
DefineAddress(HandleMessage, SelectAddress(0x591C80, 0x591FA0));
8484

85-
8685
DefineAddress(GetEditorForAssetType, SelectAddress(0x433010, 0x4333e0));
8786
DefineAddress(GetNameForAssetType, SelectAddress(0x4badc0, 0x4bba50));
8887
DefineAddress(GetTypeIDForAssetType, SelectAddress(0x4bb110, 0x4bbda0));

Spore ModAPI/SourceCode/Editors/Editor.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ namespace Editors
201201

202202
auto_STATIC_METHOD_VOID(cEditor, ComputeCreatureVerbIcons, Args(cCreatureDataResource* creatureData, cSPVerbTrayCollection* VerbTrayCollection, int brainLevel, float param_4), Args(creatureData, VerbTrayCollection, brainLevel, param_4));
203203

204-
205204
auto_STATIC_METHOD(cEditor, bool, LoadCreatureData,Args(ResourceKey* creation, cCreatureDataResource** dst), Args(creation, dst));
206205

207206
auto_METHOD(EditorModel, int, GetSkinEffect, Args(int skinLayout), Args(skinLayout));

0 commit comments

Comments
 (0)