HOLY SHIT

This commit is contained in:
haya_underscore authored and hayayayay committed 2022-11-12 10:20:52 +08:00
1 parent e4ba8b9a75
commit 37d72b4680
10 files changed
+78 -18

No files matched your search

+1 -1
View File
@@ -21,4 +21,4 @@ Win32_LIB_ASM_Release
/.vs
/debian
/assets/debian
compile.sh
compile.sh
+1 -1
View File
@@ -8240,7 +8240,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->player->localskin > 0;
boolean skinlocal = mo->skinlocal;
fixed_t amnumxpos, amnumypos;
INT32 amxpos, amypos;
+4 -1
View File
@@ -244,7 +244,10 @@ static int mobj_get(lua_State *L)
case mobj_skin: // skin name or nil, not struct
if (!mo->skin)
return 0;
lua_pushstring(L, ((skin_t *)mo->skin)->name);
if (mo->localskin) // only do this for demos
lua_pushstring(L, ((skin_t *)mo->localskin)->name);
else
lua_pushstring(L, ((skin_t *)mo->skin)->name);
break;
case mobj_color:
lua_pushinteger(L, mo->color);
+9 -9
View File
@@ -166,14 +166,14 @@ static int lib_iterateSkins(lua_State *L)
lua_remove(L, 1); // state is unused.
if (!lua_isnil(L, 1))
i = (INT32)(*((skin_t **)luaL_checkudata(L, 1, META_SKIN)) - skins) + 1;
i = (INT32)(*((skin_t **)luaL_checkudata(L, 1, META_SKIN)) - allskins) + 1;
else
i = 0;
// skins are always valid, only added, never removed
if (i < numskins)
if (i < numallskins)
{
LUA_PushUserdata(L, &skins[i], META_SKIN);
LUA_PushUserdata(L, &allskins[i], META_SKIN);
return 1;
}
@@ -191,9 +191,9 @@ static int lib_getSkin(lua_State *L)
i = luaL_checkinteger(L, 2);
if (i < 0 || i >= MAXSKINS)
return luaL_error(L, "skins[] index %d out of range (0 - %d)", i, MAXSKINS-1);
if (i >= numskins)
if (i >= numallskins)
return 0;
LUA_PushUserdata(L, &skins[i], META_SKIN);
LUA_PushUserdata(L, &allskins[i], META_SKIN);
return 1;
}
@@ -207,10 +207,10 @@ static int lib_getSkin(lua_State *L)
}
// find skin by name
for (i = 0; i < numskins; i++)
if (fastcmp(skins[i].name, field))
for (i = 0; i < numallskins; i++)
if (fastcmp(allskins[i].name, field))
{
LUA_PushUserdata(L, &skins[i], META_SKIN);
LUA_PushUserdata(L, &allskins[i], META_SKIN);
return 1;
}
@@ -219,7 +219,7 @@ static int lib_getSkin(lua_State *L)
static int lib_numSkins(lua_State *L)
{
lua_pushinteger(L, numskins);
lua_pushinteger(L, numallskins);
return 1;
}
+9
View File
@@ -2629,6 +2629,7 @@ void R_DrawMasked(void)
// ==========================================================================
INT32 numskins = 0;
INT32 numallskins = 0;
INT32 numlocalskins = 0;
skin_t skins[MAXSKINS];
UINT8 skinstats[9][9][MAXSKINS];
@@ -2645,6 +2646,7 @@ UINT8 skinstatscount[9][9] = {
};
UINT8 skinsorted[MAXSKINS];
skin_t localskins[MAXSKINS];
skin_t allskins[MAXSKINS*2];
// FIXTHIS: don't work because it must be inistilised before the config load
//#define SKINVALUES
#ifdef SKINVALUES
@@ -2745,6 +2747,10 @@ void R_InitSkins(void)
if (rendermode == render_opengl)
HWR_AddPlayerMD2(0, false);
#endif
// lets set it
allskins[0] = skins[0];
numallskins = 1;
}
// returns true if the skin name is found (loaded from pwad)
@@ -3330,7 +3336,10 @@ next_token:
skinsorted[numskins] = numskins;
allskins[numallskins] = ( (local) ? localskins : skins )[( (local) ? numlocalskins : numskins )];
( (local) ? numlocalskins++ : numskins++ );
numallskins++;
}
sortSkinGrid();
+2
View File
@@ -189,6 +189,7 @@ typedef struct drawnode_s
extern INT32 numskins;
extern INT32 numlocalskins;
extern INT32 numallskins;
extern skin_t skins[MAXSKINS];
extern UINT8 skinstats[9][9][MAXSKINS];
extern UINT8 skinstatscount[9][9];
@@ -196,6 +197,7 @@ extern UINT8 skinsorted[MAXSKINS];
void sortSkinGrid(void);
extern skin_t localskins[MAXSKINS];
extern skin_t allskins[MAXSKINS*2];
boolean SetPlayerSkin(INT32 playernum,const char *skinname);
void SetPlayerSkinByNum(INT32 playernum,INT32 skinnum); // Tails 03-16-2002
+25 -3
View File
@@ -62,6 +62,14 @@ patch_t *localfacerankprefix[MAXSKINS]; // ranking
patch_t *localfacewantprefix[MAXSKINS]; // wanted
patch_t *localfacemmapprefix[MAXSKINS]; // minimap
char *facerankprefix_name[MAXSKINS]; // ranking
char *facewantprefix_name[MAXSKINS]; // wanted
char *facemmapprefix_name[MAXSKINS]; // minimap
char *localfacerankprefix_name[MAXSKINS]; // ranking
char *localfacewantprefix_name[MAXSKINS]; // wanted
char *localfacemmapprefix_name[MAXSKINS]; // minimap
// ------------------------------------------
// status bar overlay
// ------------------------------------------
@@ -382,6 +390,10 @@ void ST_LoadFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 skin
facerankprefix[skinnum] = W_CachePatchName(rankstr, PU_HUDGFX);
facewantprefix[skinnum] = W_CachePatchName(wantstr, PU_HUDGFX);
facemmapprefix[skinnum] = W_CachePatchName(mmapstr, PU_HUDGFX);
facerankprefix_name[skinnum] = rankstr;
facewantprefix_name[skinnum] = wantstr;
facemmapprefix_name[skinnum] = mmapstr;
}
void ST_LoadLocalFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 skinnum)
@@ -390,6 +402,10 @@ void ST_LoadLocalFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32
localfacewantprefix[skinnum] = W_CachePatchName(wantstr, PU_HUDGFX);
localfacemmapprefix[skinnum] = W_CachePatchName(mmapstr, PU_HUDGFX);
localfacerankprefix_name[skinnum] = rankstr;
localfacewantprefix_name[skinnum] = wantstr;
localfacemmapprefix_name[skinnum] = mmapstr;
//CONS_Printf("Added rank prefix %s\n", rankstr);
//CONS_Printf("Added want prefix %s\n", wantstr);
//CONS_Printf("Added mmap prefix %s\n", mmapstr);
@@ -401,9 +417,15 @@ void ST_ReloadSkinFaceGraphics(void)
for (i = 0; i < numskins; i++)
ST_LoadFaceGraphics(skins[i].facerank, skins[i].facewant, skins[i].facemmap, i);
for (i = 0; i < numlocalskins; i++)
ST_LoadLocalFaceGraphics(localskins[i].facerank, localskins[i].facewant, localskins[i].facemmap, i);
if (players[consoleplayer].skinlocal) {
for (i = 0; i < numlocalskins; i++) {
ST_LoadLocalFaceGraphics(localskins[i].facerank, localskins[i].facewant, localskins[i].facemmap, i);
}
} else {
for (i = 0; i < numskins; i++)
ST_LoadLocalFaceGraphics(skins[i].facerank, skins[i].facewant, skins[i].facemmap, i);
}
}
static inline void ST_InitData(void)
+6
View File
@@ -82,6 +82,12 @@ extern patch_t *facemmapprefix[MAXSKINS]; // minimap
extern patch_t *localfacerankprefix[MAXSKINS]; // ranking
extern patch_t *localfacewantprefix[MAXSKINS]; // wanted
extern patch_t *localfacemmapprefix[MAXSKINS]; // minimap
extern char *facerankprefix_name[MAXSKINS]; // ranking
extern char *facewantprefix_name[MAXSKINS]; // wanted
extern char *facemmapprefix_name[MAXSKINS]; // minimap
extern char *localfacerankprefix_name[MAXSKINS]; // ranking
extern char *localfacewantprefix_name[MAXSKINS]; // wanted
extern char *localfacemmapprefix_name[MAXSKINS]; // minimap
extern patch_t *livesback;
extern patch_t *ngradeletters[7];
+12 -1
View File
@@ -65,6 +65,7 @@
#include "i_system.h"
#include "md5.h"
#include "lua_script.h"
#include "st_stuff.h"
#ifdef SCANTHINGS
#include "p_setup.h" // P_ScanThings
#endif
@@ -1729,8 +1730,18 @@ void W_UnlockCachedPatch(void *patch)
void *W_CachePatchName(const char *name, INT32 tag)
{
lumpnum_t num;
const char *finalname = name;
num = W_CheckNumForName(name);
// bogus fix by haya
// i really dont want to bother rn
if (finalname == facerankprefix_name[players[consoleplayer].skin] && players[consoleplayer].skinlocal)
finalname = localfacerankprefix_name[players[consoleplayer].localskin - 1];
else if (finalname == facemmapprefix_name[players[consoleplayer].skin] && players[consoleplayer].skinlocal)
finalname = localfacemmapprefix_name[players[consoleplayer].localskin - 1];
else if (finalname == facewantprefix_name[players[consoleplayer].skin] && players[consoleplayer].skinlocal)
finalname = localfacewantprefix_name[players[consoleplayer].localskin - 1];
num = W_CheckNumForName(finalname);
if (num == LUMPERROR)
return W_CachePatchNum(W_GetNumForName("MISSING"), tag);
+9 -2
View File
@@ -475,7 +475,14 @@ void Y_IntermissionDrawer(void)
if (data.match.color[i])
{
UINT8 *colormap = R_GetTranslationColormap(*data.match.character[i], *data.match.color[i], GTC_CACHE);
V_DrawMappedPatch(x+16, y-4, 0, facerankprefix[*data.match.character[i]], colormap);
if (!players[i].skinlocal) {
if (!players[i].localskin)
V_DrawMappedPatch(x+16, y-4, 0, facerankprefix[*data.match.character[i]], colormap);
else
V_DrawMappedPatch(x+16, y-4, 0, facerankprefix[players[i].localskin - 1], colormap);
} else {
V_DrawMappedPatch(x+16, y-4, 0, localfacerankprefix[players[i].localskin - 1], colormap);
}
}
if (data.match.num[i] == whiteplayer)
@@ -1179,7 +1186,7 @@ void Y_VoteDrawer(void)
if (players[i].skincolor)
{
UINT8 *colormap = R_GetTranslationColormap(players[i].skin, players[i].skincolor, GTC_CACHE);
V_DrawMappedPatch(x+24, y+9, V_SNAPTOLEFT, facerankprefix[players[i].skin], colormap);
V_DrawMappedPatch(x+24, y+9, V_SNAPTOLEFT, (players[i].skinlocal ? localfacerankprefix : facerankprefix)[((players[i].localskin) ? players[i].localskin-1 : players[i].skin)], colormap);
}
if (!splitscreen && i == consoleplayer)