Merge branch 'addfile-verify-fix' into 'next'
Addfile command verify fix. See merge request STJr/SRB2!272
This commit is contained in:
commit
38ac999d77
|
@ -2702,6 +2702,12 @@ static void Command_Login_f(void)
|
||||||
XBOXSTATIC UINT8 finalmd5[16];
|
XBOXSTATIC UINT8 finalmd5[16];
|
||||||
const char *pw;
|
const char *pw;
|
||||||
|
|
||||||
|
if (!netgame)
|
||||||
|
{
|
||||||
|
CONS_Printf(M_GetText("This only works in a netgame.\n"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// If the server uses login, it will effectively just remove admin privileges
|
// If the server uses login, it will effectively just remove admin privileges
|
||||||
// from whoever has them. This is good.
|
// from whoever has them. This is good.
|
||||||
if (COM_Argc() != 2)
|
if (COM_Argc() != 2)
|
||||||
|
@ -2769,6 +2775,12 @@ static void Command_Verify_f(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!netgame)
|
||||||
|
{
|
||||||
|
CONS_Printf(M_GetText("This only works in a netgame.\n"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (COM_Argc() != 2)
|
if (COM_Argc() != 2)
|
||||||
{
|
{
|
||||||
CONS_Printf(M_GetText("verify <node>: give admin privileges to a node\n"));
|
CONS_Printf(M_GetText("verify <node>: give admin privileges to a node\n"));
|
||||||
|
@ -3080,7 +3092,7 @@ static void Command_Addfile(void)
|
||||||
WRITEMEM(buf_p, md5sum, 16);
|
WRITEMEM(buf_p, md5sum, 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (adminplayer == consoleplayer) // Request to add file
|
if (adminplayer == consoleplayer && (!server)) // Request to add file
|
||||||
SendNetXCmd(XD_REQADDFILE, buf, buf_p - buf);
|
SendNetXCmd(XD_REQADDFILE, buf, buf_p - buf);
|
||||||
else
|
else
|
||||||
SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);
|
SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);
|
||||||
|
|
Loading…
Reference in a new issue