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

Refactor stuff #3855

Merged
merged 8 commits into from
Jan 30, 2025
Merged

Refactor stuff #3855

merged 8 commits into from
Jan 30, 2025

Conversation

PieterVdc
Copy link
Member

split off from the #2043 Lua PR, mostly reordering some things to make it easier to use with lua later on

PR shouldn't have any functional changes

@Loobinex
Copy link
Member

@PieterVdc I was gonna test and merge this in a hurry, but it has merge conflicts.

This is a spell, also remove the error log to stop it from filling against creatures that are immunes (All spell kind should be supported by now).
src/magic.c Outdated Show resolved Hide resolved
@walt253
Copy link
Contributor

walt253 commented Jan 29, 2025

@PieterVdc I was gonna test and merge this in a hurry, but it has merge conflicts.

I fixed those conflicts since I introduced them with #3820.

@walt253 walt253 self-requested a review January 29, 2025 06:58
@PieterVdc
Copy link
Member Author

@PieterVdc I was gonna test and merge this in a hurry, but it has merge conflicts.

I fixed those conflicts since I introduced them with #3820.

perfect thanks, also why I did this PR in the first place, to have less new ones in the future on my lua PR

@PieterVdc PieterVdc marked this pull request as draft January 29, 2025 08:23
@PieterVdc PieterVdc marked this pull request as ready for review January 29, 2025 12:59
@PieterVdc PieterVdc marked this pull request as draft January 29, 2025 13:10
@PieterVdc PieterVdc marked this pull request as ready for review January 29, 2025 16:37
@PieterVdc
Copy link
Member Author

@PieterVdc I was gonna test and merge this in a hurry, but it has merge conflicts.

all good now

@Loobinex Loobinex merged commit b98662f into dkfans:master Jan 30, 2025
@PieterVdc PieterVdc deleted the lua_prep branch January 30, 2025 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants