Resolve p_setup and d_netcmd conflicts (20190101 public merge)
This commit is contained in:
parent
e18eb69a0b
commit
015e7b9862
|
@ -1078,11 +1078,7 @@ UINT8 CanChangeSkin(INT32 playernum)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// Force skin in effect.
|
// Force skin in effect.
|
||||||
<<<<<<< HEAD
|
|
||||||
if ((cv_forceskin.value != -1) || (mapheaderinfo[gamemap-1] && mapheaderinfo[gamemap-1]->forcecharacter[0] != '\0'))
|
if ((cv_forceskin.value != -1) || (mapheaderinfo[gamemap-1] && mapheaderinfo[gamemap-1]->forcecharacter[0] != '\0'))
|
||||||
=======
|
|
||||||
if (client && (cv_forceskin.value != -1) && !(IsPlayerAdmin(playernum) && serverplayer == -1))
|
|
||||||
>>>>>>> public_next-20190101
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Can change skin in intermission and whatnot.
|
// Can change skin in intermission and whatnot.
|
||||||
|
@ -3285,15 +3281,11 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
|
||||||
UINT8 md5sum[16];
|
UINT8 md5sum[16];
|
||||||
boolean kick = false;
|
boolean kick = false;
|
||||||
boolean toomany = false;
|
boolean toomany = false;
|
||||||
<<<<<<< HEAD
|
|
||||||
INT32 i;
|
|
||||||
=======
|
|
||||||
INT32 i,j;
|
INT32 i,j;
|
||||||
serverinfo_pak *dummycheck = NULL;
|
serverinfo_pak *dummycheck = NULL;
|
||||||
|
|
||||||
// Shut the compiler up.
|
// Shut the compiler up.
|
||||||
(void)dummycheck;
|
(void)dummycheck;
|
||||||
>>>>>>> public_next-20190101
|
|
||||||
|
|
||||||
READSTRINGN(*cp, filename, 240);
|
READSTRINGN(*cp, filename, 240);
|
||||||
READMEM(*cp, md5sum, 16);
|
READMEM(*cp, md5sum, 16);
|
||||||
|
@ -4312,8 +4304,6 @@ static void Command_Archivetest_f(void)
|
||||||
*/
|
*/
|
||||||
static void ForceSkin_OnChange(void)
|
static void ForceSkin_OnChange(void)
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
if ((server || IsPlayerAdmin(consoleplayer)) && (cv_forceskin.value < -1 || cv_forceskin.value >= numskins))
|
if ((server || IsPlayerAdmin(consoleplayer)) && (cv_forceskin.value < -1 || cv_forceskin.value >= numskins))
|
||||||
{
|
{
|
||||||
if (cv_forceskin.value == -2)
|
if (cv_forceskin.value == -2)
|
||||||
|
@ -4328,7 +4318,6 @@ static void ForceSkin_OnChange(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
>>>>>>> public_next-20190101
|
|
||||||
// NOT in SP, silly!
|
// NOT in SP, silly!
|
||||||
if (!(netgame || multiplayer))
|
if (!(netgame || multiplayer))
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -3159,22 +3159,9 @@ boolean P_SetupLevel(boolean skipprecip)
|
||||||
if (!cv_cam2_dist.changed)
|
if (!cv_cam2_dist.changed)
|
||||||
CV_Set(&cv_cam2_dist, cv_cam2_dist.defaultvalue);*/
|
CV_Set(&cv_cam2_dist, cv_cam2_dist.defaultvalue);*/
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
// Though, I don't think anyone would care about cam_rotate being reset back to the only value that makes sense :P
|
// Though, I don't think anyone would care about cam_rotate being reset back to the only value that makes sense :P
|
||||||
if (!cv_cam_rotate.changed)
|
if (!cv_cam_rotate.changed)
|
||||||
CV_Set(&cv_cam_rotate, cv_cam_rotate.defaultvalue);
|
CV_Set(&cv_cam_rotate, cv_cam_rotate.defaultvalue);
|
||||||
=======
|
|
||||||
if (!cv_cam2_height.changed)
|
|
||||||
CV_Set(&cv_cam2_height, cv_cam2_height.defaultvalue);
|
|
||||||
|
|
||||||
if (!cv_cam2_dist.changed)
|
|
||||||
CV_Set(&cv_cam2_dist, cv_cam2_dist.defaultvalue);*/
|
|
||||||
|
|
||||||
// Though, I don't think anyone would care about cam_rotate being reset back to the only value that makes sense :P
|
|
||||||
if (!cv_cam_rotate.changed)
|
|
||||||
CV_Set(&cv_cam_rotate, cv_cam_rotate.defaultvalue);
|
|
||||||
|
|
||||||
>>>>>>> public_next-20190101
|
|
||||||
if (!cv_cam2_rotate.changed)
|
if (!cv_cam2_rotate.changed)
|
||||||
CV_Set(&cv_cam2_rotate, cv_cam2_rotate.defaultvalue);
|
CV_Set(&cv_cam2_rotate, cv_cam2_rotate.defaultvalue);
|
||||||
|
|
||||||
|
|
|
@ -2733,15 +2733,9 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (P_IsLocalPlayer(player))
|
if (P_IsLocalPlayer(player))
|
||||||
<<<<<<< HEAD
|
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Requested skin not found\n"));
|
CONS_Alert(CONS_WARNING, M_GetText("Requested skin not found\n"));
|
||||||
else if(server || adminplayer == consoleplayer)
|
|
||||||
CONS_Alert(CONS_WARNING, "Player %d (%s) skin not found\n", playernum, player_names[playernum]);
|
|
||||||
=======
|
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Skin %d not found\n"), skinnum);
|
|
||||||
else if(server || IsPlayerAdmin(consoleplayer))
|
else if(server || IsPlayerAdmin(consoleplayer))
|
||||||
CONS_Alert(CONS_WARNING, "Player %d (%s) skin %d not found\n", playernum, player_names[playernum], skinnum);
|
CONS_Alert(CONS_WARNING, "Player %d (%s) skin not found\n", playernum, player_names[playernum]);
|
||||||
>>>>>>> public_next-20190101
|
|
||||||
SetPlayerSkinByNum(playernum, 0); // not found put the sonic skin
|
SetPlayerSkinByNum(playernum, 0); // not found put the sonic skin
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue