Browse Source

Made function names more consistent with Yes/No

pull/197/head
danellos 7 years ago committed by Anders Jenbo
parent
commit
d032094bed
  1. 12
      SourceX/DiabloUI/diabloui.cpp
  2. 4
      SourceX/DiabloUI/diabloui.h
  3. 6
      SourceX/DiabloUI/selhero.cpp
  4. 2
      SourceX/DiabloUI/selhero.h

12
SourceX/DiabloUI/diabloui.cpp

@ -23,7 +23,7 @@ void (*gfnSoundFunction)(char *file);
void (*gfnListFocus)(int value);
void (*gfnListSelect)(int value);
void (*gfnListEsc)();
void (*gfnListConfirm)(int value);
void (*gfnListYesNo)(int value);
UI_Item *gUiItems;
int gUiItemCnt;
bool UiItemsWraps;
@ -139,7 +139,7 @@ void UiDestroy()
font = NULL;
}
void UiInitList(int min, int max, void (*fnFocus)(int value), void (*fnSelect)(int value), void (*fnEsc)(), UI_Item *items, int itemCnt, bool itemsWraps, void (*fnConfirm)(int value))
void UiInitList(int min, int max, void (*fnFocus)(int value), void (*fnSelect)(int value), void (*fnEsc)(), UI_Item *items, int itemCnt, bool itemsWraps, void (*fnYesNo)(int value))
{
SelectedItem = min;
SelectedItemMin = min;
@ -147,7 +147,7 @@ void UiInitList(int min, int max, void (*fnFocus)(int value), void (*fnSelect)(i
gfnListFocus = fnFocus;
gfnListSelect = fnSelect;
gfnListEsc = fnEsc;
gfnListConfirm = fnConfirm;
gfnListYesNo = fnYesNo;
gUiItems = items;
gUiItemCnt = itemCnt;
UiItemsWraps = itemsWraps;
@ -309,10 +309,10 @@ void UiFocusNavigationEsc()
gfnListEsc();
}
void UiFocusNavigationConfirm()
void UiFocusNavigationYesNo()
{
if (gfnListConfirm)
gfnListConfirm(SelectedItem);
if (gfnListYesNo)
gfnListYesNo(SelectedItem);
}
bool IsInsideRect(const SDL_Event *event, const SDL_Rect *rect)

4
SourceX/DiabloUI/diabloui.h

@ -110,8 +110,8 @@ void LoadMaskedArtFont(char *pszFile, Art *art, int frames, int mask = 250);
void SetMenu(int MenuId);
void UiFocusNavigationSelect();
void UiFocusNavigationEsc();
void UiFocusNavigationConfirm();
void UiInitList(int min, int max, void (*fnFocus)(int value), void (*fnSelect)(int value), void (*fnEsc)(), UI_Item *items, int size, bool wraps = false, void (*fcConfirm)(int value) = NULL);
void UiFocusNavigationYesNo();
void UiInitList(int min, int max, void (*fnFocus)(int value), void (*fnSelect)(int value), void (*fnEsc)(), UI_Item *items, int size, bool wraps = false, void (*fnYesNo)(int value) = NULL);
void UiRender();
void UiRenderItems(UI_Item *items, int size);
void WordWrap(UI_Item *item);

6
SourceX/DiabloUI/selhero.cpp

@ -52,7 +52,7 @@ UI_Item SELLIST_DIALOG[] = {
{ { 265, 360, 320, 26 }, UI_LIST, UIS_CENTER | UIS_MED | UIS_GOLD, 4, listItems[4] },
{ { 265, 386, 320, 26 }, UI_LIST, UIS_CENTER | UIS_MED | UIS_GOLD, 5, listItems[5] },
{ { 239, 429, 120, 35 }, UI_BUTTON, UIS_CENTER | UIS_BIG | UIS_GOLD, 0, "OK", (void *)UiFocusNavigationSelect },
{ { 364, 429, 120, 35 }, UI_BUTTON, UIS_CENTER | UIS_BIG | UIS_DISABLED, 0, "Delete", (void *)UiFocusNavigationConfirm },
{ { 364, 429, 120, 35 }, UI_BUTTON, UIS_CENTER | UIS_BIG | UIS_DISABLED, 0, "Delete", (void *)UiFocusNavigationYesNo },
{ { 489, 429, 120, 35 }, UI_BUTTON, UIS_CENTER | UIS_BIG | UIS_GOLD, 0, "Cancel", (void *)UiFocusNavigationEsc },
};
@ -99,7 +99,7 @@ void selhero_SetStats()
void selhero_List_Init()
{
UiInitList(0, selhero_SaveCount, selhero_List_Focus, selhero_List_Select, selhero_List_Esc, SELLIST_DIALOG, size(SELLIST_DIALOG), false, selhero_List_DeleteConfirm);
UiInitList(0, selhero_SaveCount, selhero_List_Focus, selhero_List_Select, selhero_List_Esc, SELLIST_DIALOG, size(SELLIST_DIALOG), false, selhero_List_DeleteYesNo);
int i;
for (i = 0; i < selhero_SaveCount && i < 6; i++) {
sprintf(listItems[i], selhero_heros[i].name);
@ -134,7 +134,7 @@ void selhero_List_Focus(int value)
selhero_deleteEnabled = false;
}
void selhero_List_DeleteConfirm(int value)
void selhero_List_DeleteYesNo(int value)
{
selhero_navigateYesNo = selhero_deleteEnabled;
}

2
SourceX/DiabloUI/selhero.h

@ -5,7 +5,7 @@ namespace dvl {
void selhero_List_Init();
void selhero_List_Focus(int value);
void selhero_List_Select(int value);
void selhero_List_DeleteConfirm(int value);
void selhero_List_DeleteYesNo(int value);
void selhero_List_Esc();
void selhero_ClassSelector_Focus(int value);
void selhero_ClassSelector_Select(int value);

Loading…
Cancel
Save