mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: clang and MSVC warnings (glx)

pull/7760/head
Charles Pigott 2019-09-19 13:01:57 +01:00
parent 7b400d43c1
commit fe9731d32c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/network_type.h
View File

@ -38,7 +38,7 @@ enum NetworkVehicleType {
}; };
/** 'Unique' identifier to be given to clients */ /** 'Unique' identifier to be given to clients */
enum ClientID { enum ClientID : uint32 {
INVALID_CLIENT_ID = 0, ///< Client is not part of anything INVALID_CLIENT_ID = 0, ///< Client is not part of anything
CLIENT_ID_SERVER = 1, ///< Servers always have this ID CLIENT_ID_SERVER = 1, ///< Servers always have this ID
CLIENT_ID_FIRST = 2, ///< The first client ID CLIENT_ID_FIRST = 2, ///< The first client ID

2
src/script/api/script_client.hpp
View File

@ -26,7 +26,7 @@ class ScriptClient : public ScriptObject {
public: public:
/** Different constants related to ClientID. */ /** Different constants related to ClientID. */
enum ClientID { enum ClientID : uint32 {
CLIENT_INVALID = 0, ///< Client is not part of anything CLIENT_INVALID = 0, ///< Client is not part of anything
CLIENT_SERVER = 1, ///< Servers always have this ID CLIENT_SERVER = 1, ///< Servers always have this ID
CLIENT_FIRST = 2, ///< The first client ID CLIENT_FIRST = 2, ///< The first client ID

4
src/town_gui.cpp
View File

@ -965,7 +965,7 @@ public:
this->vscroll->SetCapacityFromWidget(this, WID_TD_LIST); this->vscroll->SetCapacityFromWidget(this, WID_TD_LIST);
} }
virtual void OnEditboxChanged(int wid) void OnEditboxChanged(int wid) override
{ {
if (wid == WID_TD_FILTER) { if (wid == WID_TD_FILTER) {
this->string_filter.SetFilterTerm(this->townname_editbox.text.buf); this->string_filter.SetFilterTerm(this->townname_editbox.text.buf);
@ -1010,7 +1010,7 @@ public:
this->towns.Sort(); this->towns.Sort();
this->towns.shrink_to_fit(); this->towns.shrink_to_fit();
this->towns.RebuildDone(); this->towns.RebuildDone();
this->vscroll->SetCount(this->towns.size()); // Update scrollbar as well. this->vscroll->SetCount((int)this->towns.size()); // Update scrollbar as well.
} }
break; break;
default: default: