alufolie91 committed 2023-08-30 17:24:50 +02:00
1 parent c011d09e33
commit 46c7bf8b03
6 files changed
+105 -20

No files matched your search

+68 -4
View File
@@ -146,6 +146,10 @@ static void Command_SetViews_f(void);
static void Command_Addfilelocal(void);
static void Command_Addfile(void);
static void Command_Addskins(void);
static void Command_Localskin1(void);
static void Command_Localskin2(void);
static void Command_Localskin3(void);
static void Command_Localskin4(void);
static void Command_ListWADS_f(void);
#ifdef DELFILE
static void Command_Delfile(void);
@@ -295,10 +299,10 @@ consvar_t cv_skin2 = {"skin2", DEFAULTSKIN2, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Sk
consvar_t cv_skin3 = {"skin3", DEFAULTSKIN3, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin3_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_skin4 = {"skin4", DEFAULTSKIN4, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin4_OnChange, 0, NULL, NULL, 0, 0, NULL};
// haha I've beaten you now, ONLINE
consvar_t cv_localskin = {"localskin", "none", CV_CALL|CV_NOINIT, NULL, Localskin_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_localskin2 = {"localskin2", "none", CV_CALL|CV_NOINIT, NULL, Localskin2_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_localskin3 = {"localskin3", "none", CV_CALL|CV_NOINIT, NULL, Localskin3_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_localskin4 = {"localskin4", "none", CV_CALL|CV_NOINIT, NULL, Localskin4_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_localskin = {"internal___localskin", "none", CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, 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_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -654,6 +658,10 @@ void D_RegisterServerCommands(void)
COM_AddCommand("addfilelocal", Command_Addfilelocal);
COM_AddCommand("addfile", Command_Addfile);
COM_AddCommand("addskins", Command_Addskins);
COM_AddCommand("localskin", Command_Localskin1);
COM_AddCommand("localskin2", Command_Localskin2);
COM_AddCommand("localskin3", Command_Localskin3);
COM_AddCommand("localskin4", Command_Localskin4);
COM_AddCommand("listwad", Command_ListWADS_f);
#ifdef DELFILE
@@ -4642,6 +4650,62 @@ Command_Addskins (void)
P_AddWadFile(COM_Argv(1), true);
}
static void Command_Localskin1 (void) {
if (!Playing() && !demo.playback)
{
CONS_Printf("You can only use this command in gameplay.\n");
return;
}
if (COM_Argc() != 2)
{
CONS_Printf("localskin <name>: Set a localskin.\n");
return;
}
SetLocalPlayerSkin(consoleplayer, COM_Argv(1), &cv_localskin);
}
static void Command_Localskin2 (void) {
if (!Playing() && !demo.playback)
{
CONS_Printf("You can only use this command in gameplay.\n");
return;
}
if (COM_Argc() != 2)
{
CONS_Printf("localskin2 <name>: Set a localskin.\n");
return;
}
SetLocalPlayerSkin(displayplayers[1], COM_Argv(1), &cv_localskin2);
}
static void Command_Localskin3 (void) {
if (!Playing() && !demo.playback)
{
CONS_Printf("You can only use this command in gameplay.\n");
return;
}
if (COM_Argc() != 2)
{
CONS_Printf("localskin3 <name>: Set a localskin.\n");
return;
}
SetLocalPlayerSkin(displayplayers[2], COM_Argv(1), &cv_localskin3);
}
static void Command_Localskin4 (void) {
if (!Playing() && !demo.playback)
{
CONS_Printf("You can only use this command in gameplay.\n");
return;
}
if (COM_Argc() != 2)
{
CONS_Printf("localskin4 <name>: Set a localskin.\n");
return;
}
SetLocalPlayerSkin(displayplayers[3], COM_Argv(1), &cv_localskin4);
}
#ifdef DELFILE
/** removes the last added pwad at runtime.
* Searches for sounds, maps, music and images to remove
+1 -1
View File
@@ -8598,7 +8598,7 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags, pat
// it, they wouldn't 'spawn' on the top-right side of the HUD.
UINT8 skin = 0;
boolean skinlocal = mo->skinlocal;
boolean skinlocal = mo->player->localskin > 0;
fixed_t amnumxpos, amnumypos;
INT32 amxpos, amypos;
+20 -2
View File
@@ -3571,7 +3571,7 @@ void M_StartControlPanel(void)
else // multiplayer
{
MPauseMenu[mpause_switchmap].status = IT_DISABLED;
MPauseMenu[mpause_addons].status = IT_DISABLED;
//MPauseMenu[mpause_addons].status = IT_DISABLED;
MPauseMenu[mpause_scramble].status = IT_DISABLED;
MPauseMenu[mpause_psetupsplit].status = IT_DISABLED;
MPauseMenu[mpause_psetupsplit2].status = IT_DISABLED;
@@ -5499,6 +5499,14 @@ static boolean M_ChangeStringAddons(INT32 choice)
}
#undef len
// 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;
}
static void M_HandleAddons(INT32 choice)
{
boolean exitmenu = false; // exit to previous menu
@@ -5617,7 +5625,17 @@ static void M_HandleAddons(INT32 choice)
case EXT_KART:
#endif
case EXT_PK3:
COM_BufAddText(va("addfile \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
if (netgame || multiplayer) {
// no characters?
if (DumbStartsWith("KC_", dirmenu[dir_on[menudepthleft]]+DIR_STRING)) {
M_StartMessage(va("%c%s\x80\nYou are loading a local skin.\nLocal skins will not be usable\nafter going back from\nthe title screen.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING);
COM_BufAddText(va("addskins \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
}
else
S_StartSound(NULL, sfx_s26d);
}
else
COM_BufAddText(va("addfile \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
break;
default:
S_StartSound(NULL, sfx_s26d);
+6 -2
View File
@@ -3459,14 +3459,18 @@ next_token:
#endif
// Update the forceskin possiblevalues
if (! local)
if (!local)
{
Forceskin_cons_t[numskins+1].value = numskins;
Forceskin_cons_t[numskins+1].strvalue = skins[numskins].name;
}
// add face graphics
ST_LoadLocalFaceGraphics(skin->facerank, skin->facewant, skin->facemmap, ( (local) ? numlocalskins : numskins ), local);
if (local) {
ST_LoadLocalFaceGraphics(skin->facerank, skin->facewant, skin->facemmap, numlocalskins);
} else {
ST_LoadFaceGraphics(skin->facerank, skin->facewant, skin->facemmap, numskins);
}
#ifdef HWRENDER
if (rendermode == render_opengl)
+9 -10
View File
@@ -384,16 +384,15 @@ void ST_LoadFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 skin
facemmapprefix[skinnum] = W_CachePatchName(mmapstr, PU_HUDGFX);
}
void ST_LoadLocalFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 skinnum, boolean local)
void ST_LoadLocalFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 skinnum)
{
if (local)
{
localfacerankprefix[skinnum] = W_CachePatchName(rankstr, PU_HUDGFX);
localfacewantprefix[skinnum] = W_CachePatchName(wantstr, PU_HUDGFX);
localfacemmapprefix[skinnum] = W_CachePatchName(mmapstr, PU_HUDGFX);
}
else
ST_LoadFaceGraphics(rankstr, wantstr, mmapstr, skinnum);
localfacerankprefix[skinnum] = W_CachePatchName(rankstr, PU_HUDGFX);
localfacewantprefix[skinnum] = W_CachePatchName(wantstr, PU_HUDGFX);
localfacemmapprefix[skinnum] = W_CachePatchName(mmapstr, PU_HUDGFX);
//CONS_Printf("Added rank prefix %s\n", rankstr);
//CONS_Printf("Added want prefix %s\n", wantstr);
//CONS_Printf("Added mmap prefix %s\n", mmapstr);
}
void ST_ReloadSkinFaceGraphics(void)
@@ -404,7 +403,7 @@ void ST_ReloadSkinFaceGraphics(void)
ST_LoadFaceGraphics(skins[i].facerank, skins[i].facewant, skins[i].facemmap, i);
for (i = 0; i < numlocalskins; i++)
ST_LoadLocalFaceGraphics(skins[i].facerank, skins[i].facewant, skins[i].facemmap, i, true);
ST_LoadLocalFaceGraphics(localskins[i].facerank, localskins[i].facewant, localskins[i].facemmap, i);
}
static inline void ST_InitData(void)
+1 -1
View File
@@ -51,7 +51,7 @@ void ST_LoadGraphics(void);
// face load graphics, called when skin changes
void ST_LoadFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 playernum);
void ST_LoadLocalFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 playernum, boolean local);
void ST_LoadLocalFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 playernum);
void ST_ReloadSkinFaceGraphics(void);
#ifdef DELFILE
void ST_UnLoadFaceGraphics(INT32 skinnum);