From bc3602486f2627b98a8e15c6bfe2dfc674101cae Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Mon, 19 Oct 2020 06:33:44 +0200 Subject: [PATCH] Fix type warnings in DiabloUI --- SourceX/DiabloUI/diabloui.cpp | 10 +++++----- SourceX/DiabloUI/diabloui.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp index 48aeeba7d..ada05d525 100644 --- a/SourceX/DiabloUI/diabloui.cpp +++ b/SourceX/DiabloUI/diabloui.cpp @@ -24,8 +24,8 @@ namespace dvl { -int SelectedItemMin = 1; -int SelectedItemMax = 1; +std::size_t SelectedItemMin = 1; +std::size_t SelectedItemMax = 1; std::size_t ListViewportSize = 1; const std::size_t *ListOffset = NULL; @@ -48,7 +48,7 @@ char *UiTextInput; int UiTextInputLen; bool textInputActive = true; -int SelectedItem = 0; +std::size_t SelectedItem = 0; namespace { @@ -147,7 +147,7 @@ void UiPlaySelectSound() gfnSoundFunction("sfx\\items\\titlslct.wav"); } -void UiFocus(int itemIndex, bool wrap = false) +void UiFocus(std::size_t itemIndex, bool wrap = false) { if (!wrap) { if (itemIndex < SelectedItemMin) { @@ -815,7 +815,7 @@ bool HandleMouseEventList(const SDL_Event &event, UiList *ui_list) if (event.type != SDL_MOUSEBUTTONDOWN || event.button.button != SDL_BUTTON_LEFT) return false; - const int index = ui_list->indexAt(event.button.y); + const std::size_t index = ui_list->indexAt(event.button.y); if (gfnListFocus != NULL && SelectedItem != index) { UiFocus(index); diff --git a/SourceX/DiabloUI/diabloui.h b/SourceX/DiabloUI/diabloui.h index d470f26d5..651b94d25 100644 --- a/SourceX/DiabloUI/diabloui.h +++ b/SourceX/DiabloUI/diabloui.h @@ -8,7 +8,7 @@ namespace dvl { -extern int SelectedItem; +extern std::size_t SelectedItem; extern bool textInputActive; typedef enum _artFocus {