Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added JumpToAct() (Disc address: 0xF1F7B0) to cScenarioPlayMode #41

Merged
merged 3 commits into from
Jan 14, 2023
Merged

Added JumpToAct() (Disc address: 0xF1F7B0) to cScenarioPlayMode #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
354a9d3
Fixed formatting with `devPackage` cheat of ModCreatorKit.
Tenderi4 Jan 12, 2023
3220054
Added `JumpToAct()` to `cScenarioPlayMode`
Tenderi4 Jan 13, 2023
98b7a48
Added missing DeclareAddress()
Tenderi4 Jan 14, 2023
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
2 changes: 1 addition & 1 deletion Projects/Example Projects/ModCreatorKit/PackageCheat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void PrintPackages() {
int count = ResourceManager.GetDatabaseList(databases);
App::ConsolePrintF("----- %d databases:", count);
for (auto database : databases) {
App::ConsolePrintF("ls", database->GetLocation());
App::ConsolePrintF("%ls", database->GetLocation());
}
App::ConsolePrintF("-----");
}
Expand Down
1 change: 1 addition & 0 deletions Spore ModAPI/SourceCode/DLL/AddressesSimulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,7 @@ namespace Simulator
namespace Addresses(cScenarioPlayMode)
{
DefineAddress(SetCurrentAct, SelectAddress(0xF1F260, 0xF1EE70));
DefineAddress(JumpToAct, SelectAddress(0xF1F7B0, 0xF1F3C0));
}

namespace Addresses(cPlanetRecord)
Expand Down
1 change: 1 addition & 0 deletions Spore ModAPI/SourceCode/Simulator/Scenario.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,6 @@ namespace Simulator


auto_METHOD_VOID(cScenarioPlayMode, SetCurrentAct, Args(int index, bool arg), Args(index, arg));
auto_METHOD_VOID(cScenarioPlayMode, JumpToAct, Args(int actIndex), Args(actIndex));
}
#endif
2 changes: 2 additions & 0 deletions Spore ModAPI/Spore/Simulator/cScenarioPlayMode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ namespace Simulator
//TODO check sub_F1EFC0

void SetCurrentAct(int actIndex, bool = false);
void JumpToAct(int actIndex);

public:
/* 0Ch */ cScenarioPlaySummary mSummary;
Expand Down Expand Up @@ -96,5 +97,6 @@ namespace Simulator
namespace Addresses(cScenarioPlayMode)
{
DeclareAddress(SetCurrentAct); // 0xF1F260, 0xF1EE70
DeclareAddress(JumpToAct); // 0xF1F7B0, 0xF1F3C0
}
}