mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-27 06:54:23 -04:00
Merge branch 'master' of https://github.com/fabiangreffrath/woof
This commit is contained in:
commit
9ec3ee6f2d
@ -126,7 +126,7 @@ static void LoadGameSettings(net_gamesettings_t *settings)
|
|||||||
}
|
}
|
||||||
|
|
||||||
demo_version = settings->demo_version;
|
demo_version = settings->demo_version;
|
||||||
if (demo_version == 0)
|
if (demo_version == 0 || demo_version == 109)
|
||||||
{
|
{
|
||||||
// TODO: refactor comp options
|
// TODO: refactor comp options
|
||||||
demo_version = 109;
|
demo_version = 109;
|
||||||
|
@ -131,19 +131,15 @@ boolean NET_ReadSettings(net_packet_t *packet, net_gamesettings_t *settings)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!NET_ReadInt8(packet, (unsigned int *) &settings->demo_version))
|
NET_ReadInt8(packet, (unsigned int *) &settings->demo_version);
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < NET_GAME_OPTION_SIZE; ++i)
|
for (i = 0; i < NET_GAME_OPTION_SIZE; ++i)
|
||||||
{
|
{
|
||||||
unsigned int value;
|
unsigned int value;
|
||||||
if (!NET_ReadInt8(packet, &value))
|
if (NET_ReadInt8(packet, &value))
|
||||||
{
|
{
|
||||||
return false;
|
settings->options[i] = (byte) value;
|
||||||
}
|
}
|
||||||
settings->options[i] = (byte) value;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user