Skip to content

tweak(network): Make VC6 and VS22 builds use different magic values in LAN #1747

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
wants to merge 3 commits into from
Closed

tweak(network): Make VC6 and VS22 builds use different magic values in LAN #1747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
028aa45
Make VC6 and VS22 builds use different magic values in LAN network me…
helmutbuhler Oct 25, 2025
561cf2d
Update comment
helmutbuhler Nov 3, 2025
9051059
Replicate on Generals
helmutbuhler Nov 3, 2025
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
5 changes: 5 additions & 0 deletions Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,12 @@ enum PlayerLeaveCode CPP_11(: Int) {
};

// Magic number for identifying a Generals packet.
#if defined(_MSC_VER) && _MSC_VER < 1300
Copy link

@xezon xezon Nov 5, 2025

Choose a reason for hiding this comment

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

&& RETAIL_COMPATIBLE_CRC maybe too?

// Original retail value is used for builds with VC6
static const UnsignedShort GENERALS_MAGIC_NUMBER = 0xF00D;
#else
static const UnsignedShort GENERALS_MAGIC_NUMBER = 0xF00D+1;
Copy link

@xezon xezon Nov 5, 2025

Choose a reason for hiding this comment

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

Thinking about this again, this means new clients will not see retail client, right? That means some players cannot see a group of other players, which may or may not be desirable.

Ideally, all clients would be able to see all other client rooms in the lobby, but not be able to join them if incompatible. There are perhaps tricks we can do to prevent retail clients messing with rooms of new clients. Preventing new clients from joining retail client rooms should be possible.

Copy link
Author

@helmutbuhler helmutbuhler Nov 5, 2025

Choose a reason for hiding this comment

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

I think it's fine if players with different versions don't see each other. But if you think otherwise feel free to close this and make another PR.

Copy link

@xezon xezon Nov 6, 2025

Choose a reason for hiding this comment

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

From user experience it means 2 players can go into the same network and not see each other, then potentially struggle to find out what the reason for it is. If they would be able to see each other and our client would tell the user that he cannot connect with the other guy because he is using an incompatible client, then this would be a better user experience.

#endif

// The number of fps history entries.
//static const Int NETWORK_FPS_HISTORY_LENGTH = 30;
Expand Down
5 changes: 5 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,12 @@ enum PlayerLeaveCode CPP_11(: Int) {
};

// Magic number for identifying a Generals packet.
#if defined(_MSC_VER) && _MSC_VER < 1300
// Original retail value is used for builds with VC6
static const UnsignedShort GENERALS_MAGIC_NUMBER = 0xF00D;
#else
static const UnsignedShort GENERALS_MAGIC_NUMBER = 0xF00D+1;
#endif

// The number of fps history entries.
//static const Int NETWORK_FPS_HISTORY_LENGTH = 30;
Expand Down
Loading