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.

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

Implement structs inheritance with SaveMapEventBase #282

Merged
merged 7 commits into from Nov 29, 2018

Conversation

Projects
None yet
4 participants
@fmatthew5876
Copy link
Contributor

fmatthew5876 commented Nov 18, 2018

This PR establishes a C++ inheritance relationship between player, vehicle, and map event save data.

This will be used for EasyRPG/Player#1499. It also reduces duplication in our csv files.

Also fixes bugs where sprite_transparent and route_through chunks were missing for some of these structs.

party move speed initialization was moved to Setup(), since it now defaults to -1 from inheritance.

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:savemapevent branch from 51f86f4 to 9b4f80a Nov 18, 2018

@fmatthew5876 fmatthew5876 referenced this pull request Nov 18, 2018

Merged

Refactor Game_Character classes 1 of 2 #1502

7 of 7 tasks complete

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:savemapevent branch from efa1b43 to c810ee2 Nov 19, 2018

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:savemapevent branch from 584e1fe to 1fd0e4c Nov 20, 2018

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:savemapevent branch 2 times, most recently from 6350a0e to a175891 Nov 20, 2018

@Ghabry

Ghabry approved these changes Nov 26, 2018

Copy link
Member

Ghabry left a comment

Would prefer to have this merged after #238 otherwise this needs another rebase.

@fmatthew5876

This comment has been minimized.

Copy link
Contributor Author

fmatthew5876 commented Nov 28, 2018

This one should not break master as master will just ignore the inheritance. Can be merged when ready.,

fmatthew5876 added some commits Nov 18, 2018

Remove SaveMapEvent::Fixup and UnFixup
These are wrong. When save_map_count is violated all
event data is cleared. These values don't actually go
to -1 and have their own defaults.
Resize status array when loading saved game
* If developer adds more states, loaded saved game is
  resized appropriately
Fix some defaults for SaveMapEvent
No -1 values. These default to 0 and are always present.

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:savemapevent branch from a175891 to a91307e Nov 29, 2018

@fmatthew5876

This comment has been minimized.

Copy link
Contributor Author

fmatthew5876 commented Nov 29, 2018

This has been rebased over the Jinja changes

@carstene1ns carstene1ns merged commit 2e20507 into EasyRPG:master Nov 29, 2018

4 checks passed

GNU/Linux Build finished.
Details
OSX Build finished.
Details
Windows Build finished.
Details
web Build finished.
Details

@fmatthew5876 fmatthew5876 deleted the fmatthew5876:savemapevent branch Dec 2, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.