zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Centered the compatibility mode option in the comptibility options menu.

Browse source 
SVN r1382 (trunk)
This commit is contained in:
Randy Heit 2009-01-31 02:47:45 +00:00
parent a7ffb9db6a
commit f3b6f25d88
3 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/rh-log.txt
View file

@ -1,4 +1,5 @@
January 30, 2009 January 30, 2009
- Centered the compatibility mode option in the comptibility options menu.
- Added button mappings for 8 mouse buttons on SDL. It works with my system, - Added button mappings for 8 mouse buttons on SDL. It works with my system,
but Linux being Linux, there are no guarantees that it's appropriate for but Linux being Linux, there are no guarantees that it's appropriate for
other systems. other systems.

1
src/m_menu.h
View file

@ -140,6 +140,7 @@ typedef struct menuitem_s {
int key2; int key2;
char *res2; char *res2;
void *extra; void *extra;
float discretecenter;
} c; } c;
union { union {
float step; float step;

60
src/m_options.cpp
View file

@ -1101,7 +1101,7 @@ static menu_t DMFlagsMenu =
*=======================================*/ *=======================================*/
static menuitem_t CompatibilityItems[] = { static menuitem_t CompatibilityItems[] = {
{ discrete, "Compatibility mode", {&compatmode}, {5.0}, {0.0}, {0.0}, {CompatModes} }, { discrete, "Compatibility mode", {&compatmode}, {5.0}, {1.0}, {0.0}, {CompatModes} },
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} }, { redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
{ bitflag, "Find shortest textures like Doom", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_SHORTTEX} }, { bitflag, "Find shortest textures like Doom", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_SHORTTEX} },
{ bitflag, "Use buggier stair building", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_STAIRINDEX} }, { bitflag, "Use buggier stair building", {&compatflags}, {0}, {0}, {0}, {(value_t *)COMPATF_STAIRINDEX} },
@ -1529,7 +1529,8 @@ static void CalcIndent (menu_t *menu)
for (i = 0; i < menu->numitems; i++) for (i = 0; i < menu->numitems; i++)
{ {
item = menu->items + i; item = menu->items + i;
if (item->type != whitetext && item->type != redtext && item->type != screenres) if (item->type != whitetext && item->type != redtext && item->type != screenres &&
(item->type != discrete || !item->c.discretecenter))
{ {
thiswidth = SmallFont->StringWidth (item->label); thiswidth = SmallFont->StringWidth (item->label);
if (thiswidth > widest) if (thiswidth > widest)
@ -1659,6 +1660,7 @@ void M_OptDrawer ()
UCVarValue value; UCVarValue value;
DWORD overlay; DWORD overlay;
int labelofs; int labelofs;
int indent;
if (!CurrentMenu->DontDim) if (!CurrentMenu->DontDim)
{ {
@ -1710,6 +1712,14 @@ void M_OptDrawer ()
item = CurrentMenu->items + i; item = CurrentMenu->items + i;
overlay = 0; overlay = 0;
if (item->type == discrete && item->c.discretecenter)
{
indent = 160;
}
else
{
indent = CurrentMenu->indent;
}
if (item->type != screenres) if (item->type != screenres)
{ {
@ -1718,14 +1728,14 @@ void M_OptDrawer ()
{ {
case more: case more:
case safemore: case safemore:
x = CurrentMenu->indent - width; x = indent - width;
color = MoreColor; color = MoreColor;
break; break;
case numberedmore: case numberedmore:
case rsafemore: case rsafemore:
case rightmore: case rightmore:
x = CurrentMenu->indent + 14; x = indent + 14;
color = item->type != rightmore ? CR_GREEN : MoreColor; color = item->type != rightmore ? CR_GREEN : MoreColor;
break; break;
@ -1740,12 +1750,12 @@ void M_OptDrawer ()
break; break;
case listelement: case listelement:
x = CurrentMenu->indent + 14; x = indent + 14;
color = LabelColor; color = LabelColor;
break; break;
case colorpicker: case colorpicker:
x = CurrentMenu->indent + 14; x = indent + 14;
color = MoreColor; color = MoreColor;
break; break;
@ -1757,7 +1767,7 @@ void M_OptDrawer ()
// Intentional fall-through // Intentional fall-through
default: default:
x = CurrentMenu->indent - width; x = indent - width;
color = (item->type == control && menuactive == MENU_WaitKey && i == CurrentItem) color = (item->type == control && menuactive == MENU_WaitKey && i == CurrentItem)
? CR_YELLOW : LabelColor; ? CR_YELLOW : LabelColor;
break; break;
@ -1772,7 +1782,7 @@ void M_OptDrawer ()
char tbuf[16]; char tbuf[16];
mysnprintf (tbuf, countof(tbuf), "%d.", item->b.position); mysnprintf (tbuf, countof(tbuf), "%d.", item->b.position);
x = CurrentMenu->indent - SmallFont->StringWidth (tbuf); x = indent - SmallFont->StringWidth (tbuf);
screen->DrawText (SmallFont, CR_GREY, x, y, tbuf, DTA_Clean, true, TAG_DONE); screen->DrawText (SmallFont, CR_GREY, x, y, tbuf, DTA_Clean, true, TAG_DONE);
} }
break; break;
@ -1789,13 +1799,13 @@ void M_OptDrawer ()
if (v == vals) if (v == vals)
{ {
screen->DrawText (SmallFont, ValueColor, CurrentMenu->indent + 14, y, "Unknown", screen->DrawText (SmallFont, ValueColor, indent + 14, y, "Unknown",
DTA_Clean, true, TAG_DONE); DTA_Clean, true, TAG_DONE);
} }
else else
{ {
screen->DrawText (SmallFont, item->type == cdiscrete ? v : ValueColor, screen->DrawText (SmallFont, item->type == cdiscrete ? v : ValueColor,
CurrentMenu->indent + 14, y, item->e.values[v].name, indent + 14, y, item->e.values[v].name,
DTA_Clean, true, TAG_DONE); DTA_Clean, true, TAG_DONE);
} }
@ -1838,13 +1848,13 @@ void M_OptDrawer ()
if (v == vals) if (v == vals)
{ {
screen->DrawText (SmallFont, ValueColor, CurrentMenu->indent + 14, y, "Unknown", screen->DrawText (SmallFont, ValueColor, indent + 14, y, "Unknown",
DTA_Clean, true, DTA_ColorOverlay, overlay, TAG_DONE); DTA_Clean, true, DTA_ColorOverlay, overlay, TAG_DONE);
} }
else else
{ {
screen->DrawText (SmallFont, item->type == cdiscrete ? v : ValueColor, screen->DrawText (SmallFont, item->type == cdiscrete ? v : ValueColor,
CurrentMenu->indent + 14, y, indent + 14, y,
item->type != discretes ? item->e.values[v].name : item->e.valuestrings[v].name.GetChars(), item->type != discretes ? item->e.values[v].name : item->e.valuestrings[v].name.GetChars(),
DTA_Clean, true, DTA_ColorOverlay, overlay, TAG_DONE); DTA_Clean, true, DTA_ColorOverlay, overlay, TAG_DONE);
} }
@ -1858,7 +1868,7 @@ void M_OptDrawer ()
value = item->a.cvar->GetGenericRep (CVAR_String); value = item->a.cvar->GetGenericRep (CVAR_String);
v = M_FindCurVal(value.String, item->e.enumvalues, (int)item->b.numvalues); v = M_FindCurVal(value.String, item->e.enumvalues, (int)item->b.numvalues);
screen->DrawText(SmallFont, ValueColor, CurrentMenu->indent + 14, y, v, DTA_Clean, true, TAG_DONE); screen->DrawText(SmallFont, ValueColor, indent + 14, y, v, DTA_Clean, true, TAG_DONE);
} }
break; break;
@ -1872,11 +1882,11 @@ void M_OptDrawer ()
if (v == vals) if (v == vals)
{ {
UCVarValue val = item->a.guidcvar->GetGenericRep (CVAR_String); UCVarValue val = item->a.guidcvar->GetGenericRep (CVAR_String);
screen->DrawText (SmallFont, ValueColor, CurrentMenu->indent + 14, y, val.String, DTA_Clean, true, TAG_DONE); screen->DrawText (SmallFont, ValueColor, indent + 14, y, val.String, DTA_Clean, true, TAG_DONE);
} }
else else
{ {
screen->DrawText (SmallFont, ValueColor, CurrentMenu->indent + 14, y, item->e.guidvalues[v].Name, screen->DrawText (SmallFont, ValueColor, indent + 14, y, item->e.guidvalues[v].Name,
DTA_Clean, true, TAG_DONE); DTA_Clean, true, TAG_DONE);
} }
@ -1884,22 +1894,22 @@ void M_OptDrawer ()
break; break;
case nochoice: case nochoice:
screen->DrawText (SmallFont, CR_GOLD, CurrentMenu->indent + 14, y, screen->DrawText (SmallFont, CR_GOLD, indent + 14, y,
(item->e.values[(int)item->b.min]).name, DTA_Clean, true, TAG_DONE); (item->e.values[(int)item->b.min]).name, DTA_Clean, true, TAG_DONE);
break; break;
case slider: case slider:
value = item->a.cvar->GetGenericRep (CVAR_Float); value = item->a.cvar->GetGenericRep (CVAR_Float);
M_DrawSlider (CurrentMenu->indent + 14, y + labelofs, item->b.min, item->c.max, value.Float); M_DrawSlider (indent + 14, y + labelofs, item->b.min, item->c.max, value.Float);
break; break;
case absslider: case absslider:
value = item->a.cvar->GetGenericRep (CVAR_Float); value = item->a.cvar->GetGenericRep (CVAR_Float);
M_DrawSlider (CurrentMenu->indent + 14, y + labelofs, item->b.min, item->c.max, fabs(value.Float)); M_DrawSlider (indent + 14, y + labelofs, item->b.min, item->c.max, fabs(value.Float));
break; break;
case intslider: case intslider:
M_DrawSlider (CurrentMenu->indent + 14, y + labelofs, item->b.min, item->c.max, item->a.fval); M_DrawSlider (indent + 14, y + labelofs, item->b.min, item->c.max, item->a.fval);
break; break;
case control: case control:
@ -1909,11 +1919,11 @@ void M_OptDrawer ()
C_NameKeys (description, item->b.key1, item->c.key2); C_NameKeys (description, item->b.key1, item->c.key2);
if (description[0]) if (description[0])
{ {
M_DrawConText(CR_WHITE, CurrentMenu->indent + 14, y-1+labelofs, description); M_DrawConText(CR_WHITE, indent + 14, y-1+labelofs, description);
} }
else else
{ {
screen->DrawText(SmallFont, CR_BLACK, CurrentMenu->indent + 14, y + labelofs, "---", screen->DrawText(SmallFont, CR_BLACK, indent + 14, y + labelofs, "---",
DTA_Clean, true, TAG_DONE); DTA_Clean, true, TAG_DONE);
} }
} }
@ -1922,7 +1932,7 @@ void M_OptDrawer ()
case colorpicker: case colorpicker:
{ {
int box_x, box_y; int box_x, box_y;
box_x = (CurrentMenu->indent - 35 - 160) * CleanXfac + screen->GetWidth()/2; box_x = (indent - 35 - 160) * CleanXfac + screen->GetWidth()/2;
box_y = (y - ((gameinfo.gametype & GAME_Raven) ? 99 : 100)) * CleanYfac + screen->GetHeight()/2; box_y = (y - ((gameinfo.gametype & GAME_Raven) ? 99 : 100)) * CleanYfac + screen->GetHeight()/2;
screen->Clear (box_x, box_y, box_x + 32*CleanXfac, box_y + (fontheight-1)*CleanYfac, screen->Clear (box_x, box_y, box_x + 32*CleanXfac, box_y + (fontheight-1)*CleanYfac,
item->a.colorcvar->GetIndex(), 0); item->a.colorcvar->GetIndex(), 0);
@ -1938,7 +1948,7 @@ void M_OptDrawer ()
box_y = (y - 98) * CleanYfac + screen->GetHeight()/2; box_y = (y - 98) * CleanYfac + screen->GetHeight()/2;
p = 0; p = 0;
box_x = (CurrentMenu->indent - 32 - 160) * CleanXfac + screen->GetWidth()/2; box_x = (indent - 32 - 160) * CleanXfac + screen->GetWidth()/2;
for (x1 = 0, p = int(item->b.min * 16); x1 < 16; ++p, ++x1) for (x1 = 0, p = int(item->b.min * 16); x1 < 16; ++p, ++x1)
{ {
screen->Clear (box_x, box_y, box_x + w, box_y + h, p, 0); screen->Clear (box_x, box_y, box_x + w, box_y + h, p, 0);
@ -1993,7 +2003,7 @@ void M_OptDrawer ()
} }
screen->DrawText (SmallFont, ValueColor, screen->DrawText (SmallFont, ValueColor,
CurrentMenu->indent + 14, y, str, DTA_Clean, true, TAG_DONE); indent + 14, y, str, DTA_Clean, true, TAG_DONE);
} }
break; break;
@ -2005,7 +2015,7 @@ void M_OptDrawer ()
i == CurrentItem && i == CurrentItem &&
(skullAnimCounter < 6 || menuactive == MENU_WaitKey)) (skullAnimCounter < 6 || menuactive == MENU_WaitKey))
{ {
M_DrawConText(CR_RED, CurrentMenu->indent + 3, y-1+labelofs, "\xd"); M_DrawConText(CR_RED, indent + 3, y-1+labelofs, "\xd");
} }
} }
else else