From 250bbf9aa28d09d4780c3ff3d18217c2dadb5479 Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Mon, 18 Apr 2016 23:05:13 +0200 Subject: [PATCH] Hot Ice: Make use of LoadScenarioSection improvements --- planet/Arena.ocf/HotIce.ocs/Map.c | 7 ------- planet/Arena.ocf/HotIce.ocs/Script.c | 3 --- planet/Arena.ocf/HotIce.ocs/SectEmpty.ocg/Scenario.txt | 0 3 files changed, 10 deletions(-) delete mode 100644 planet/Arena.ocf/HotIce.ocs/SectEmpty.ocg/Scenario.txt diff --git a/planet/Arena.ocf/HotIce.ocs/Map.c b/planet/Arena.ocf/HotIce.ocs/Map.c index 1ab64c71e..70c5533ce 100644 --- a/planet/Arena.ocf/HotIce.ocs/Map.c +++ b/planet/Arena.ocf/HotIce.ocs/Map.c @@ -7,17 +7,10 @@ static g_player_spawn_positions; static g_map_width; -static g_no_map, g_seed; // Called be the engine: draw the complete map here. public func InitializeMap(proplist map) { - // Don't draw a map when switching to the empty scenario section. - if (g_no_map) return true; - // Reloading the scenario section also resets the RNG. Call Random() a few times to get a new map each round. - var i = g_seed++; - while (i--) Random(2); - // Map type 0: One big island; more small islands above // Map type 1: Only many small islands var t = SCENPAR_MapType; diff --git a/planet/Arena.ocf/HotIce.ocs/Script.c b/planet/Arena.ocf/HotIce.ocs/Script.c index 03c769ed7..a52397dc2 100644 --- a/planet/Arena.ocf/HotIce.ocs/Script.c +++ b/planet/Arena.ocf/HotIce.ocs/Script.c @@ -42,9 +42,6 @@ func ResetRound() clonk->SetObjectStatus(C4OS_INACTIVE); } // Clear and redraw the map. - g_no_map = true; - LoadScenarioSection("Empty"); - g_no_map = false; LoadScenarioSection("main"); InitializeRound(); // Re-enable the players. diff --git a/planet/Arena.ocf/HotIce.ocs/SectEmpty.ocg/Scenario.txt b/planet/Arena.ocf/HotIce.ocs/SectEmpty.ocg/Scenario.txt deleted file mode 100644 index e69de29bb..000000000