Skip to content

fix chat commands (again) #225

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

Closed
FoofooTheGuy wants to merge 1 commit into from
Closed

fix chat commands (again) #225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions Sources/Helpers/Chat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ namespace CTRPluginFramework {
}

void Chat::CommandLoop() {

//macro to clean up
#define CLEAR_RET \
ClearPlayerMessage(); \
return;

if(!IsPlayerMessageOnScreen()) {
return;
}
Expand Down Expand Up @@ -135,7 +141,7 @@ namespace CTRPluginFramework {
}
else {
OSDExtras::Notify(TextID::CHAT_INVALID_ANIMATION, Color::Red);
return;
CLEAR_RET
}
}

Expand All @@ -146,7 +152,7 @@ namespace CTRPluginFramework {
}
else {
OSDExtras::Notify(TextID::CHAT_INVALID_EMOTION, Color::Red);
return;
CLEAR_RET
}
}

Expand All @@ -157,7 +163,7 @@ namespace CTRPluginFramework {
}
else {
OSDExtras::Notify(TextID::CHAT_INVALID_SNAKE, Color::Red);
return;
CLEAR_RET
}
}

Expand All @@ -168,7 +174,7 @@ namespace CTRPluginFramework {
}
else {
OSDExtras::Notify(TextID::CHAT_INVALID_MUSIC, Color::Red);
return;
CLEAR_RET
}
}

Expand All @@ -182,7 +188,7 @@ namespace CTRPluginFramework {
}
else {
OSDExtras::Notify(TextID::INVALID_ITEM, Color::Red);
return;
CLEAR_RET
}
}

Expand All @@ -191,13 +197,13 @@ namespace CTRPluginFramework {
ItemNamePack match;
if (!Item::searchByKeyword(ItemName, match)) {
OSDExtras::Notify(TextID::CHAT_NO_ITEM_FOUND, Color::Red);
return;
CLEAR_RET
}

itemID = Item(match.ID); //sets item
if(!itemID.isValid()) { //should always be true if orig file is used
OSDExtras::Notify(TextID::INVALID_ITEM, Color::Red);
return;
CLEAR_RET
}

ItemCommand();
Expand Down