Update to 1.10.0-beta1

2019-10-31 22:24:28 +03:00
parent b84a475e14
commit 599ccf0c2b
1470 changed files with 354219 additions and 16795 deletions
--- a/src/script/script_storage.hpp
+++ b/src/script/script_storage.hpp
@@ -68,8 +68,8 @@ private:

 public:
 	ScriptStorage() :
-		mode              (NULL),
-		mode_instance     (NULL),
+		mode              (nullptr),
+		mode_instance     (nullptr),
 		root_company      (INVALID_OWNER),
 		company           (INVALID_OWNER),
 		delay             (1),
@@ -91,8 +91,8 @@ public:
 		/* calback_value (can't be set) */
 		road_type         (INVALID_ROADTYPE),
 		rail_type         (INVALID_RAILTYPE),
-		event_data        (NULL),
-		log_data          (NULL)
+		event_data        (nullptr),
+		log_data          (nullptr)
 	{ }

 	~ScriptStorage();