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

De-magic-numbify some Z layer settings and BattleAnim-Picture-Render Order #1062

Merged
merged 6 commits into from Jun 10, 2017

Conversation

Projects
None yet
3 participants
@Ghabry
Member

Ghabry commented Oct 15, 2016

I hope I got all Z layer usages and didn't break something :/
The Z layers are now categorized in categories and the category marker are the upper 8 bit minus the sign bit. So 127 categories are possible (like a IPv4 Class A network ;)).

I didn't touch the Map Z layer stuff because I don't want to break the event order rendering... (but is in theory possible to figure out now because is all in PriorityMap)

The order has some limitations. See game_picture.cpp comments.

Fix #1195

Show outdated Hide outdated src/window_message.cpp
Show outdated Hide outdated src/game_picture.cpp
Show outdated Hide outdated src/sprite_battler.cpp

@Ghabry Ghabry modified the milestone: 0.5.1 Feb 21, 2017

@Ghabry

This comment has been minimized.

Show comment
Hide comment
@Ghabry

Ghabry Mar 3, 2017

Member

For this issue I would vote for a move directly behind 0.5.1 because (the not commited) Z-changes in above/below/same as hero events to be prepared for the next RPG2k3 version (pokes Cherry) will likely cause bugs. :)

Member

Ghabry commented Mar 3, 2017

For this issue I would vote for a move directly behind 0.5.1 because (the not commited) Z-changes in above/below/same as hero events to be prepared for the next RPG2k3 version (pokes Cherry) will likely cause bugs. :)

@carstene1ns carstene1ns modified the milestones: 0.6.0, 0.5.1 Mar 3, 2017

@fdelapena fdelapena removed the Needs Rebase label Mar 9, 2017

@carstene1ns carstene1ns modified the milestones: 0.5.2, 0.6.0 Apr 17, 2017

@Ghabry

This comment has been minimized.

Show comment
Hide comment
@Ghabry

Ghabry May 27, 2017

Member

Needs some ingame-testing first, though. Havn't checked the battle systems yet, was just happy that it compiled...

Member

Ghabry commented May 27, 2017

Needs some ingame-testing first, though. Havn't checked the battle systems yet, was just happy that it compiled...

Show outdated Hide outdated src/window_message.cpp
@@ -269,7 +269,8 @@ void Sprite_Battler::CreateSprite() {
SetX(battler->GetDisplayX());
SetY(battler->GetDisplayY());
SetZ(battler->GetBattleY()); // Not a typo
// Battlers at the bottom appear above battlers at the top

This comment has been minimized.

@carstene1ns

carstene1ns May 27, 2017

Member

great comment!

@carstene1ns

carstene1ns May 27, 2017

Member

great comment!

@carstene1ns carstene1ns merged commit abfd345 into EasyRPG:master Jun 10, 2017

6 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details
@Ghabry

This comment has been minimized.

Show comment
Hide comment
@Ghabry

Ghabry Jun 17, 2017

Member

Regression: Somehow the SetXYZ line in Sprite_Battler is duplicated and appears in Update() again and I missed that line. So the Z-value is incorrect and monster become (sometimes) invisible. I think simply removing that 3 lines is safe. Will submit a fix

Member

Ghabry commented Jun 17, 2017

Regression: Somehow the SetXYZ line in Sprite_Battler is duplicated and appears in Update() again and I missed that line. So the Z-value is incorrect and monster become (sometimes) invisible. I think simply removing that 3 lines is safe. Will submit a fix

Ghabry added a commit to Ghabry/easyrpg-player that referenced this pull request Jun 17, 2017

Ghabry added a commit to Ghabry/easyrpg-player that referenced this pull request Jun 18, 2017

@Ghabry Ghabry deleted the Ghabry:z-priority branch Sep 24, 2017

@carstene1ns carstene1ns referenced this pull request Oct 9, 2017

Open

A bunch of Vampires Dawn bugs #1128

5 of 5 tasks complete

Ghabry pushed a commit to libretro/easyrpg-libretro that referenced this pull request May 22, 2018

Merge pull request #1062 from Ghabry/z-priority
De-magic-numbify some Z layer settings and BattleAnim-Picture-Render Order

Ghabry added a commit to libretro/easyrpg-libretro that referenced this pull request May 22, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment