Merge branch 'cleanedupcharpicker' into stacking-dev
Merge the new character select menu I created
This commit is contained in:
1 parent
03fb7fd145
commit
0b59c156a0
6 files changed
+220
-28
No files matched your search
@@ -920,6 +920,7 @@ boolean clr_hud; // colour hud check
|
||||
boolean big_lap; // bigger lap counter
|
||||
boolean big_lap_color; // bigger lap counter but colour
|
||||
boolean kartzspeedo; // kartZ speedometer
|
||||
boolean statdp; // New stat
|
||||
|
||||
static void IdentifyVersion(void)
|
||||
{
|
||||
@@ -1301,6 +1302,12 @@ void D_SRB2Main(void)
|
||||
"K_KZSP13", "K_KZSP14", "K_KZSP15", "K_KZSP16", "K_KZSP17", "K_KZSP18", "K_KZSP19", \
|
||||
"K_KZSP20", "K_KZSP21", "K_KZSP22", "K_KZSP23", "K_KZSP24", "K_KZSP25", NULL))
|
||||
kartzspeedo = true;
|
||||
|
||||
|
||||
// new stat
|
||||
if (W_CheckMultipleLumps("K_STATNB", "K_STATN1", "K_STATN2", "K_STATN3", "K_STATN4", \
|
||||
"K_STATN5", "K_STATN6", NULL))
|
||||
statdp = true;
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
@@ -33,6 +33,8 @@ extern boolean clr_hud; // colour hud check
|
||||
extern boolean big_lap; // bigger lap counter
|
||||
extern boolean big_lap_color; //bigger lap counter but colour
|
||||
extern boolean kartzspeedo; //kartZ speedo
|
||||
extern boolean statdp; //kartZ speedo
|
||||
|
||||
|
||||
// the infinite loop of D_SRB2Loop() called from win_main for windows version
|
||||
void D_SRB2Loop(void) FUNCNORETURN;
|
||||
|
||||
+2
-2
@@ -529,8 +529,8 @@ consvar_t cv_ps_descriptor = {"ps_descriptor", "Average", 0, ps_descriptor_cons_
|
||||
|
||||
consvar_t cv_showtrackaddon = {"showtrackaddon", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
static CV_PossibleValue_t skinselectmenu_t[] = {{SKINMENUTYPE_SCROLL, "Scroll"}, {SKINMENUTYPE_2D, "2d"}, {SKINMENUTYPE_GRID, "Grid"}, {0, NULL}};
|
||||
consvar_t cv_skinselectmenu = {"skinselectmenu", "Grid", CV_SAVE, skinselectmenu_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
static CV_PossibleValue_t skinselectmenu_t[] = {{SKINMENUTYPE_SCROLL, "Scroll"}, {SKINMENUTYPE_2D, "2d"}, {SKINMENUTYPE_GRID, "Grid"}, {SKINMENUTYPE_EXTENDED, "Extended"}, {0, NULL}};
|
||||
consvar_t cv_skinselectmenu = {"skinselectmenu", "Extended", CV_SAVE, skinselectmenu_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
static CV_PossibleValue_t skinselectgridsort_t[] ={
|
||||
{ SKINMENUSORT_REALNAME, "Real name" },
|
||||
|
||||
+2
-1
@@ -186,7 +186,8 @@ typedef enum
|
||||
{
|
||||
SKINMENUTYPE_SCROLL = 0,
|
||||
SKINMENUTYPE_2D, // 1
|
||||
SKINMENUTYPE_GRID // 2
|
||||
SKINMENUTYPE_GRID, // 2
|
||||
SKINMENUTYPE_EXTENDED // 3
|
||||
} skinmenutype_t;
|
||||
|
||||
typedef enum
|
||||
|
||||
+206
-25
@@ -1096,7 +1096,7 @@ static menuitem_t MP_OfflineServerMenu[] =
|
||||
|
||||
{IT_WHITESTRING|IT_CALL, NULL, "Start", M_StartServer, 130},
|
||||
};
|
||||
|
||||
//Char select
|
||||
static menuitem_t MP_PlayerSetupMenu[] =
|
||||
{
|
||||
{IT_KEYHANDLER | IT_STRING, NULL, "Name", M_HandleSetupMultiPlayer, 0},
|
||||
@@ -1104,6 +1104,9 @@ static menuitem_t MP_PlayerSetupMenu[] =
|
||||
{IT_KEYHANDLER | IT_STRING, NULL, "Color", M_HandleSetupMultiPlayer, 152},
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
#ifndef NONET
|
||||
static menuitem_t MP_ConnectMenu[] =
|
||||
{
|
||||
@@ -10934,6 +10937,9 @@ static boolean setupm_skinlockedselect;
|
||||
#define SKINGRIDWIDTH 8
|
||||
#define SKINGRIDHEIGHT 6
|
||||
|
||||
#define SKINGRIDNEWWIDTH 8
|
||||
#define SKINGRIDNEWHEIGHT 9
|
||||
|
||||
static char *sortNames[] = {
|
||||
"Name",
|
||||
"Internal name",
|
||||
@@ -10975,9 +10981,12 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
||||
// use generic drawer for cursor, items and title
|
||||
M_DrawGenericMenu();
|
||||
|
||||
// draw name string
|
||||
// Offsets
|
||||
switch (cv_skinselectmenu.value)
|
||||
{
|
||||
case SKINMENUTYPE_EXTENDED:
|
||||
nameboxaddy = 6;
|
||||
break;
|
||||
case SKINMENUTYPE_GRID:
|
||||
nameboxaddy = 6;
|
||||
break;
|
||||
@@ -10986,6 +10995,8 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
|
||||
M_DrawTextBox(mx + 32, my - 8 + nameboxaddy, MAXPLAYERNAME, 1);
|
||||
V_DrawString(mx + 40, my + nameboxaddy, V_ALLOWLOWERCASE, setupm_name);
|
||||
|
||||
@@ -10997,6 +11008,32 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
||||
st = V_StringWidth(skins[setupm_fakeskin].realname, 0);
|
||||
switch (cv_skinselectmenu.value)
|
||||
{
|
||||
case SKINMENUTYPE_EXTENDED:
|
||||
#define GETSELECTEDSKINNAME (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].realname : skins[setupm_fakeskin].realname)
|
||||
#define GETSELECTEDSPEED (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartspeed : skins[setupm_fakeskin].kartspeed)
|
||||
#define GETSELECTEDWEIGHT (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartweight : skins[setupm_fakeskin].kartweight)
|
||||
|
||||
int statoffset = 0;
|
||||
tw = V_StringWidth("Character", 0);//V_StringWidth(GETSELECTEDSKINNAME, 0);
|
||||
st = V_StringWidth(GETSELECTEDSKINNAME, 0);
|
||||
|
||||
INT32 selectedskin = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
|
||||
speed = skins[selectedskin].kartspeed;
|
||||
weight = skins[selectedskin].kartweight;
|
||||
|
||||
V_DrawString((mx+(tw/2)) - (st/2), my + 37,
|
||||
((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0) | highlightflags | V_ALLOWLOWERCASE,
|
||||
GETSELECTEDSKINNAME);
|
||||
if (statdp == true)
|
||||
statoffset = 50;
|
||||
else
|
||||
statoffset = 113;
|
||||
|
||||
V_DrawString(statx - statoffset, staty - 10, V_6WIDTHSPACE, va("\x84%dS \x87%dW", GETSELECTEDSPEED, GETSELECTEDWEIGHT));
|
||||
#undef GETSELECTEDSKINNAME
|
||||
#undef GETSELECTEDSPEED
|
||||
#undef GETSELECTEDWEIGHT
|
||||
break;
|
||||
case SKINMENUTYPE_GRID:
|
||||
#define GETSELECTEDSKINNAME (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].realname : skins[setupm_fakeskin].realname)
|
||||
tw = V_StringWidth("Character", 0);//V_StringWidth(GETSELECTEDSKINNAME, 0);
|
||||
@@ -11047,6 +11084,16 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
||||
st = V_StringWidth(KartColor_Names[setupm_fakecolor], 0);
|
||||
switch (cv_skinselectmenu.value)
|
||||
{
|
||||
case SKINMENUTYPE_EXTENDED:
|
||||
V_DrawString(mx, my + 164, highlightflags | V_ALLOWLOWERCASE, KartColor_Names[setupm_fakecolor]); // SRB2kart
|
||||
if (itemOn == 2)
|
||||
{
|
||||
V_DrawCharacter(mx - 10/* - st*/ - (skullAnimCounter/5), my + 164,
|
||||
'\x1C' | highlightflags, false); // left arrow
|
||||
V_DrawCharacter(mx + 2 + st + (skullAnimCounter/5), my + 164,
|
||||
'\x1D' | highlightflags, false); // right arrow
|
||||
}
|
||||
break;
|
||||
case SKINMENUTYPE_GRID:
|
||||
case SKINMENUTYPE_2D:
|
||||
V_DrawString(mx, my + 152, highlightflags | V_ALLOWLOWERCASE, KartColor_Names[setupm_fakecolor]); // SRB2kart
|
||||
@@ -11074,6 +11121,52 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
||||
|
||||
switch (cv_skinselectmenu.value)
|
||||
{
|
||||
case SKINMENUTYPE_EXTENDED:
|
||||
// SRB2Kart: draw the stat backer
|
||||
//This is where stats and shit would go.
|
||||
// gonna put the sorttype here as well
|
||||
V_DrawSmallString(statx-3, staty-37, V_6WIDTHSPACE|highlightflags, "Sort:");
|
||||
V_DrawSmallString(statx+17, staty-37, V_6WIDTHSPACE|highlightflags, sortNames[cv_skinselectgridsort.value]);
|
||||
if (itemOn == 1)
|
||||
V_DrawSmallString(statx+101, staty-37, V_6WIDTHSPACE|highlightflags, "BS: change");
|
||||
|
||||
#define GETSELECTEDSPEED (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartspeed : skins[setupm_fakeskin].kartspeed)
|
||||
#define GETSELECTEDWEIGHT (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartweight : skins[setupm_fakeskin].kartweight)
|
||||
|
||||
if (statdp == true)
|
||||
{
|
||||
int i;
|
||||
//Background
|
||||
V_DrawScaledPatch(statx - 50, staty + 4, 0, W_CachePatchName("K_STATNB", PU_CACHE));
|
||||
|
||||
//Speed
|
||||
for (i = 0; i < GETSELECTEDSPEED; i++) // draw the stat bars
|
||||
{
|
||||
if (i == 0)
|
||||
V_DrawScaledPatch(statx - 45, staty + 63, 0, W_CachePatchName("K_STATN1", PU_CACHE));
|
||||
else if (i == GETSELECTEDSPEED -1 )
|
||||
V_DrawScaledPatch(statx - 45, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN3", PU_CACHE));
|
||||
else
|
||||
V_DrawScaledPatch(statx - 45, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN2", PU_CACHE));
|
||||
}
|
||||
|
||||
//Weight
|
||||
for (i = 0; i < GETSELECTEDWEIGHT; i++) // draw the stat bars
|
||||
{
|
||||
|
||||
if (i == 0)
|
||||
V_DrawScaledPatch(statx - 30, staty + 63, 0, W_CachePatchName("K_STATN4", PU_CACHE));
|
||||
else if (i == GETSELECTEDWEIGHT -1)
|
||||
V_DrawScaledPatch(statx - 30, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN6", PU_CACHE));
|
||||
else
|
||||
V_DrawScaledPatch(statx - 30, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN5", PU_CACHE));
|
||||
}
|
||||
}
|
||||
#undef GETSELECTEDSPEED
|
||||
#undef GETSELECTEDWEIGHT
|
||||
|
||||
|
||||
break;
|
||||
case SKINMENUTYPE_GRID:
|
||||
// SRB2Kart: draw the stat backer
|
||||
// labels
|
||||
@@ -11160,6 +11253,47 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
||||
|
||||
switch (cv_skinselectmenu.value)
|
||||
{
|
||||
//Skin grid stuff
|
||||
case SKINMENUTYPE_EXTENDED:
|
||||
int gridyoffset = 10;
|
||||
for (s = 0; s < SKINGRIDNEWWIDTH*SKINGRIDNEWHEIGHT; s++)
|
||||
{
|
||||
INT32 x = ((s % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
||||
INT32 y = ((s / SKINGRIDNEWWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2)) + gridyoffset); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
||||
INT32 calcs = s + (setupm_skinypos * SKINGRIDNEWWIDTH);
|
||||
INT32 skinn;
|
||||
patch_t *face;
|
||||
UINT8 *cmap;
|
||||
|
||||
if (calcs < numskins)
|
||||
skinn = skinsorted[calcs];
|
||||
else if (s % SKINGRIDNEWWIDTH == 0)
|
||||
break; //really conveniant place to break out here
|
||||
else
|
||||
{
|
||||
V_DrawFill(x, y, 16, 16, 239);
|
||||
continue;
|
||||
}
|
||||
|
||||
face = facerankprefix[skinn];
|
||||
cmap = R_GetTranslationColormap(skinn, skins[skinn].prefcolor, GTC_MENUCACHE);
|
||||
|
||||
V_DrawFixedPatch(x << FRACBITS, y << FRACBITS, FRACUNIT, 0, face, cmap);
|
||||
}
|
||||
|
||||
if (itemOn == 1) //has to be on skin select part
|
||||
{
|
||||
patch_t *cursor;
|
||||
INT32 curx = (((setupm_skinselect % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH/2)) + SKINXSHIFT) + 20;
|
||||
INT32 cury = (((setupm_skinselect / SKINGRIDNEWWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2))+ gridyoffset);
|
||||
|
||||
UINT8 cursorframe = (I_GetTime() / 4) % 7;
|
||||
|
||||
cursor = W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_CACHE);
|
||||
V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
|
||||
}
|
||||
|
||||
break;
|
||||
case SKINMENUTYPE_GRID:
|
||||
for (s = 0; s < SKINGRIDWIDTH*SKINGRIDHEIGHT; s++)
|
||||
{
|
||||
@@ -11294,7 +11428,11 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
||||
#define charw 72
|
||||
#define indexwidth 8
|
||||
{
|
||||
const INT32 colwidth = ((BASEVIDWIDTH-(2*mx))-charw)/(2*indexwidth);
|
||||
INT32 colwidth = ((BASEVIDWIDTH-(2*mx))-charw)/(2*indexwidth);
|
||||
|
||||
if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
|
||||
colwidth = colwidth - 10;
|
||||
|
||||
INT32 j = -colwidth;
|
||||
INT16 col = setupm_fakecolor - colwidth;
|
||||
INT32 x = mx;
|
||||
@@ -11397,6 +11535,13 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
||||
else
|
||||
sprdef = &skins[0].spritedef;
|
||||
break;
|
||||
case SKINMENUTYPE_EXTENDED:
|
||||
skintodisplay = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
|
||||
if (R_SkinAvailable(skins[skintodisplay].name) != -1)
|
||||
sprdef = &skins[R_SkinAvailable(skins[skintodisplay].name)].spritedef;
|
||||
else
|
||||
sprdef = &skins[0].spritedef;
|
||||
break;
|
||||
case SKINMENUTYPE_GRID:
|
||||
skintodisplay = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
|
||||
if (R_SkinAvailable(skins[skintodisplay].name) != -1)
|
||||
@@ -11485,15 +11630,22 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
S_StartSound(NULL,sfx_menu1); // Tails
|
||||
break;
|
||||
}
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_GRID) //grid skin select menu
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED) //grid skin select menu
|
||||
{
|
||||
if (itemOn == 1) //if we are on the skin select menu
|
||||
{
|
||||
if (setupm_skinselect < ROUNDSKINSUPTO8 - SKINGRIDWIDTH) //if we arent at the bottom of the menu
|
||||
{
|
||||
setupm_skinselect += SKINGRIDWIDTH;
|
||||
if (setupm_skinselect >= ((setupm_skinypos-1)+SKINGRIDHEIGHT)*8 && setupm_skinypos < (ROUNDSKINSUPTO8/8)-SKINGRIDHEIGHT)
|
||||
setupm_skinypos++;
|
||||
|
||||
if (cv_skinselectmenu.value == SKINMENUTYPE_GRID){
|
||||
if (setupm_skinselect >= ((setupm_skinypos-1)+SKINGRIDHEIGHT)*8 && setupm_skinypos < (ROUNDSKINSUPTO8/8)-SKINGRIDHEIGHT)
|
||||
setupm_skinypos++;
|
||||
}
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED){
|
||||
if (setupm_skinselect >= ((setupm_skinypos-1)+SKINGRIDHEIGHT)*8+24 && setupm_skinypos < (ROUNDSKINSUPTO8/8)-SKINGRIDHEIGHT+24)
|
||||
setupm_skinypos++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -11532,7 +11684,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
S_StartSound(NULL,sfx_menu1); // Tails
|
||||
break;
|
||||
}
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_GRID)
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
|
||||
{
|
||||
if (itemOn == 1)
|
||||
{
|
||||
@@ -11551,8 +11703,16 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
else if (itemOn == 2)
|
||||
{
|
||||
setupm_skinselect = numskins - 1;
|
||||
setupm_skinypos = (((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)) > 0 ? ((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)) : 0);
|
||||
M_PrevOpt();
|
||||
if (cv_skinselectmenu.value == SKINMENUTYPE_GRID){
|
||||
setupm_skinypos = (((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)) > 0 ? ((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)) : 0);
|
||||
M_PrevOpt();
|
||||
}
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED){
|
||||
setupm_skinypos = (((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)-2) > 0 ? ((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)-2) : 0);
|
||||
M_PrevOpt();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
M_PrevOpt();
|
||||
@@ -11584,7 +11744,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
}
|
||||
break;
|
||||
}
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_GRID && itemOn == 1)
|
||||
else if ((cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED) && itemOn == 1)
|
||||
{
|
||||
if (setupm_skinselect > 0)
|
||||
{
|
||||
@@ -11596,7 +11756,10 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
{
|
||||
INT32 roundedskins = ROUNDSKINSUPTO8;
|
||||
setupm_skinselect = roundedskins-1;
|
||||
setupm_skinypos = (((roundedskins/8) - SKINGRIDHEIGHT) > 0 ? (roundedskins/8) - SKINGRIDHEIGHT : 0);
|
||||
if (cv_skinselectmenu.value == SKINMENUTYPE_GRID)
|
||||
setupm_skinypos = (((roundedskins/8) - SKINGRIDHEIGHT) > 0 ? (roundedskins/8) - SKINGRIDHEIGHT : 0);
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
|
||||
setupm_skinypos = (((roundedskins/8) - SKINGRIDHEIGHT-2) > 0 ? (roundedskins/8) - SKINGRIDHEIGHT-2 : 0);
|
||||
}
|
||||
S_StartSound(NULL, sfx_menu1);
|
||||
break;
|
||||
@@ -11634,13 +11797,19 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
}
|
||||
break;
|
||||
}
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_GRID && itemOn == 1)
|
||||
else if ((cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED) && itemOn == 1)
|
||||
{
|
||||
if (setupm_skinselect < ROUNDSKINSUPTO8 - 1)
|
||||
{
|
||||
setupm_skinselect++;
|
||||
if (setupm_skinselect >= ((setupm_skinypos-1)+SKINGRIDHEIGHT)*8 && setupm_skinypos < (ROUNDSKINSUPTO8/8)-SKINGRIDHEIGHT)
|
||||
setupm_skinypos++;
|
||||
if (cv_skinselectmenu.value == SKINMENUTYPE_GRID){
|
||||
if (setupm_skinselect >= ((setupm_skinypos-1)+SKINGRIDHEIGHT)*8 && setupm_skinypos < (ROUNDSKINSUPTO8/8)-SKINGRIDHEIGHT)
|
||||
setupm_skinypos++;
|
||||
}
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED){
|
||||
if (setupm_skinselect >= ((setupm_skinypos-1)+SKINGRIDHEIGHT)*8+24 && setupm_skinypos < (ROUNDSKINSUPTO8/8)-SKINGRIDHEIGHT+24)
|
||||
setupm_skinypos++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -11682,7 +11851,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
setupm_name[l-1] =0;
|
||||
}
|
||||
}
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_GRID && itemOn == 1)
|
||||
else if ((cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED) && itemOn == 1)
|
||||
{
|
||||
// change sort for select menu (damn now i have to add another cvar...)
|
||||
// now we have the cvar
|
||||
@@ -11701,7 +11870,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case KEY_DEL:
|
||||
if (cv_skinselectmenu.value)
|
||||
BREAKWHENLOCKED
|
||||
@@ -11737,7 +11905,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
S_StartSound(NULL,sfx_menu1);
|
||||
}
|
||||
}
|
||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_GRID && itemOn == 1 && setupm_skinselect < numskins)
|
||||
else if ((cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED ) && itemOn == 1 && setupm_skinselect < numskins)
|
||||
{
|
||||
setupm_fakeskin = skinsorted[setupm_skinselect];
|
||||
S_StartSound(NULL, sfx_s221);
|
||||
@@ -11745,16 +11913,22 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
||||
break;
|
||||
|
||||
default:
|
||||
if (choice < 32 || choice > 127 || itemOn != 0)
|
||||
if (choice < 32 || choice > 127)
|
||||
break;
|
||||
l = strlen(setupm_name);
|
||||
if (l < MAXPLAYERNAME)
|
||||
{
|
||||
S_StartSound(NULL,sfx_menu1); // Tails
|
||||
setupm_name[l] =(char)choice;
|
||||
setupm_name[l+1] =0;
|
||||
if (itemOn == 0){
|
||||
l = strlen(setupm_name);
|
||||
if (l < MAXPLAYERNAME)
|
||||
{
|
||||
S_StartSound(NULL,sfx_menu1); // Tails
|
||||
setupm_name[l] =(char)choice;
|
||||
setupm_name[l+1] =0;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
#undef BREAKWHENLOCKED
|
||||
|
||||
@@ -11789,6 +11963,12 @@ case SKINMENUTYPE_2D:\
|
||||
MP_PlayerSetupMenu[2].alphaKey = 164;\
|
||||
MP_PlayerSetupDef.y = 6;\
|
||||
break;\
|
||||
case SKINMENUTYPE_EXTENDED:\
|
||||
MP_PlayerSetupMenu[0].alphaKey = 6;\
|
||||
MP_PlayerSetupMenu[1].alphaKey = 25;\
|
||||
MP_PlayerSetupMenu[2].alphaKey = 152;\
|
||||
MP_PlayerSetupDef.y = 6;\
|
||||
break;\
|
||||
case SKINMENUTYPE_GRID:\
|
||||
MP_PlayerSetupMenu[0].alphaKey = 6;\
|
||||
MP_PlayerSetupMenu[1].alphaKey = 25;\
|
||||
@@ -11818,6 +11998,7 @@ static void M_SetupMultiPlayer(INT32 choice)
|
||||
setupm_cvskin = &cv_skin;
|
||||
setupm_cvcolor = &cv_playercolor;
|
||||
setupm_cvname = &cv_playername;
|
||||
|
||||
setupm_skinxpos = 4;
|
||||
setupm_skinypos = 0;
|
||||
setupm_skinlockedselect = false;
|
||||
@@ -11968,7 +12149,7 @@ static boolean M_QuitMultiPlayerMenu(void)
|
||||
}
|
||||
// you know what? always putting these in the buffer won't hurt anything.
|
||||
COM_BufAddText (va("%s \"%s\"\n",setupm_cvskin->name,skins[setupm_fakeskin].name));
|
||||
COM_BufAddText (va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor));
|
||||
COM_BufAddText (va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -2992,6 +2992,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
|
||||
|
||||
Reference in new issue
Block a user