Merge public master

This commit is contained in:
Eidolon 2025-09-17 13:02:18 -05:00
commit c0a681f998
2 changed files with 4 additions and 4 deletions

View file

@ -16,4 +16,4 @@
# Logs, videos, or screenshots that showcase the issue # Logs, videos, or screenshots that showcase the issue
(For crash bugs, look for an .RPT file, or your `latest-log.txt`. You can drag it directly into this window.) (For crash bugs, look for an .RPT file, or your `latest-log.txt`. For gameplay glitches or oddities, try to attach a replay or video that contains the issue (check `media/replay`, or hit F9 in-game to start recording). You can drag files directly into this window.)

View file

@ -275,7 +275,7 @@ struct fileack_pak
struct player_config_t struct player_config_t
{ {
char name[MAXPLAYERNAME]; char name[MAXPLAYERNAME+1];
UINT16 skin; UINT16 skin;
UINT16 color; UINT16 color;
INT16 follower; INT16 follower;
@ -284,7 +284,7 @@ struct player_config_t
UINT8 min_delay; UINT8 min_delay;
uint8_t key[PUBKEYLENGTH]; uint8_t key[PUBKEYLENGTH];
UINT16 pwr[PWRLV_NUMTYPES]; UINT16 pwr[PWRLV_NUMTYPES];
}; } ATTRPACK;
struct clientconfig_pak struct clientconfig_pak
{ {
@ -470,7 +470,7 @@ struct doomdata_t
char filetxpak[sizeof (filetx_pak)];// 139 bytes char filetxpak[sizeof (filetx_pak)];// 139 bytes
char fileack[sizeof (fileack_pak)]; char fileack[sizeof (fileack_pak)];
UINT8 filereceived; UINT8 filereceived;
clientconfig_pak clientcfg; // 136 bytes clientconfig_pak clientcfg; // 650 bytes
UINT8 md5sum[16]; UINT8 md5sum[16];
serverinfo_pak serverinfo; // 1024 bytes serverinfo_pak serverinfo; // 1024 bytes
serverrefuse_pak serverrefuse; // 65025 bytes (somehow I feel like those values are garbage...) serverrefuse_pak serverrefuse; // 65025 bytes (somehow I feel like those values are garbage...)