Fix: clang and MSVC warnings (glx)

pull/104/head
Charles Pigott 5 years ago
parent 7b400d43c1
commit fe9731d32c

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

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

@ -965,7 +965,7 @@ public:
this->vscroll->SetCapacityFromWidget(this, WID_TD_LIST);
}
virtual void OnEditboxChanged(int wid)
void OnEditboxChanged(int wid) override
{
if (wid == WID_TD_FILTER) {
this->string_filter.SetFilterTerm(this->townname_editbox.text.buf);
@ -1010,7 +1010,7 @@ public:
this->towns.Sort();
this->towns.shrink_to_fit();
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;
default:

Loading…
Cancel
Save