Skip to content

Commit d8fc38f

Browse files
authored
Add Multiple Cursors, add IdentityColor enum, add/fix some comments (#68)
* add function definition for AddCreature * Add MouthTypes to CommonIDs.h * Add name for Unk10 in enum CreaturePersonality * Add definitions to Cursors.h * Fix typo, remove duplicate of auto_METHOD(cEditor, bool, AddCreature, add comment to funcC0h in cTribe.h * Add enum of identity colors to cIdentityColorable * Add several more cursors * ammend comment * remove mouthtypes commit * Add space game cursors * fix compile error in cursors.h * remove erroneous comment
1 parent 3c8909a commit d8fc38f

File tree

4 files changed

+80
-4
lines changed

4 files changed

+80
-4
lines changed

Spore ModAPI/SourceCode/Editors/Editor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@ namespace Editors
172172
auto_METHOD(cEditorAnimWorld, Anim::AnimatedCreature*, GetAnimatedCreature,
173173
Args(int creatureID), Args(creatureID));
174174

175+
auto_METHOD(cEditor, bool, AddCreature,
176+
Args(int a, const ResourceKey* key), Args(a, key));
177+
175178
auto_METHOD_VOID(cEditorAnimWorld, DestroyCreature,
176179
Args(int creatureID), Args(creatureID));
177180

@@ -186,9 +189,6 @@ namespace Editors
186189
auto_METHOD_VOID(cEditor, PostEventToActors,
187190
Args(uint32_t eventID, int a, float b, float c), Args(eventID, a, b, c));
188191

189-
auto_METHOD(cEditor, bool, AddCreature,
190-
Args(int a, const ResourceKey* key), Args(a, key));
191-
192192

193193

194194
auto_METHOD_VOID(EditorRigblock, SetShadedDisplay, Args(bool isShaded), Args(isShaded));

Spore ModAPI/Spore/Simulator/cCommunity.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ namespace Simulator
6565
using Object::Cast;
6666

6767
/// Returns the leader of this community, casted as a cCreatureCitizen.
68-
/// This can ge used in cTribe to get the tribe chief.
68+
/// This can be used in cTribe to get the tribe chief.
6969
/// @returns
7070
inline cCreatureCitizen* GetLeaderCitizen();
7171

Spore ModAPI/Spore/Simulator/cIdentityColorable.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,24 @@
2626

2727
namespace Simulator
2828
{
29+
enum class IdentityColors
30+
{
31+
Player = 0x053dbcf1,
32+
Neutral = 0x053dbcf2,
33+
Brown = 0x053dbcf3,
34+
Pink = 0x053dbcf4,
35+
Cyan = 0x053dbcf5,
36+
Green = 0x053dbcf6,
37+
Lavender = 0x053dbcf7,
38+
Orange = 0x053dbcf8,
39+
Yellow = 0x053dbcf9,
40+
Red = 0x053dbcfa,
41+
Blue = 0x053dbcfb,
42+
Forest = 0x053dbcfc,
43+
Crimson = 0x053dbcfd,
44+
Purple = 0x053dbcfe,
45+
};
46+
2947
///
3048
/// A Simulator class inherited by all those classes that can have an identity color, such as
3149
/// empires, tribes, etc

Spore ModAPI/Spore/UTFWin/Cursors.h

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,15 @@ namespace UTFWin
120120
/// cursor-no-opt
121121
NoOptions = 0x3a204b0,
122122

123+
/// cursor_goodie-hut
124+
QuestionHut = 0x56e3a22,
125+
126+
// cursor-object-translate
127+
Pan = 0x600cd69,
128+
129+
/// cursor-grab_open
130+
GrabOpen = 0x648fbf1,
131+
123132
/// cursor-ban-mode
124133
BanMode = 0x5ecbdffd,
125134

@@ -153,6 +162,15 @@ namespace UTFWin
153162
/// cursor-steal
154163
Steal = 0x3febe42,
155164

165+
/// cursor_repair
166+
Repair = 0x525ff0f,
167+
168+
/// cursor-crg-give-grn
169+
Gift = 0x8b875bdc,
170+
171+
/// cursor-crg-give-grn-no
172+
GiftDeny = 0xf59ce677,
173+
156174
/// cursor-fish
157175
Fish = 0x3febe3f,
158176

@@ -189,6 +207,46 @@ namespace UTFWin
189207
/// cursor-dance
190208
Dance = 0x3febe3d,
191209

210+
/// cursor-claim-spicemine
211+
ClaimSpice = 0x5d53800,
212+
213+
/// cur_ClaimNest
214+
ClaimNest = 0x7542cdb5,
215+
216+
217+
/// cursor-spg-sculpting-norm
218+
SpgSculpting = 0x682102e,
219+
220+
/// cursor-spg-social-norm
221+
SpgSocial = 0x6821016,
222+
223+
/// cursor-spg-sculpting-norm
224+
SpgSculpt = 0x682102e,
225+
226+
/// cursor-spg-travel-norm
227+
SpgScan = 0x6821022,
228+
229+
/// cursor-spg-travel-on
230+
SpgScanActive = 0x6821024,
231+
232+
/// cursor-spg-abduct-norm
233+
SpgAbduct = 0x682103e,
234+
235+
/// cursor-spg-abduct-on
236+
SpgAbductActive = 0x6821040,
237+
238+
/// cursor-spg-color-norm
239+
SpgColor = 0x6821026,
240+
241+
/// cursor-spg-color-on
242+
SpgColorActive = 0x6821029,
243+
244+
/// cursor-spg-colonize-norm
245+
SpgColonize = 0x6821032,
246+
247+
/// cursor-spg-atmospheric-norm
248+
SpgAtmosphere = 0x6821042,
249+
192250
};
193251
}
194252
}

0 commit comments

Comments
 (0)