Merge remote-tracking branch 'origin/Saturn-Next' into absolutehell

This commit is contained in:
Alug committed 2024-09-14 21:01:08 +02:00
commit 4a8edff694
11 files changed
+939 -1305

No files matched your search

+12 -8
View File
@@ -1694,8 +1694,9 @@ static void SendNameAndColor(void)
cv_skin.value = R_SkinAvailable(cv_skin.string);
if (cv_skin.value < 0)
{
CV_StealthSet(&cv_skin, DEFAULTSKIN);
cv_skin.value = 0;
INT32 skinnum = players[consoleplayer].skin;
CV_StealthSet(&cv_skin, skins[skinnum].name);
cv_skin.value = skinnum;
}
// Finally write out the complete packet and send it off.
@@ -1823,8 +1824,9 @@ static void SendNameAndColor2(void)
cv_skin2.value = R_SkinAvailable(cv_skin2.string);
if (cv_skin2.value < 0)
{
CV_StealthSet(&cv_skin2, DEFAULTSKIN);
cv_skin2.value = 0;
INT32 skinnum = players[displayplayers[1]].skin;
CV_StealthSet(&cv_skin2, skins[skinnum].name);
cv_skin2.value = skinnum;
}
// Finally write out the complete packet and send it off.
@@ -1943,8 +1945,9 @@ static void SendNameAndColor3(void)
cv_skin3.value = R_SkinAvailable(cv_skin3.string);
if (cv_skin3.value < 0)
{
CV_StealthSet(&cv_skin3, DEFAULTSKIN);
cv_skin3.value = 0;
INT32 skinnum = players[displayplayers[2]].skin;
CV_StealthSet(&cv_skin3, skins[skinnum].name);
cv_skin3.value = skinnum;
}
// Finally write out the complete packet and send it off.
@@ -2071,8 +2074,9 @@ static void SendNameAndColor4(void)
cv_skin4.value = R_SkinAvailable(cv_skin4.string);
if (cv_skin4.value < 0)
{
CV_StealthSet(&cv_skin4, DEFAULTSKIN);
cv_skin4.value = 0;
INT32 skinnum = players[displayplayers[3]].skin;
CV_StealthSet(&cv_skin4, skins[skinnum].name);
cv_skin4.value = skinnum;
}
// Finally write out the complete packet and send it off.
+830 -761
View File
File diff suppressed because it is too large. Load diff
+30 -445
View File
@@ -2160,7 +2160,7 @@ static menuitem_t OP_SaturnMenu[] =
{IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 65},
{IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 70},
{IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 75}, // uwu
{IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 80}, // uwu
};
static const char* OP_SaturnTooltips[] =
@@ -2280,8 +2280,8 @@ static const char* OP_SaturnHudTooltips[] =
"Change what style the speedometer is.",
"Draw the Speedometer in Battle.",
"Displays the input display outside of Record Attack. Also adjusts the\nposition scale to match.",
"Enable the stat display.",
"Flash current Lap Time when doing a Lap on the Timer.",
"Enable the stat display.",
"Enable the use of the higher resolution want icons instead of rank\nfor some places.",
"Enable colourized hud.",
"Enable the colourized itembox when colourized hud is enabled.",
@@ -5219,185 +5219,26 @@ static void M_DrawGenericMenu(void)
// dumb hack
// tooltips
if (currentMenu == &OP_ControlsDef)
{
if (!(OP_ControlsTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_ControlsTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_MouseOptionsDef)
{
if (!(OP_MouseTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_MouseTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_VideoOptionsDef)
{
if (!(OP_VideoTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_VideoTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_SoundOptionsDef)
{
if (!(OP_SoundTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_SoundTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_SoundAdvancedDef)
{
if (!(OP_SoundAdvancedTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_SoundAdvancedTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_ChatOptionsDef)
{
if (!(OP_ChatOptionsTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_ChatOptionsTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_GameOptionsDef)
{
if (!(OP_GameTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_GameTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_ServerOptionsDef)
{
if (!(OP_ServerOptionsTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_ServerOptionsTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_AdvServerOptionsDef)
{
if (!(OP_AdvServerOptionsTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_AdvServerOptionsTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_PlayerDistortDef)
{
if (!(OP_PlayerDistortTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_PlayerDistortTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_SaturnCreditsDef) // C:
{
if (!(OP_CreditTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_CreditTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_BirdDef)
{
if (!(OP_BirdTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_BirdTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_TiltDef)
{
if (!(OP_TiltTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_TiltTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_AdvancedBirdDef)
{
if (!(OP_AdvancedBirdTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_AdvancedBirdTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_NametagDef)
{
if (!(OP_NametagTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_NametagTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_DriftGaugeDef)
{
if (!(OP_DriftGaugeTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_DriftGaugeTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_CamOptionsDef)
{
if (!(OP_CamOptionsTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_CamOptionsTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_Player1CamOptionsDef || currentMenu == &OP_Player2CamOptionsDef || currentMenu == &OP_Player3CamOptionsDef || currentMenu == &OP_Player4CamOptionsDef)
{
if (!(OP_PlayerCamOptionsTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_PlayerCamOptionsTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
// replaced with macro so it doesent look as terrible anymore lol
DoToolTips(OP_ControlsDef, OP_ControlsTooltips);
DoToolTips(OP_MouseOptionsDef, OP_MouseTooltips);
DoToolTips(OP_VideoOptionsDef, OP_VideoTooltips);
DoToolTips(OP_ExpOptionsDef, OP_ExpTooltips);
DoToolTips(OP_SoundOptionsDef, OP_SoundTooltips);
DoToolTips(OP_SoundAdvancedDef, OP_SoundAdvancedTooltips);
DoToolTips(OP_ChatOptionsDef, OP_ChatOptionsTooltips);
DoToolTips(OP_GameOptionsDef, OP_GameTooltips);
DoToolTips(OP_ServerOptionsDef, OP_ServerOptionsTooltips);
DoToolTips(OP_AdvServerOptionsDef, OP_AdvServerOptionsTooltips);
DoToolTips(OP_PlayerDistortDef, OP_PlayerDistortTooltips);
DoToolTips(OP_SaturnCreditsDef, OP_CreditTooltips); // C:
DoToolTips(OP_BirdDef, OP_BirdTooltips);
DoToolTips(OP_TiltDef, OP_TiltTooltips);
DoToolTips(OP_AdvancedBirdDef, OP_AdvancedBirdTooltips);
DoToolTips(OP_NametagDef, OP_NametagTooltips);
DoToolTips(OP_DriftGaugeDef, OP_DriftGaugeTooltips);
DoToolTips(OP_CamOptionsDef, OP_CamOptionsTooltips);
DoToolTips(OP_Player1CamOptionsDef || currentMenu == &OP_Player2CamOptionsDef || currentMenu == &OP_Player3CamOptionsDef || currentMenu == &OP_Player4CamOptionsDef, OP_PlayerCamOptionsTooltips); // god this one is still terrible lmao
}
static void M_DrawGenericBackgroundMenu(void)
@@ -5526,149 +5367,18 @@ static void M_DrawGenericScrollMenu(void)
V_DrawScaledPatch(currentMenu->x - 24, cursory, 0,
W_CachePatchName("M_CURSOR", PU_CACHE));
#ifdef HWRENDER
// dumb hack
// tooltips
if (currentMenu == &OP_OpenGLOptionsDef)
{
if (!(OP_OpenGLTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_OpenGLTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
// same macro here
#ifdef HWRENDER
DoToolTips(OP_OpenGLOptionsDef, OP_OpenGLTooltips);
#endif
if (currentMenu == &OP_ExpOptionsDef)
{
if (!(OP_ExpTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_ExpTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_SaturnDef)
{
if (!(OP_SaturnTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_SaturnTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_SaturnHudDef)
{
if (!(OP_SaturnHudTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_SaturnHudTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
DoToolTips(OP_SaturnDef, OP_SaturnTooltips);
DoToolTips(OP_SaturnHudDef, OP_SaturnHudTooltips);
}
static void M_DrawPauseMenu(void)
{
#if 0
if (!netgame && !multiplayer && (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_VOTING))
{
emblem_t *emblem_detail[3] = {NULL, NULL, NULL};
char emblem_text[3][20];
INT32 i;
M_DrawTextBox(27, 16, 32, 6);
// Draw any and all emblems at the top.
M_DrawMapEmblems(gamemap, 272, 28);
if (strlen(mapheaderinfo[gamemap-1]->zonttl) > 0)
{
if (strlen(mapheaderinfo[gamemap-1]->actnum) > 0)
V_DrawString(40, 28, highlightflags, va("%s %s %s", mapheaderinfo[gamemap-1]->lvlttl, mapheaderinfo[gamemap-1]->zonttl, mapheaderinfo[gamemap-1]->actnum));
else
V_DrawString(40, 28, highlightflags, va("%s %s", mapheaderinfo[gamemap-1]->lvlttl, mapheaderinfo[gamemap-1]->zonttl));
}
else
{
if (strlen(mapheaderinfo[gamemap-1]->actnum) > 0)
V_DrawString(40, 28, highlightflags, va("%s %s", mapheaderinfo[gamemap-1]->lvlttl, mapheaderinfo[gamemap-1]->actnum));
else
V_DrawString(40, 28, highlightflags, mapheaderinfo[gamemap-1]->lvlttl);
}
// Set up the detail boxes.
{
emblem_t *emblem = M_GetLevelEmblems(gamemap);
while (emblem)
{
INT32 emblemslot;
char targettext[9], currenttext[9];
switch (emblem->type)
{
case ET_TIME:
emblemslot = emblem->var; // dumb hack
snprintf(targettext, 9, "%i:%02i.%02i",
G_TicsToMinutes((tic_t)emblemslot, false),
G_TicsToSeconds((tic_t)emblemslot),
G_TicsToCentiseconds((tic_t)emblemslot));
emblemslot = (INT32)G_GetBestTime(gamemap); // dumb hack pt ii
if ((tic_t)emblemslot == UINT32_MAX)
snprintf(currenttext, 9, "-:--.--");
else
snprintf(currenttext, 9, "%i:%02i.%02i",
G_TicsToMinutes((tic_t)emblemslot, false),
G_TicsToSeconds((tic_t)emblemslot),
G_TicsToCentiseconds((tic_t)emblemslot));
targettext[8] = 0;
currenttext[8] = 0;
emblemslot = 1;
break;
default:
goto bademblem;
}
if (emblem_detail[emblemslot])
goto bademblem;
emblem_detail[emblemslot] = emblem;
snprintf(emblem_text[emblemslot], 20, "%8s /%8s", currenttext, targettext);
emblem_text[emblemslot][19] = 0;
bademblem:
emblem = M_GetLevelEmblems(-1);
}
}
for (i = 0; i < 3; ++i)
{
emblem_t *emblem = emblem_detail[i];
if (!emblem)
continue;
if (emblem->collected)
V_DrawSmallMappedPatch(40, 44 + (i*8), 0, W_CachePatchName(M_GetEmblemPatch(emblem), PU_CACHE),
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_MENUCACHE));
else
V_DrawSmallScaledPatch(40, 44 + (i*8), 0, W_CachePatchName("NEEDIT", PU_CACHE));
switch (emblem->type)
{
case ET_TIME:
V_DrawString(56, 44 + (i*8), highlightflags, "TIME:");
break;
}
V_DrawRightAlignedString(284, 44 + (i*8), V_MONOSPACE, emblem_text[i]);
}
}
#endif
#ifdef HAVE_DISCORDRPC
// kind of hackily baked in here
if (currentMenu == &MPauseDef && discordRequestList != NULL)
@@ -6853,8 +6563,9 @@ static void M_HandleAddons(INT32 choice)
case EXT_KART:
#endif
case EXT_PK3:
if (browselocalskins) {
if (DumbStartsWith("KC_", dirmenu[dir_on[menudepthleft]]+DIR_STRING) || DumbStartsWith("kc_", dirmenu[dir_on[menudepthleft]]+DIR_STRING)) {
if (browselocalskins)
{
if (DumbStartsWith("KC_", dirmenu[dir_on[menudepthleft]]+DIR_STRING) || 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));
errorshitspam = 0; // reset it so it can show the warning screen again lmao
@@ -8360,31 +8071,6 @@ static void M_DestroyRobots(INT32 choice)
M_StartMessage(M_GetText("Do you want to destroy all\nrobots in the current level?\n\n(Press 'Y' to confirm)\n"),M_DestroyRobotsResponse,MM_YESNO);
}
/*static void M_LevelSelectWarp(INT32 choice)
{
boolean fromloadgame = (currentMenu == &SP_LevelSelectDef);
(void)choice;
if (W_CheckNumForName(G_BuildMapName(cv_nextmap.value)) == LUMPERROR)
{
// CONS_Alert(CONS_WARNING, "Internal game map '%s' not found\n", G_BuildMapName(cv_nextmap.value));
return;
}
startmap = (INT16)(cv_nextmap.value);
fromlevelselect = true;
if (fromloadgame)
G_LoadGame((UINT32)cursaveslot, startmap);
else
{
cursaveslot = -1;
M_SetupChoosePlayer(0);
}
}*/
// ========
// SKY ROOM
// ========
@@ -8727,9 +8413,6 @@ static void scrollMusicName(const char name[], size_t len, size_t maxlen, char r
result[maxlen] = 0;
}
//static patch_t* st_radio[9];
//static patch_t* st_launchpad[4];
static void M_MusicTest(INT32 choice)
{
(void)choice;
@@ -9319,51 +9002,6 @@ void M_DrawTimeAttackMenu(void)
V_DrawRightAlignedString(292, 80, highlightflags, "BEST TIME:");
K_drawKartTimestamp(time, 162, 86, cv_nextmap.value, 1);
}
/*{
char beststr[40];
emblem_t *em;
if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->time)
sprintf(beststr, "(none)");
else
sprintf(beststr, "%i:%02i.%02i", G_TicsToMinutes(mainrecords[cv_nextmap.value-1]->time, true),
G_TicsToSeconds(mainrecords[cv_nextmap.value-1]->time),
G_TicsToCentiseconds(mainrecords[cv_nextmap.value-1]->time));
V_DrawString(64, y+48, highlightflags, "BEST TIME:");
V_DrawRightAlignedString(BASEVIDWIDTH - 64 - 24 - 8, y+48, V_ALLOWLOWERCASE, beststr);
if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->lap)
sprintf(beststr, "(none)");
else
sprintf(beststr, "%i:%02i.%02i", G_TicsToMinutes(mainrecords[cv_nextmap.value-1]->lap, true),
G_TicsToSeconds(mainrecords[cv_nextmap.value-1]->lap),
G_TicsToCentiseconds(mainrecords[cv_nextmap.value-1]->lap));
V_DrawString(64, y+56, highlightflags, "BEST LAP:");
V_DrawRightAlignedString(BASEVIDWIDTH - 64 - 24 - 8, y+56, V_ALLOWLOWERCASE, beststr);
// Draw record emblems.
em = M_GetLevelEmblems(cv_nextmap.value);
while (em)
{
switch (em->type)
{
case ET_TIME: break;
default:
goto skipThisOne;
}
if (em->collected)
V_DrawMappedPatch(BASEVIDWIDTH - 64 - 24, y+48, 0, W_CachePatchName(M_GetEmblemPatch(em), PU_CACHE),
R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_MENUCACHE));
else
V_DrawScaledPatch(BASEVIDWIDTH - 64 - 24, y+48, 0, W_CachePatchName("NEEDIT", PU_CACHE));
skipThisOne:
em = M_GetLevelEmblems(-1);
}
}*/
// ALWAYS DRAW player name, level name, skin and color even when not on this menu!
if (currentMenu != &SP_TimeAttackDef)
@@ -10440,8 +10078,6 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
rubyfloattime += FixedMul(ANGLE_MAX/NEWTICRATE, renderdeltatics);
}
}
/*V_DrawDiag(x, y, 12, 31);
V_DrawDiag(x, y, 10, G_GetGametypeColor(cv_newgametype.value));*/
y += i/4;
i = cv_nextmap.value - 1;
@@ -12482,22 +12118,13 @@ static void M_Setup1PControlsMenu(INT32 choice)
// Unhide P1-only controls
OP_AllControlsMenu[15].status = IT_CONTROL; // Chat
//OP_AllControlsMenu[16].status = IT_CONTROL; // Team-chat
OP_AllControlsMenu[16].status = IT_CONTROL; // Rankings
//OP_AllControlsMenu[17].status = IT_CONTROL; // Viewpoint
// 18 is Reset Camera, 19 is Toggle Chasecam
OP_AllControlsMenu[20].status = IT_CONTROL; // Pause
OP_AllControlsMenu[21].status = IT_CONTROL; // Screenshot
OP_AllControlsMenu[22].status = IT_CONTROL; // GIF
OP_AllControlsMenu[23].status = IT_CONTROL; // System Menu
OP_AllControlsMenu[24].status = IT_CONTROL; // Console
/*OP_AllControlsMenu[25].status = IT_HEADER; // Spectator Controls header
OP_AllControlsMenu[26].status = IT_SPACE; // Spectator Controls space
OP_AllControlsMenu[27].status = IT_CONTROL; // Spectate
OP_AllControlsMenu[28].status = IT_CONTROL; // Look Up
OP_AllControlsMenu[29].status = IT_CONTROL; // Look Down
OP_AllControlsMenu[30].status = IT_CONTROL; // Center View
*/
M_SetupNextMenu(&OP_AllControlsDef);
}
@@ -12514,22 +12141,13 @@ static void M_Setup2PControlsMenu(INT32 choice)
// Hide P1-only controls
OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
//OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Team-chat
OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
//OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Viewpoint
// 18 is Reset Camera, 19 is Toggle Chasecam
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
/*OP_AllControlsMenu[25].status = IT_GRAYEDOUT2; // Spectator Controls header
OP_AllControlsMenu[26].status = IT_GRAYEDOUT2; // Spectator Controls space
OP_AllControlsMenu[27].status = IT_GRAYEDOUT2; // Spectate
OP_AllControlsMenu[28].status = IT_GRAYEDOUT2; // Look Up
OP_AllControlsMenu[29].status = IT_GRAYEDOUT2; // Look Down
OP_AllControlsMenu[30].status = IT_GRAYEDOUT2; // Center View
*/
M_SetupNextMenu(&OP_AllControlsDef);
}
@@ -12546,22 +12164,13 @@ static void M_Setup3PControlsMenu(INT32 choice)
// Hide P1-only controls
OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
//OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Team-chat
OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
//OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Viewpoint
// 18 is Reset Camera, 19 is Toggle Chasecam
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
/*OP_AllControlsMenu[25].status = IT_GRAYEDOUT2; // Spectator Controls header
OP_AllControlsMenu[26].status = IT_GRAYEDOUT2; // Spectator Controls space
OP_AllControlsMenu[27].status = IT_GRAYEDOUT2; // Spectate
OP_AllControlsMenu[28].status = IT_GRAYEDOUT2; // Look Up
OP_AllControlsMenu[29].status = IT_GRAYEDOUT2; // Look Down
OP_AllControlsMenu[30].status = IT_GRAYEDOUT2; // Center View
*/
M_SetupNextMenu(&OP_AllControlsDef);
}
@@ -12578,22 +12187,13 @@ static void M_Setup4PControlsMenu(INT32 choice)
// Hide P1-only controls
OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
//OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Team-chat
OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
//OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Viewpoint
// 18 is Reset Camera, 19 is Toggle Chasecam
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
/*OP_AllControlsMenu[25].status = IT_GRAYEDOUT2; // Spectator Controls header
OP_AllControlsMenu[26].status = IT_GRAYEDOUT2; // Spectator Controls space
OP_AllControlsMenu[27].status = IT_GRAYEDOUT2; // Spectate
OP_AllControlsMenu[28].status = IT_GRAYEDOUT2; // Look Up
OP_AllControlsMenu[29].status = IT_GRAYEDOUT2; // Look Down
OP_AllControlsMenu[30].status = IT_GRAYEDOUT2; // Center View
*/
M_SetupNextMenu(&OP_AllControlsDef);
}
@@ -12611,11 +12211,6 @@ static void M_DrawControl(void)
x = currentMenu->x;
y = currentMenu->y;
/*i = itemOn - (controlheight/2);
if (i < 0)
i = 0;
*/
iter = (controlheight/2);
for (i = itemOn; ((iter || currentMenu->menuitems[i].status == IT_GRAYEDOUT2) && i > 0); i--)
{
@@ -12642,16 +12237,6 @@ static void M_DrawControl(void)
}
}
/*max = i + controlheight;
if (max > currentMenu->numitems)
{
max = currentMenu->numitems;
if (max < controlheight)
i = 0;
else
i = max - controlheight;
}*/
// draw title (or big pic)
M_DrawMenuTitle();
+11
View File
@@ -403,4 +403,15 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
{NULL}\
}
#define DoToolTips(menu, tooltip)\
if (currentMenu == &menu)\
{\
if (!(tooltip[itemOn] == NULL))\
{\
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, tooltip[itemOn], coolalphatimer);\
if (coolalphatimer > 0 && interpTimerHackAllow)\
coolalphatimer--;\
}\
}
#endif //__X_MENU__
+17 -9
View File
@@ -915,7 +915,7 @@ static void P_PlayerFlip(mobj_t *mo)
for (i = 0; i <= splitscreen; i++)
{
if (!(mo->player-players == displayplayers[i]))
if (mo->player-players != displayplayers[i])
continue;
localaiming[i] = mo->player->aiming;
@@ -1236,7 +1236,7 @@ static void P_PushableCheckBustables(mobj_t *mo)
if (!node->m_sector)
break;
if (!(node->m_sector->ffloors))
if (!node->m_sector->ffloors)
continue;
ffloor_t *rover;
@@ -3301,7 +3301,7 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
{
for (i = 0; i <= splitscreen; i++)
{
if (!(player == &players[displayplayers[i]]))
if (player != &players[displayplayers[i]])
continue;
postimgtype[i] = postimg;
@@ -5424,7 +5424,7 @@ mobj_t *P_GetClosestAxis(mobj_t *source)
mo2 = (mobj_t *)th;
if (!(mo2->type == MT_AXIS))
if (mo2->type != MT_AXIS)
continue;
if (closestaxis == NULL)
@@ -7237,11 +7237,17 @@ void P_MobjThinker(mobj_t *mobj)
P_SetTarget(&mobj->target, NULL);
for (i = 0; i < MAXPLAYERS; i++)
{
if (!(playeringame[i] && players[i].mo
&& players[i].mare == mobj->threshold && players[i].health > 1))
if (!playeringame[i] || !players[i].mo)
continue;
if (players[i].mare != mobj->threshold)
continue;
if (!(players[i].health > 1))
continue;
fixed_t dist = P_AproxDistance(players[i].mo->x - mobj->x, players[i].mo->y - mobj->y);
if (!(dist < shortest))
continue;
@@ -10378,7 +10384,7 @@ void P_PrecipitationEffects(void)
for (y = yl; y >= yl && y <= yh; y += FRACUNIT*64)
for (x = xl; x >= xl && x <= xh; x += FRACUNIT*64)
{
if (!(R_PointInSubsector(x, y)->sector->ceilingpic == skyflatnum)) // Found the outdoors!
if (R_PointInSubsector(x, y)->sector->ceilingpic != skyflatnum) // Found the outdoors!
continue;
newdist = S_CalculateSoundDistance(players[displayplayers[0]].mo->x, players[displayplayers[0]].mo->y, 0, x, y, 0);
@@ -10772,8 +10778,10 @@ void P_AfterPlayerSpawn(INT32 playernum)
if (!camera[i].chase)
continue;
if (displayplayers[i] == playernum)
P_ResetCamera(p, &camera[i]);
if (displayplayers[i] != playernum)
continue;
P_ResetCamera(p, &camera[i]);
}
if (CheckForReverseGravity)
+18 -52
View File
@@ -1553,28 +1553,27 @@ void Polyobj_InitLevel(void)
{
if (th->function.acp1 != (actionf_p1)P_MobjThinker)
continue;
mobj_t *mo = (mobj_t *)th;
if (mo->info->doomednum == POLYOBJ_SPAWN_DOOMEDNUM ||
mo->info->doomednum == POLYOBJ_SPAWNCRUSH_DOOMEDNUM)
{
mobj_t *mo = (mobj_t *)th;
++numPolyObjects;
if (mo->info->doomednum == POLYOBJ_SPAWN_DOOMEDNUM ||
mo->info->doomednum == POLYOBJ_SPAWNCRUSH_DOOMEDNUM)
{
++numPolyObjects;
qitem = malloc(sizeof(mobjqitem_t));
memset(qitem, 0, sizeof(mobjqitem_t));
qitem->mo = mo;
M_QueueInsert(&(qitem->mqitem), &spawnqueue);
}
else if (mo->info->doomednum == POLYOBJ_ANCHOR_DOOMEDNUM)
{
++numAnchors;
qitem = malloc(sizeof(mobjqitem_t));
memset(qitem, 0, sizeof(mobjqitem_t));
qitem->mo = mo;
M_QueueInsert(&(qitem->mqitem), &spawnqueue);
}
else if (mo->info->doomednum == POLYOBJ_ANCHOR_DOOMEDNUM)
{
++numAnchors;
qitem = malloc(sizeof(mobjqitem_t));
memset(qitem, 0, sizeof(mobjqitem_t));
qitem->mo = mo;
M_QueueInsert(&(qitem->mqitem), &anchorqueue);
}
qitem = malloc(sizeof(mobjqitem_t));
memset(qitem, 0, sizeof(mobjqitem_t));
qitem->mo = mo;
M_QueueInsert(&(qitem->mqitem), &anchorqueue);
}
}
@@ -1615,39 +1614,6 @@ void Polyobj_InitLevel(void)
Polyobj_linkToBlockmap(&PolyObjects[i]);
}
#if 0
// haleyjd 02/22/06: temporary debug
printf("DEBUG: numPolyObjects = %d\n", numPolyObjects);
for (i = 0; i < numPolyObjects; ++i)
{
INT32 j;
polyobj_t *po = &PolyObjects[i];
printf("polyobj %d:\n", i);
printf("id = %d, first = %d, next = %d\n", po->id, po->first, po->next);
printf("segCount = %d, numSegsAlloc = %d\n", po->segCount, po->numSegsAlloc);
for (j = 0; j < po->segCount; ++j)
printf("\tseg %d: %p\n", j, po->segs[j]);
printf("numVertices = %d, numVerticesAlloc = %d\n", po->numVertices, po->numVerticesAlloc);
for (j = 0; j < po->numVertices; ++j)
{
printf("\tvtx %d: (%d, %d) / orig: (%d, %d)\n",
j, po->vertices[j]->x>>FRACBITS, po->vertices[j]->y>>FRACBITS,
po->origVerts[j].x>>FRACBITS, po->origVerts[j].y>>FRACBITS);
}
printf("numLines = %d, numLinesAlloc = %d\n", po->numLines, po->numLinesAlloc);
for (j = 0; j < po->numLines; ++j)
printf("\tline %d: %p\n", j, po->lines[j]);
printf("spawnSpot = (%d, %d)\n", po->spawnSpot.x >> FRACBITS, po->spawnSpot.y >> FRACBITS);
printf("centerPt = (%d, %d)\n", po->centerPt.x >> FRACBITS, po->centerPt.y >> FRACBITS);
printf("attached = %d, linked = %d, validcount = %d, isBad = %d\n",
po->attached, po->linked, po->validcount, po->isBad);
printf("blockbox: [%d, %d, %d, %d]\n",
po->blockbox[BOXLEFT], po->blockbox[BOXRIGHT], po->blockbox[BOXBOTTOM],
po->blockbox[BOXTOP]);
}
#endif
// done with mobj queues
M_QueueFree(&spawnqueue);
M_QueueFree(&anchorqueue);
+7 -3
View File
@@ -1905,6 +1905,7 @@ mobj_t *P_FindNewPosition(UINT32 oldposition)
continue;
mobj = (mobj_t *)th;
if (mobj->mobjnum != oldposition)
continue;
@@ -2911,10 +2912,9 @@ static void P_NetUnArchiveThinkers(void)
continue;
delay = (void *)currentthinker;
if (!(mobjnum = (UINT32)(size_t)delay->caller))
continue;
delay->caller = P_FindNewPosition(mobjnum);
if ((mobjnum = (UINT32)(size_t)delay->caller))
delay->caller = P_FindNewPosition(mobjnum);
}
}
}
@@ -3025,6 +3025,7 @@ static inline void P_FinishMobjs(void)
{
if (currentthinker->function.acp1 != (actionf_p1)P_MobjThinker)
continue;
mobj = (mobj_t *)currentthinker;
mobj->info = &mobjinfo[mobj->type];
}
@@ -3502,9 +3503,12 @@ void P_SaveNetGame(boolean resending)
{
if (th->function.acp1 != (actionf_p1)P_MobjThinker)
continue;
mobj = (mobj_t *)th;
if (mobj->type == MT_HOOP || mobj->type == MT_HOOPCOLLIDE || mobj->type == MT_HOOPCENTER)
continue;
mobj->mobjnum = i++;
}
}
+3 -5
View File
@@ -3060,11 +3060,9 @@ boolean P_IsFlagAtBase(mobjtype_t flag)
if (GETSECSPECIAL(rover->master->frontsector->special, 4) != specialnum)
continue;
if (!(mo->z <= P_GetSpecialTopZ(mo, sectors + rover->secnum, mo->subsector->sector)
&& mo->z >= P_GetSpecialBottomZ(mo, sectors + rover->secnum, mo->subsector->sector)))
continue;
return true;
if (mo->z <= P_GetSpecialTopZ(mo, sectors + rover->secnum, mo->subsector->sector)
&& mo->z >= P_GetSpecialBottomZ(mo, sectors + rover->secnum, mo->subsector->sector))
return true;
}
}
}
+10 -7
View File
@@ -266,7 +266,10 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
for (i = 0; i <= splitscreen; i++)
{
if (!(viewplayer == &players[displayplayers[i]] && camera[i].chase))
if (viewplayer != &players[displayplayers[i]])
continue;
if (!camera[i].chase)
continue;
heightsec = R_PointInSubsector(camera[i].x, camera[i].y)->sector->heightsec;
@@ -1167,13 +1170,13 @@ void R_Prep3DFloors(sector_t *sector)
count = 1;
for (rover = sector->ffloors; rover; rover = rover->next)
{
if (!((rover->flags & FF_EXISTS) && (!(rover->flags & FF_NOSHADE)
|| (rover->flags & FF_CUTLEVEL) || (rover->flags & FF_CUTSPRITES))))
continue;
count++;
if (rover->flags & FF_DOUBLESHADOW)
if ((rover->flags & FF_EXISTS) && (!(rover->flags & FF_NOSHADE)
|| (rover->flags & FF_CUTLEVEL) || (rover->flags & FF_CUTSPRITES)))
{
count++;
if (rover->flags & FF_DOUBLESHADOW)
count++;
}
}
if (count != sector->numlights)
+1 -1
View File
@@ -429,7 +429,7 @@ void R_LoadTextures(void)
}
// Add all the textures between TX_START and TX_END
if (!(texstart != INT16_MAX && texend != INT16_MAX))
if (texstart == INT16_MAX && texend == INT16_MAX)
continue;
// PK3s have subfolders, so we can't just make a simple sum
-14
View File
@@ -1961,20 +1961,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (viewsector != frontsector && viewsector != backsector)
{
if (worldhigh <= worldbottom && worldhighslope <= worldbottomslope)
{
ds_p->sprbottomclip = negonearray;
ds_p->bsilheight = INT32_MAX;
ds_p->silhouette |= SIL_BOTTOM;
}
if (worldlow >= worldtop && worldlowslope >= worldtopslope)
{
ds_p->sprtopclip = screenheightarray;
ds_p->tsilheight = INT32_MIN;
ds_p->silhouette |= SIL_TOP;
}
//SoM: 3/25/2000: This code fixes an automap bug that didn't check
// frontsector->ceiling and backsector->floor to see if a door was closed.
// Without the following code, sprites get displayed behind closed doors.