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.

Sign up for GitHub

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

Jump to bottom

remove talk_effect_fun declarations from header #70898

Merged
merged 10 commits into from
Jan 26, 2024
Merged

remove talk_effect_fun declarations from header #70898

merged 10 commits into from
Jan 26, 2024

Conversation

nornagon
Copy link
Contributor

@nornagon nornagon commented Jan 13, 2024 •
edited
Loading

Summary

None

Purpose of change

Reduce recompile churn when editing talkeffect functions.
See also #70808

Describe the solution

  • Removed declarations from the header.
  • Changed set_* to f_*, which returns a function instead of setting a value
    in the struct.
  • Had to tweak how likely_rewards worked slightly.

Describe alternatives you've considered

Testing

Additional context

@github-actions github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership [C++] Changes (can be) made in C++. Previously named `Code` EOC: Effects On Condition Anything concerning Effects On Condition json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jan 13, 2024
@nornagon nornagon changed the title remove talkeffect_fun declarations from header remove talk_effect_fun declarations from header Jan 13, 2024
@nornagon nornagon mentioned this pull request Jan 13, 2024
Merged
@andrei8l

This comment was marked as outdated.

Sign in to view
github-actions[bot]
github-actions bot reviewed Jan 20, 2024
View reviewed changes
src/npctalk.cpp Outdated Show resolved Hide resolved
src/npctalk.cpp Outdated Show resolved Hide resolved
@andrei8l andrei8l mentioned this pull request Jan 24, 2024
Merged
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 25, 2024
Maleclypse
Maleclypse reviewed Jan 26, 2024
View reviewed changes
src/condition.cpp Outdated Show resolved Hide resolved
@Maleclypse Maleclypse merged commit 0f39e72 into CleverRaven:master Jan 26, 2024
25 checks passed
klliio pushed a commit to klliio/Cataclysm-EOD that referenced this pull request Jan 26, 2024
@nornagon @Maleclypse @klliio
remove talk_effect_fun declarations from header (CleverRaven#70898)
c90b181 
* remove talkeffect_fun declarations from header

* editor fail

* astyle

* fix build

* missed trigger_event

* Update src/condition.cpp

* Update src/condition.cpp

---------

Co-authored-by: Maleclypse <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Maleclypse Maleclypse Maleclypse left review comments

@github-actions github-actions[bot] github-actions[bot] left review comments

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` EOC: Effects On Condition Anything concerning Effects On Condition json-styled JSON lint passed, label assigned by github actions NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nornagon @andrei8l @Maleclypse