cpp/openttd-patchpack/source Changeset - r23848:886780b7ff8b

Changeset - r23848:886780b7ff8b

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Charles Pigott - 5 years ago 2019-09-19 12:01:57
charlespigott@googlemail.com

Fix: clang and MSVC warnings (glx)

3 files changed with 4 insertions and 4 deletions:

src/network/network_type.h

src/script/api/script_client.hpp

src/town_gui.cpp

0 comments (0 inline, 0 general)

src/network/network_type.h

➞

Show inline comments

@@ @@ -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

src/script/api/script_client.hpp

➞

Show inline comments

@@ @@ -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

src/town_gui.cpp

➞

Show inline comments

@@ @@ -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:

0 comments (0 inline, 0 general)