ensure icon for QUICK_INFORMATION does not interfere with QUICK_INFOR… - #5195
Merged
Merged
Conversation
gibb3h
marked this pull request as ready for review
September 3, 2026 14:43
edorien
added a commit
to edorien/keeperfx-refactor
that referenced
this pull request
Sep 4, 2026
Same approach as prior syncs: re-apply each upstream change on its relocated file, preserving state-struct renames and the callback-struct convention. Commits merged: dkfans#5190 (pathfinding lag behind lava), dkfans#5189 (spawn from entrance center), dkfans#5192/dkfans#5195 (custom-icon script command fixes), dkfans#5180 (-nick CLI arg), dkfans#5196 (abyss distance log spam fix), dkfans#5185 (lua support for creatures returning from abyss). Cross-layer fixups beyond mechanical resolution: - script_hooks.h (kfx_config): added lua_on_creature_fell_into_abyss callback slot. thing_list.c's new abyss-death path called lua_on_creature_fell_into_abyss() directly, which would have pulled in kfx_script's lua_triggers.h from kfx_sim; routed through script_hooks-> instead and wired the real function in main.cpp, matching the existing lua_on_creature_death slot right next to it. - thing_creature.c: the new out-of-play/light-restore branch in update_creature() called light_turn_light_on() directly (kfx_render, above kfx_sim); changed to sim_feedback->light_turn_light_on(), matching the other light call already in this file. - ariadne_regions.c: dropped the now-dead kfx_config_state.h include (added previously only for PLAYERS_COUNT, whose sole consumer navigation_regions_connected() moved to ariadne.c and dropped the owner-bounds check entirely in this commit). - creature_states.h/globals.h: kept HEAD's already-completed relocation of enum CreatureStates into kfx_platform's globals.h rather than restoring the duplicate copy from origin's diff; applied upstream's one real change (CrSt_Null84 -> CrSt_CreatureOutOfPlay) there instead. - room_entrance.c: added the map_columns.h include get_floor_height_at() needs now that create_creature_at_entrance() computes floor height directly instead of calling the removed find_random_valid_position_for_thing_in_room(). Verified with scripts/check_layering.py --strict and a full KFX_OS=linux build of both keeperfx and keeperfx_hvlog. Co-authored-by: edorien <317349250+edorien@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
ensure icon for QUICK_INFORMATION does not interfere with QUICK_INFORMATION_WITH_POS