src/d_netcmd.c

@@ -1159,20 +1159,58 @@ static void SetPlayerName(INT32 playernum, char *newname)
 	}
 }
 
-UINT8 CanChangeSkin(INT32 playernum)
+
+/** Checks if a player can change skin under any circumstance.
+  *  If this function gets called by the Player Setup Menu, the skinnum will be -2.
+  *
+  *  \param playernum Player number who is checking the skin change conditions.
+  *  \param skinnum   Index of the requested skin.
+  */
+UINT8 CanChangeSkin(INT32 playernum, INT32 skinnum)
 {
+	// if the function wasn't called from the Player Setup Menu
+	if (skinnum != -2)
+	{
+		// needed checks that can't be ignored by the lua hook
+		if (!R_SkinUsable(consoleplayer, skinnum))
+		{
+			CONS_Alert(CONS_NOTICE, M_GetText("You can't use that skin at the moment.\n"));
+			return false;
+		}
+	}
+	
+	//Call the lua hook for CanChangeSkin
+	int canchangeskin = LUAh_HookPlayerCanChangeSkin(&players[playernum], &skins[players[playernum].skin], (skinnum < 0 ? NULL : &skins[skinnum]));
+	if (canchangeskin == 1)
+		return true; // force yes
+	else if (canchangeskin == 2)
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
+		return false; // force no
+	}
+
 	// Of course we can change if we're not playing
 	if (!Playing() || !addedtogame)
 		return true;
 
 	// Force skin in effect.
 	if ((cv_forceskin.value != -1) || (mapheaderinfo[gamemap-1] && mapheaderinfo[gamemap-1]->forcecharacter[0] != '\0'))
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
 		return false;
+	}
 
 	// Can change skin in intermission and whatnot.
 	if (gamestate != GS_LEVEL)
 		return true;
 
+	// Can't change when moving
+	if (P_PlayerMoving(playernum))
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin when moving.\n"));
+		return false;
+	}
+
 	// Server has skin change restrictions.
 	if (cv_restrictskinchange.value)
 	{
@@ -1196,10 +1234,10 @@ UINT8 CanChangeSkin(INT32 playernum)
 
 		if (players[playernum].spectator || players[playernum].playerstate == PST_DEAD || players[playernum].playerstate == PST_REBORN)
 			return true;
-
+		
+		CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
 		return false;
 	}
-
 	return true;
 }
 
@@ -1271,11 +1309,11 @@ static void SendNameAndColor(void)
 	if (!Playing())
 		return;
 
+	INT32 foundskin = R_SkinAvailable(cv_skin.string);
+
 	// If you're not in a netgame, merely update the skin, color, and name.
 	if (!netgame)
 	{
-		INT32 foundskin;
-
 		CleanupPlayerName(consoleplayer, cv_playername.zstring);
 		strcpy(player_names[consoleplayer], cv_playername.zstring);
 
@@ -1289,7 +1327,7 @@ static void SendNameAndColor(void)
 			SetPlayerSkinByNum(consoleplayer, 5);
 			CV_StealthSet(&cv_skin, skins[5].name);
 		}
-		else if ((foundskin = R_SkinAvailable(cv_skin.string)) != -1 && R_SkinUsable(consoleplayer, foundskin))
+		else if (CanChangeSkin(consoleplayer, foundskin))
 		{
 			//boolean notsame;
 
@@ -1335,7 +1373,7 @@ static void SendNameAndColor(void)
 		CleanupPlayerName(consoleplayer, cv_playername.zstring);
 
 	// Don't change skin if the server doesn't want you to.
-	if (!CanChangeSkin(consoleplayer))
+	if (!CanChangeSkin(consoleplayer, foundskin))
 		CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
 
 	// check if player has the skin loaded (cv_skin may have
@@ -1412,7 +1450,7 @@ static void SendNameAndColor2(void)
 	}
 	else if (!netgame)
 	{
-		INT32 foundskin;
+		INT32 foundskin = R_SkinAvailable(cv_skin2.string);
 
 		CleanupPlayerName(secondplaya, cv_playername2.zstring);
 		strcpy(player_names[secondplaya], cv_playername2.zstring);
@@ -1429,7 +1467,7 @@ static void SendNameAndColor2(void)
 			SetPlayerSkinByNum(secondplaya, forcedskin);
 			CV_StealthSet(&cv_skin2, skins[forcedskin].name);
 		}
-		else if ((foundskin = R_SkinAvailable(cv_skin2.string)) != -1 && R_SkinUsable(secondplaya, foundskin))
+		else if (CanChangeSkin(secondplaya, foundskin))
 		{
 			//boolean notsame;
 
@@ -4868,13 +4906,8 @@ static void Skin_OnChange(void)
 		return;
 	}
 
-	if (CanChangeSkin(consoleplayer) && !P_PlayerMoving(consoleplayer))
-		SendNameAndColor();
-	else
-	{
-		CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
-		CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
-	}
+	// checks are now done internally
+	SendNameAndColor();
 }
 
 /** Sends a skin change for the secondary splitscreen player, unless that
@@ -4887,13 +4920,8 @@ static void Skin2_OnChange(void)
 	if (!Playing() || !splitscreen)
 		return; // do whatever you want
 
-	if (CanChangeSkin(secondarydisplayplayer) && !P_PlayerMoving(secondarydisplayplayer))
-		SendNameAndColor2();
-	else
-	{
-		CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
-		CV_StealthSet(&cv_skin2, skins[players[secondarydisplayplayer].skin].name);
-	}
+	// checks are now done internally
+	SendNameAndColor2();
 }
 
 /** Sends a color change for the console player, unless that player is moving.

src/d_netcmd.h

@@ -211,6 +211,6 @@ void ItemFinder_OnChange(void);
 void D_SetPassword(const char *pw);
 
 // used for the player setup menu
-UINT8 CanChangeSkin(INT32 playernum);
+UINT8 CanChangeSkin(INT32 playernum, INT32 skinnum);
 
 #endif

src/lua_baselib.c

@@ -2796,8 +2796,9 @@ static int lib_rSetPlayerSkin(lua_State *L)
 			return luaL_error(L, "skin %s (argument 2) is not loaded", skinname);
 	}
 
-	if (!R_SkinUsable(j, i))
-		return luaL_error(L, "skin %d (argument 2) not usable - check with R_SkinUsable(player_t, skin) first.", i);
+	if (!CanChangeSkin(j, i))
+		return luaL_error(L, "Skin cannot be changed at the moment.");
+
 	SetPlayerSkinByNum(j, i);
 	return 0;
 }

src/lua_hook.h

@@ -14,6 +14,7 @@
 #include "d_player.h"
 #include "s_sound.h"
 #include "d_event.h"
+#include "r_skins.h"
 #include "lua_hudlib_drawlist.h"
 
 /*
@@ -72,6 +73,7 @@ automatically.
 	X (MusicChange),\
 	X (PlayerHeight),/* override player height */\
 	X (PlayerCanEnterSpinGaps),\
+	X (PlayerCanChangeSkin),\
 	X (KeyDown),\
 	X (KeyUp),\
 
@@ -149,3 +151,4 @@ int  LUA_HookPlayerCmd(player_t *, ticcmd_t *);
 int  LUA_HookMusicChange(const char *oldname, struct MusicChange *);
 fixed_t LUA_HookPlayerHeight(player_t *player);
 int  LUA_HookPlayerCanEnterSpinGaps(player_t *player);
+int LUAh_HookPlayerCanChangeSkin(player_t *player, skin_t *current_skin, skin_t *next_skin);

src/lua_hooklib.c

@@ -1182,3 +1182,18 @@ int LUA_HookPlayerCanEnterSpinGaps(player_t *player)
 	}
 	return hook.status;
 }
+
+int LUAh_HookPlayerCanChangeSkin(player_t *player, skin_t *current_skin, skin_t *next_skin)
+{
+	Hook_State hook;
+
+	if (prepare_hook(&hook, 0, HOOK(PlayerCanChangeSkin))) {
+		LUA_PushUserdata(gL, player, META_PLAYER);
+		LUA_PushUserdata(gL, current_skin, META_SKIN);
+		LUA_PushUserdata(gL, next_skin, META_SKIN);
+
+		call_hooks(&hook, 1, res_force);
+	}
+
+	return hook.status;
+}

src/m_menu.c

@@ -12685,7 +12685,7 @@ static void M_SetupMultiPlayer(INT32 choice)
 			break;
 
 	// disable skin changes if we can't actually change skins
-	if (!CanChangeSkin(consoleplayer))
+	if (!CanChangeSkin(consoleplayer, -2))
 		MP_PlayerSetupMenu[1].status = (IT_GRAYEDOUT);
 	else
 		MP_PlayerSetupMenu[1].status = (IT_KEYHANDLER|IT_STRING);
@@ -12730,7 +12730,7 @@ static void M_SetupMultiPlayer2(INT32 choice)
 			break;
 
 	// disable skin changes if we can't actually change skins
-	if (splitscreen && !CanChangeSkin(secondarydisplayplayer))
+	if (splitscreen && !CanChangeSkin(secondarydisplayplayer, -2))
 		MP_PlayerSetupMenu[1].status = (IT_GRAYEDOUT);
 	else
 		MP_PlayerSetupMenu[1].status = (IT_KEYHANDLER | IT_STRING);