clean up this mess

This commit is contained in:
Alug committed 2024-03-10 04:43:02 +01:00
1 parent 37ad063db8
commit db92db393e
1 file changed
+49 -97
+49 -97
View File
@@ -340,14 +340,11 @@ void Y_AnimatedVoteScreenCheck(void)
boolean stopSearching = false;
if (luaVoteScreen)
{
strncpy(tmpPrefix, luaVoteScreen, 4);
}
else
{
if(G_BattleGametype()) {
if(G_BattleGametype())
strcpy(tmpPrefix, "BTLS");
}
}
strncpy(animPrefix, tmpPrefix, 4);
@@ -360,20 +357,22 @@ void Y_AnimatedVoteScreenCheck(void)
currentAnimFrame = 0;
INT32 i = 1;
while(!stopSearching){
while(!stopSearching)
{
boolean normalLumpExists = W_LumpExists(va("%sC%d", tmpPrefix, i));
boolean wideLumpExists = W_LumpExists(va("%sW%d", tmpPrefix, i));
if(normalLumpExists || wideLumpExists){
if(normalLumpExists){
if (normalLumpExists || wideLumpExists)
{
if (normalLumpExists)
foundAnimVoteFrames++;
}
if(wideLumpExists){
if (wideLumpExists)
foundAnimVoteWideFrames++;
}
} else { // If we don't find at least frame 1 (e.g VEXTRN1), let's just stop looking
stopSearching = true;
}
else // If we don't find at least frame 1 (e.g VEXTRN1), let's just stop looking
stopSearching = true;
i++;
}
}
@@ -536,22 +535,21 @@ void Y_IntermissionDrawer(void)
{
UINT8 *colormap = R_GetTranslationColormap(*data.match.character[i], *data.match.color[i], GTC_CACHE);
// i fucking hate this i fucking hate this i hate this so much
if (!players[data.match.num[i]].skinlocal) {
if (!players[data.match.num[i]].localskin)
if (cv_highresportrait.value)
V_DrawSmallMappedPatch(x+16, y-4, 0, facewantprefix[*data.match.character[i]], colormap);
else
V_DrawMappedPatch(x+16, y-4, 0, facerankprefix[*data.match.character[i]], colormap);
else
if (cv_highresportrait.value)
V_DrawSmallMappedPatch(x+16, y-4, 0, facewantprefix[players[data.match.num[i]].localskin - 1], colormap);
else
V_DrawMappedPatch(x+16, y-4, 0, facerankprefix[players[data.match.num[i]].localskin - 1], colormap);
} else {
if (!players[data.match.num[i]].skinlocal)
{
int skinIndex = players[data.match.num[i]].localskin ? players[data.match.num[i]].localskin - 1 : *data.match.character[i];
if (cv_highresportrait.value)
V_DrawSmallMappedPatch(x+16, y-4, 0, localfacewantprefix[players[data.match.num[i]].localskin - 1], colormap);
V_DrawSmallMappedPatch(x + 16, y - 4, 0, facewantprefix[skinIndex], colormap);
else
V_DrawMappedPatch(x+16, y-4, 0, localfacerankprefix[players[data.match.num[i]].localskin - 1], colormap);
V_DrawMappedPatch(x + 16, y - 4, 0, facerankprefix[skinIndex], colormap);
}
else
{
if (cv_highresportrait.value)
V_DrawSmallMappedPatch(x + 16, y - 4, 0, localfacewantprefix[players[data.match.num[i]].localskin - 1], colormap);
else
V_DrawMappedPatch(x + 16, y - 4, 0, localfacerankprefix[players[data.match.num[i]].localskin - 1], colormap);
}
}
@@ -995,34 +993,6 @@ static void Y_UnloadData(void)
UNLOAD(widebgpatch);
UNLOAD(bgtile);
UNLOAD(interpic);
/*switch (intertype)
{
case int_coop:
// unload the coop and single player patches
UNLOAD(data.coop.ttlnum);
UNLOAD(data.coop.bonuspatches[3]);
UNLOAD(data.coop.bonuspatches[2]);
UNLOAD(data.coop.bonuspatches[1]);
UNLOAD(data.coop.bonuspatches[0]);
UNLOAD(data.coop.ptotal);
break;
case int_spec:
// unload the special stage patches
//UNLOAD(data.spec.cemerald);
//UNLOAD(data.spec.nowsuper);
UNLOAD(data.spec.bonuspatch);
UNLOAD(data.spec.pscore);
UNLOAD(data.spec.pcontinues);
break;
case int_match:
case int_race:
default:
//without this default,
//int_none, int_tag, int_chaos, and int_classicrace
//are not handled
break;
}*/
}
// SRB2Kart: Voting!
@@ -1031,36 +1001,30 @@ static void Y_UnloadData(void)
//
// Draw animated patch based on frame counter on vote screen
//
void Y_DrawAnimatedVoteScreenPatch(boolean widePatch){
static void Y_DrawAnimatedVoteScreenPatch(boolean widePatch)
{
char tempAnimPrefix[7];
(widePatch) ? strcpy(tempAnimPrefix, animWidePrefix) : strcpy(tempAnimPrefix, animPrefix);
INT32 tempFoundAnimVoteFrames = (widePatch) ? foundAnimVoteWideFrames : foundAnimVoteFrames;
INT32 flags = V_SNAPTOBOTTOM | V_SNAPTOTOP;
// Just in case someone provides LESS widescreen frames than normal frames or vice versa, reset the frame counter to 0
if(widePatch) {
if(currentAnimFrame > foundAnimVoteWideFrames-1){
if (widePatch)
{
if (currentAnimFrame > foundAnimVoteWideFrames-1)
currentAnimFrame = 0;
}
} else {
if(currentAnimFrame > foundAnimVoteFrames-1){
}
else
{
if (currentAnimFrame > foundAnimVoteFrames-1)
currentAnimFrame = 0;
}
}
/*patch_t *currPatch = W_CachePatchName(va("%s%d", tempAnimPrefix, currentAnimFrame+1), PU_CACHE);
V_DrawScaledPatch(((vid.width/2) / vid.dupx) - (SHORT(currPatch->width)/2), // Keep the width/height adjustments, for screens that are less wide than 320(?)
(vid.height / vid.dupy) - SHORT(currPatch->height),
V_SNAPTOTOP|V_SNAPTOLEFT, currPatch);
if(votetic % 3 == 0 && !paused){*/
{
patch_t *background = W_CachePatchName(va("%s%d", tempAnimPrefix, currentAnimFrame + 1), PU_CACHE);
V_DrawScaledPatch(160 - (background->width / 2), (200 - (background->height)), flags, background);
}
if (lastvotetic != votetic && lastvotetic % 2 == 0) {
patch_t *background = W_CachePatchName(va("%s%d", tempAnimPrefix, currentAnimFrame + 1), PU_CACHE);
V_DrawScaledPatch(160 - (background->width / 2), (200 - (background->height)), flags, background);
if (lastvotetic != votetic && lastvotetic % 2 == 0)
currentAnimFrame = (currentAnimFrame+1 > tempFoundAnimVoteFrames-1) ? 0 : currentAnimFrame + 1; // jeez no fucking idea how to make this shit not go nuts with interpolation
}
}
//
@@ -1083,42 +1047,30 @@ void Y_VoteDrawer(void)
if (!voteclient.loaded)
return;
{
static angle_t rubyfloattime = 0;
rubyheight = FINESINE(rubyfloattime>>ANGLETOFINESHIFT);
rubyfloattime += FixedMul(ANGLE_MAX/NEWTICRATE, renderdeltatics);
}
static angle_t rubyfloattime = 0;
rubyheight = FINESINE(rubyfloattime>>ANGLETOFINESHIFT);
rubyfloattime += FixedMul(ANGLE_MAX/NEWTICRATE, renderdeltatics);
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
if (widebgpatch && vid.width / vid.dupx > 320) {
if(foundAnimVoteWideFrames == 0){
if (widebgpatch && vid.width / vid.dupx > 320)
{
if (foundAnimVoteWideFrames == 0)
V_DrawScaledPatch(((vid.width/2) / vid.dupx) - (SHORT(widebgpatch->width)/2),
(vid.height / vid.dupy) - SHORT(widebgpatch->height),
V_SNAPTOTOP|V_SNAPTOLEFT, widebgpatch);
} else {
// patch_t *currPatch = W_CachePatchName(va("%s%d", animPrefix, currentAnimFrame+1), PU_CACHE);
// V_DrawScaledPatch(((vid.width/2) / vid.dupx) - (SHORT(currPatch->width)/2), // Keep the width/height adjustments, for screens that are less wide than 320(?)
// (vid.height / vid.dupy) - SHORT(currPatch->height),
// V_SNAPTOTOP|V_SNAPTOLEFT, currPatch);
// if(votetic % 4 == 0 && !paused){
// currentAnimFrame = (currentAnimFrame+1 > foundAnimVoteFrames-1) ? 0 : currentAnimFrame + 1;
// }
else
Y_DrawAnimatedVoteScreenPatch(true);
}
} else {
if(foundAnimVoteFrames == 0) {
}
else
{
if (foundAnimVoteFrames == 0)
V_DrawScaledPatch(((vid.width/2) / vid.dupx) - (SHORT(bgpatch->width)/2), // Keep the width/height adjustments, for screens that are less wide than 320(?)
(vid.height / vid.dupy) - SHORT(bgpatch->height),
V_SNAPTOTOP|V_SNAPTOLEFT, bgpatch);
} else {
else
Y_DrawAnimatedVoteScreenPatch(false);
}
}
for (i = 0; i < 4; i++) // First, we need to figure out the height of this thing...
{