Skip to content

tweak: Update LanGameOptionsMenu chat type for consistency #1821

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Open

tweak: Update LanGameOptionsMenu chat type for consistency #1821

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,8 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
txtInput.trim();
// Echo the user's input to the chat window
if (!txtInput.isEmpty())
TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_EMOTE);
// TheSuperHackers @tweak arcticdolphin 07/11/2025 changed from LANCHAT_EMOTE for consistency
TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_NORMAL);
Copy link

@xezon xezon Nov 7, 2025

Choose a reason for hiding this comment

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

The button is named "buttonEmoteID". Maybe EMOTE type is intentional? What is the difference?

Copy link
Author

@tintinhamans tintinhamans Nov 7, 2025

Choose a reason for hiding this comment

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

LANCHAT_EMOTE (first line in screenshot) is used when you press the button that looks like an Enter symbol, LANCHAT_NORMAL (second line in screenshot) is used when you press Enter on your keyboard.

image

Emote feels like a feature that was never completed, I essentially did the same as what was done for this in the LanLobbyMenu:

GeneralsGameCode/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp

Lines 823 to 825 in db3416b

if (!txtInput.isEmpty()) {
// TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_EMOTE);
TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_NORMAL);

Copy link

@xezon xezon Nov 8, 2025

Choose a reason for hiding this comment

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

How will the EMOTE be used without the button?

Copy link

@Skyaero42 Skyaero42 Nov 8, 2025

Choose a reason for hiding this comment

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

I think we should introduce a /me command that would trigger the Emote formatting.

Emote is also used in the score screen chat and may need evaluation there too.

Copy link

@xezon xezon Nov 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

That is how it is done in GameSpy code:

Bool handleGameSetupSlashCommands(UnicodeString uText)
{
...
	else if (token == "me" && uText.getLength()>4)
	{
		TheGameSpyInfo->sendChat(UnicodeString(uText.str()+4), TRUE, NULL); // <---- second argument "isAction" makes emote chat
		return TRUE; // was a slash command
	}
...

Ok.

So the action items here are:

  1. Change all lobby emote lobby buttons to send normal chat (Game Room, Score Screen)
  2. Rename the "emote" buttons to "chat" buttons
  3. Implement /me command for Network chat (ideally /me command still works when clicking the button too)

}
else if ( controlID == buttonSelectMapID )
{
Expand Down
3 changes: 2 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,8 @@ WindowMsgHandledType LanGameOptionsMenuSystem( GameWindow *window, UnsignedInt m
txtInput.trim();
// Echo the user's input to the chat window
if (!txtInput.isEmpty())
TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_EMOTE);
// TheSuperHackers @tweak arcticdolphin 07/11/2025 changed from LANCHAT_EMOTE for consistency
TheLAN->RequestChat(txtInput, LANAPIInterface::LANCHAT_NORMAL);
}
else if ( controlID == buttonSelectMapID )
{
Expand Down
Loading