Label cursor states (and more) #1000
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
names given to PlayerField454Val enums
and player field_454 and field_455
they are now:
enum PlayerCursorStates {
CSt_DefaultArrow = 0,
CSt_PickAxe,
CSt_Key,
CSt_PowerHand,
};
and
player.char primary_cursor_state
player.secondary_cursor_state
The new names all seems to make sense
PlaF_Unknown20 becomes PlaF_TaggedForDigging Pf3F_Unkn01 becomes Pf3F_nothing_to_touch_under_cursor Pf3F_Unkn02 Pf3F_chosen_subtile_is_not_floor other guesses added as comments
Loobinex
reviewed
Apr 6, 2021
Loobinex
reviewed
Apr 6, 2021
|
See the changes to player_data.h for all of the DK fields with new names, or guesses for usage |
|
I should maybe change all instance of It makes it clearer that a flag byte is being toggled. [This was not done] |
to Pf3F_chosen_subtile_is_high
to Pf3F_nothing_under_power_hand as it is turned on when player->thing_under_hand == 0 guesses for PlaF_Unknown10 and PlaF_Unknown80 added
Pf3F_Unkn04 is Pf3F_alternate_palette_is_active and Pf3F_Unkn08 is Pf3F_lightning_palette_is_active player.field_7 is player.palette_B player.palette is player.palette_A
SimLV
approved these changes
Apr 7, 2021
Used the value names from PlayerCursorStates to replace the use of 0-3 being assigned to `context` also added other notes about cursor states bugfix (missed a rename of CSt_Key to CSt_DoorKey)
|
Some nice new finding for the cursor states in 8928e21. |
in packets.c `dungeon->task_count` was being compared to 300, this must be MAPTASKS_COUNT which is used to define the size of: `struct MapTask task_list[MAPTASKS_COUNT];` in dungeon_data.h
to PlaF_ChosenSlabHasActiveTask it is more accurate to its use in the code. Comment expanded to explain the context it which it is used (in KFX codebase)
pckt->additional_packet_values - it uses the flags and values from `enum TbPacketAddValues`
to player.additional_flags and PlayerAdditionalFlags updated the comments of PlayerAdditionalFlags and formatted the value names correctly. Added whitespace to player_data.h to improve formatting
to palette_fade_step_pain and palette_fade_step_possession
renamed: Pf3F_Unkn04 (PlaAF_AlternatePaletteIsActive) to PlaAF_FreezePaletteIsActive player->field_7 (palette_B) to lens_palette player->palette (palette_A) to main_palette
they are now: PlaF_Unknown10 -> PlaF_KeyboardInputDisabled and PlaF_Unknown80 -> PlaF_MouseInputDisabled
|
For reference: commit f4e64df used a reverse-engineer of the original functions to fix the old KFX bug (with showing blue pal in 1st person when hit with freeze). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some proposed names for DK fields and values.
Please make suggestions and criticisms.
Read through the complete functions
process_dungeon_control_packet_dungeon_control()andprocess_dungeon_power_hand_state()to get the best idea of the use of these DK fields.