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

Stop iniswapping from modifying the char.ini file #712

Merged
merged 17 commits into from
Jul 30, 2022
Merged

Conversation

Crystalwarrior
Copy link
Contributor

@Crystalwarrior Crystalwarrior commented Mar 27, 2022

Stop iniswapping from modifying the char.ini (which can potentially remove comments such as credits, charmaker notes, etc.)
It also lead to really annoying behavior where if you swapped out from that character, when you swap back you'd be put into the iniswap instead of the default state, which could even be outside that character's iniswap list.

Closes #737

…emove comments such as credits, charmaker notes, etc.)
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 made some suggestions

src/courtroom.cpp Outdated Show resolved Hide resolved
Copy link
Member

@oldmud0 oldmud0 left a comment

Choose a reason for hiding this comment

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

I'm glad we are removing one of the most nerve wracking parts of courtroom.cpp. The function that returns a name given a name

@@ -1450,7 +1450,7 @@ void Courtroom::set_pos_dropdown(QStringList pos_dropdowns)
set_side(current_side);
}

void Courtroom::update_character(int p_cid)
void Courtroom::update_character(int p_cid, QString char_name, bool reset_emote)
Copy link
Member

Choose a reason for hiding this comment

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

Why does cid matter if we know that char_name is going to override it? I think this CID thing is really a vestigial part of the protocol at this point and we should seclude it to some packet handler.

Likewise, instead of adding reset_emote we can extract a method for that.

stonedDiscord
stonedDiscord previously approved these changes May 21, 2022
Copy link
Member

@stonedDiscord stonedDiscord left a comment

Choose a reason for hiding this comment

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

it did WHAT before

stonedDiscord
stonedDiscord previously approved these changes Jun 6, 2022
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 made some suggestions

src/courtroom.cpp Show resolved Hide resolved
src/courtroom.cpp Show resolved Hide resolved
@Crystalwarrior Crystalwarrior added this to the 2.10 milestone Jul 7, 2022
@stonedDiscord
Copy link
Member

what happened with get_char_name

src/text_file_functions.cpp Show resolved Hide resolved
src/courtroom.cpp Outdated Show resolved Hide resolved
@Crystalwarrior Crystalwarrior dismissed stale reviews from TrickyLeifa and oldmud0 July 29, 2022 15:35

Resolved

Copy link
Member

@oldmud0 oldmud0 left a comment

Choose a reason for hiding this comment

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

Good riddance

@oldmud0 oldmud0 merged commit f896475 into master Jul 30, 2022
@oldmud0 oldmud0 deleted the fix-iniswap-file-io branch July 30, 2022 00:45
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.

Deprecate name= in char.ini's
4 participants