lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve p_setup and d_netcmd conflicts (20190101 public merge)

This commit is contained in:
mazmazz 2019-01-07 03:03:18 -05:00
parent e18eb69a0b
commit 015e7b9862
3 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/d_netcmd.c
View File

@ -1078,11 +1078,7 @@ UINT8 CanChangeSkin(INT32 playernum)
return true;
// Force skin in effect.
<<<<<<< HEAD
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;
// Can change skin in intermission and whatnot.
@ -3285,15 +3281,11 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
UINT8 md5sum[16];
boolean kick = false;
boolean toomany = false;
<<<<<<< HEAD
INT32 i;
=======
INT32 i,j;
serverinfo_pak *dummycheck = NULL;
// Shut the compiler up.
(void)dummycheck;
>>>>>>> public_next-20190101
READSTRINGN(*cp, filename, 240);
READMEM(*cp, md5sum, 16);
@ -4312,8 +4304,6 @@ static void Command_Archivetest_f(void)
*/
static void ForceSkin_OnChange(void)
{
<<<<<<< HEAD
=======
if ((server || IsPlayerAdmin(consoleplayer)) && (cv_forceskin.value < -1 || cv_forceskin.value >= numskins))
{
if (cv_forceskin.value == -2)
@ -4328,7 +4318,6 @@ static void ForceSkin_OnChange(void)
return;
}
>>>>>>> public_next-20190101
// NOT in SP, silly!
if (!(netgame || multiplayer))
return;

13
src/p_setup.c
View File

@ -3159,22 +3159,9 @@ boolean P_SetupLevel(boolean skipprecip)
if (!cv_cam2_dist.changed)
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
if (!cv_cam_rotate.changed)
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)
CV_Set(&cv_cam2_rotate, cv_cam2_rotate.defaultvalue);

8
src/r_things.c
View File

@ -2733,15 +2733,9 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
}
if (P_IsLocalPlayer(player))
<<<<<<< HEAD
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))
CONS_Alert(CONS_WARNING, "Player %d (%s) skin %d not found\n", playernum, player_names[playernum], skinnum);
>>>>>>> public_next-20190101
CONS_Alert(CONS_WARNING, "Player %d (%s) skin not found\n", playernum, player_names[playernum]);
SetPlayerSkinByNum(playernum, 0); // not found put the sonic skin
}