diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 41287dcbb..7d88cb466 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -110,10 +110,6 @@ static void Skin_OnChange(void); static void Skin2_OnChange(void); static void Skin3_OnChange(void); static void Skin4_OnChange(void); -static void Localskin_OnChange(void); -static void Localskin2_OnChange(void); -static void Localskin3_OnChange(void); -static void Localskin4_OnChange(void); static void Color_OnChange(void); static void Color2_OnChange(void); static void Color3_OnChange(void); @@ -150,6 +146,7 @@ static void Command_Localskin1(void); static void Command_Localskin2(void); static void Command_Localskin3(void); static void Command_Localskin4(void); +static void Command_LocalskinAll(void); static void Command_ListWADS_f(void); #ifdef DELFILE static void Command_Delfile(void); @@ -303,6 +300,7 @@ consvar_t cv_localskin = {"internal___localskin", "none", CV_HIDEN, NULL, NULL, consvar_t cv_localskin2 = {"internal___localskin2", "none", CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_localskin3 = {"internal___localskin3", "none", CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_localskin4 = {"internal___localskin4", "none", CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_localskinall = {"internal___localskinall", "none", CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -662,6 +660,7 @@ void D_RegisterServerCommands(void) COM_AddCommand("localskin2", Command_Localskin2); COM_AddCommand("localskin3", Command_Localskin3); COM_AddCommand("localskin4", Command_Localskin4); + COM_AddCommand("localskinall", Command_LocalskinAll); COM_AddCommand("listwad", Command_ListWADS_f); #ifdef DELFILE @@ -920,6 +919,7 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_playercolor4); CV_RegisterVar(&cv_skin4); CV_RegisterVar(&cv_localskin4); + CV_RegisterVar(&cv_localskinall); // preferred number of players CV_RegisterVar(&cv_splitplayers); @@ -4636,6 +4636,14 @@ static void Command_Addfile(void) SendNetXCmd(XD_ADDFILE, buf, buf_p - buf); } +// i hate myself +static boolean DumbStartsWith(const char *pre, const char *str) +{ + size_t lenpre = strlen(pre), + lenstr = strlen(str); + return lenstr < lenpre ? false : memcmp(pre, str, lenpre) == 0; +} + /** Adds something at runtime. */ static void @@ -4647,7 +4655,15 @@ Command_Addskins (void) "addskins : load skins bro\n"); return; } - P_AddWadFile(COM_Argv(1), true); + // we dont want anything that aint a skin + if (DumbStartsWith("KC_", COM_Argv(1))) + P_AddWadFile(COM_Argv(1), true); + else if (DumbStartsWith("KCL_", COM_Argv(1)) && demo.playback) // KCL only for demos + P_AddWadFile(COM_Argv(1), true); + else if (DumbStartsWith("KCL_", COM_Argv(1)) && !demo.playback) + CONS_Alert(CONS_ERROR, M_GetText("Cannot add file %s as it is a skin with lua."), COM_Argv(1)); + else + CONS_Alert(CONS_ERROR, M_GetText("Cannot add file %s as it is not a skin."), COM_Argv(1)); } static void Command_Localskin1 (void) { @@ -4706,6 +4722,23 @@ static void Command_Localskin4 (void) { SetLocalPlayerSkin(displayplayers[3], COM_Argv(1), &cv_localskin4); } +static void Command_LocalskinAll (void) { + if (!Playing() && !demo.playback) + { + CONS_Printf("You can only use this command in gameplay.\n"); + return; + } + if (COM_Argc() != 2) + { + CONS_Printf("localskinall : Set a localskin to all players.\n"); + return; + } + INT32 i; + for (i; i < MAXPLAYERS; i++) { + SetLocalPlayerSkin(i, COM_Argv(1), &cv_localskinall); + } +} + #ifdef DELFILE /** removes the last added pwad at runtime. * Searches for sounds, maps, music and images to remove @@ -6018,38 +6051,6 @@ static void Command_ListSkins(void) } } -/** bruh - */ -static void Localskin_OnChange(void) -{ - if (!Playing()) - return; // do whatever you want - SetLocalPlayerSkin(consoleplayer, cv_localskin.string, &cv_localskin); -} - -/** two bruh machine gun - */ -static void Localskin2_OnChange(void) -{ - if (!Playing()) - return; // do whatever you want - SetLocalPlayerSkin(displayplayers[1], cv_localskin2.string, &cv_localskin2); -} - -static void Localskin3_OnChange(void) -{ - if (!Playing()) - return; // do whatever you want - SetLocalPlayerSkin(displayplayers[2], cv_localskin3.string, &cv_localskin3); -} - -static void Localskin4_OnChange(void) -{ - if (!Playing()) - return; // do whatever you want - SetLocalPlayerSkin(displayplayers[3], cv_localskin4.string, &cv_localskin4); -} - /** Sends a color change for the console player, unless that player is moving. * \sa cv_playercolor, Color2_OnChange, Skin_OnChange * \author Graue diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 9cf7c2e5d..80c7078a0 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -37,6 +37,7 @@ extern consvar_t cv_playername4; extern consvar_t cv_playercolor4; extern consvar_t cv_skin4; extern consvar_t cv_localskin4; +extern consvar_t cv_localskinall; // preferred number of players extern consvar_t cv_splitplayers; diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c index ff4a024ac..a7f3d8580 100644 --- a/src/lua_mobjlib.c +++ b/src/lua_mobjlib.c @@ -367,6 +367,12 @@ int mobj_skin_setter(lua_State *L) char skin[SKINNAMESIZE+1]; // all skin names are limited to this length strlcpy(skin, luaL_checkstring(L, 2), sizeof skin); strlwr(skin); // all skin names are lowercase + // nope, not this time chief. + if (fastcmp(localskins[players[consoleplayer].localskin - 1].name, skin)) + { + mo->skin = &skins[players[consoleplayer].skin]; // we dont want to use our local skin for this!!!!!!!!! + return 0; + } for (i = 0; i < numskins; i++) { { if (fastcmp(skins[i].name, skin)) @@ -378,8 +384,7 @@ int mobj_skin_setter(lua_State *L) } - mo->skin = &skins[players[consoleplayer].skin]; // we dont want to use our local skin for this!!!!!!!!! - return 0; + return luaL_error(L, "mobj.skin '%s' not found!", skin); } int mobj_color_setter(lua_State *L)