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

Change the logic to handle the future map loading #8342

Merged
merged 7 commits into from
Jan 27, 2024
Merged

Conversation

ihhub
Copy link
Owner

@ihhub ihhub commented Jan 25, 2024

  • add checks for objects placement on the Adventure Map
  • add abort logic for history manager to revert changes back to the previous state if there is an error
  • add logic to load objects on the Adventure Map for the future map loading

relates to #6845

@ihhub ihhub added logic Things related to game logic editor Map editor related stuff labels Jan 25, 2024
@ihhub ihhub added this to the 1.0.12 milestone Jan 25, 2024
@ihhub ihhub self-assigned this Jan 25, 2024
@ihhub ihhub marked this pull request as draft January 25, 2024 13:11
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Clang-Tidy found issue(s) with the introduced code (1/1)

src/fheroes2/world/world_loadmap.cpp Outdated Show resolved Hide resolved
@ihhub ihhub marked this pull request as ready for review January 25, 2024 13:59
@ihhub ihhub requested a review from oleg-derevenetz January 26, 2024 14:59
Copy link
Collaborator

@oleg-derevenetz oleg-derevenetz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ihhub LGTM, I just left one question (purely out of curiosity).

src/fheroes2/editor/history_manager.cpp Show resolved Hide resolved
Copy link

@ihhub ihhub merged commit 04b7efd into master Jan 27, 2024
21 checks passed
@ihhub ihhub deleted the game-map-loading branch January 27, 2024 02:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
editor Map editor related stuff logic Things related to game logic
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants