Merge remote-tracking branch 'origin/master' into opengl-is-a-bad-renderer
This commit is contained in:
commit
9246526e8a
|
@ -1,4 +1,4 @@
|
||||||
version: 2.1.25.{branch}-{build}
|
version: 2.2.0.{branch}-{build}
|
||||||
os: MinGW
|
os: MinGW
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -3389,14 +3389,14 @@ thingtypes
|
||||||
}
|
}
|
||||||
118
|
118
|
||||||
{
|
{
|
||||||
title = "CastleBot FaceStabber";
|
title = "Lance-a-Bot";
|
||||||
sprite = "CBFSA1";
|
sprite = "CBFSA1";
|
||||||
width = 32;
|
width = 32;
|
||||||
height = 72;
|
height = 72;
|
||||||
}
|
}
|
||||||
1113
|
1113
|
||||||
{
|
{
|
||||||
title = "Suspicious FaceStabber Statue";
|
title = "Suspicious Lance-a-Bot Statue";
|
||||||
sprite = "CBBSA1";
|
sprite = "CBBSA1";
|
||||||
width = 32;
|
width = 32;
|
||||||
height = 72;
|
height = 72;
|
||||||
|
@ -5006,7 +5006,7 @@ thingtypes
|
||||||
{
|
{
|
||||||
arrow = 1;
|
arrow = 1;
|
||||||
blocking = 2;
|
blocking = 2;
|
||||||
title = "FaceStabber Statue";
|
title = "Lance-a-Bot Statue";
|
||||||
sprite = "CBBSA1";
|
sprite = "CBBSA1";
|
||||||
width = 32;
|
width = 32;
|
||||||
height = 72;
|
height = 72;
|
||||||
|
|
|
@ -1301,6 +1301,8 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
|
||||||
|
|
||||||
M_Memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, 16);
|
M_Memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, 16);
|
||||||
|
|
||||||
|
memset(netbuffer->u.serverinfo.maptitle, 0, sizeof netbuffer->u.serverinfo.maptitle);
|
||||||
|
|
||||||
if (mapheaderinfo[gamemap-1] && *mapheaderinfo[gamemap-1]->lvlttl)
|
if (mapheaderinfo[gamemap-1] && *mapheaderinfo[gamemap-1]->lvlttl)
|
||||||
{
|
{
|
||||||
char *read = mapheaderinfo[gamemap-1]->lvlttl, *writ = netbuffer->u.serverinfo.maptitle;
|
char *read = mapheaderinfo[gamemap-1]->lvlttl, *writ = netbuffer->u.serverinfo.maptitle;
|
||||||
|
@ -1319,8 +1321,6 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
|
||||||
else
|
else
|
||||||
strncpy(netbuffer->u.serverinfo.maptitle, "UNKNOWN", 32);
|
strncpy(netbuffer->u.serverinfo.maptitle, "UNKNOWN", 32);
|
||||||
|
|
||||||
netbuffer->u.serverinfo.maptitle[32] = '\0';
|
|
||||||
|
|
||||||
if (mapheaderinfo[gamemap-1] && !(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE))
|
if (mapheaderinfo[gamemap-1] && !(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE))
|
||||||
netbuffer->u.serverinfo.iszone = 1;
|
netbuffer->u.serverinfo.iszone = 1;
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue