widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1727987_fix_dummy_map into lp:widelands.

Commit message:
Fix broken map dummy.wmf aka Not yet implemented

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1727987 in widelands: "Placeholder campaign map dummy.wmf fails to load"
  https://bugs.launchpad.net/widelands/+bug/1727987

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1727987_fix_dummy_map/+merge/335293

fixes bug 1727987

-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1727987_fix_dummy_map into lp:widelands.

=== removed file 'data/campaigns/dummy.wmf/binary/building'
Binary files data/campaigns/dummy.wmf/binary/building	2011-01-04 12:17:44 +0000 and data/campaigns/dummy.wmf/binary/building	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/campaigns/dummy.wmf/binary/exploration'
Binary files data/campaigns/dummy.wmf/binary/exploration	2011-01-04 12:17:44 +0000 and data/campaigns/dummy.wmf/binary/exploration	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/campaigns/dummy.wmf/binary/flag'
Binary files data/campaigns/dummy.wmf/binary/flag	2011-01-04 12:17:44 +0000 and data/campaigns/dummy.wmf/binary/flag	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/campaigns/dummy.wmf/binary/mapobjects'
Binary files data/campaigns/dummy.wmf/binary/mapobjects	2011-01-04 12:17:44 +0000 and data/campaigns/dummy.wmf/binary/mapobjects	2017-12-17 10:55:06 +0000 differ
=== removed file 'data/campaigns/dummy.wmf/binary/node_ownership'
Binary files data/campaigns/dummy.wmf/binary/node_ownership	2011-01-04 12:17:44 +0000 and data/campaigns/dummy.wmf/binary/node_ownership	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/campaigns/dummy.wmf/binary/resource'
Binary files data/campaigns/dummy.wmf/binary/resource	2011-01-04 12:17:44 +0000 and data/campaigns/dummy.wmf/binary/resource	2017-12-17 10:55:06 +0000 differ
=== removed file 'data/campaigns/dummy.wmf/binary/road'
Binary files data/campaigns/dummy.wmf/binary/road	2011-01-04 12:17:44 +0000 and data/campaigns/dummy.wmf/binary/road	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/campaigns/dummy.wmf/binary/terrain'
Binary files data/campaigns/dummy.wmf/binary/terrain	2011-01-04 12:17:44 +0000 and data/campaigns/dummy.wmf/binary/terrain	2017-12-17 10:55:06 +0000 differ
=== modified file 'data/campaigns/dummy.wmf/elemental'
--- data/campaigns/dummy.wmf/elemental	2014-10-01 09:17:23 +0000
+++ data/campaigns/dummy.wmf/elemental	2017-12-17 10:55:06 +0000
@@ -1,10 +1,12 @@
+# Automatically created by Widelands bzr8532[bug-1727987_dummy_map] (Release)
+
 [global]
 packet_version="1"
 map_w="32"
 map_h="32"
 nr_players="1"
-world="greenland"
-name=_"Not yet implemented"
-# TRANSLATORS: Author for dummy map
-author=_"Nobody"
-descr=_"Sorry, this map is not yet implemented."
+name="Not yet implemented"
+author="Nobody"
+descr="Sorry, this map is not yet implemented."
+hint=
+tags=

=== added file 'data/campaigns/dummy.wmf/minimap.png'
Binary files data/campaigns/dummy.wmf/minimap.png	1970-01-01 00:00:00 +0000 and data/campaigns/dummy.wmf/minimap.png	2017-12-17 10:55:06 +0000 differ
=== modified file 'data/campaigns/dummy.wmf/objective'
--- data/campaigns/dummy.wmf/objective	2011-01-04 12:17:44 +0000
+++ data/campaigns/dummy.wmf/objective	2017-12-17 10:55:06 +0000
@@ -1,2 +1,4 @@
+# Automatically created by Widelands bzr8532[bug-1727987_dummy_map] (Release)
+
 [global]
 packet_version="2"

=== removed directory 'data/campaigns/dummy.wmf/player'
=== removed directory 'data/campaigns/dummy.wmf/player/1'
=== removed directory 'data/campaigns/dummy.wmf/player/1/binary'
=== removed file 'data/campaigns/dummy.wmf/player/1/binary/areawatchers'
Binary files data/campaigns/dummy.wmf/player/1/binary/areawatchers	2011-01-04 12:17:44 +0000 and data/campaigns/dummy.wmf/player/1/binary/areawatchers	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/campaigns/dummy.wmf/player/1/messages'
--- data/campaigns/dummy.wmf/player/1/messages	2011-01-04 12:17:44 +0000
+++ data/campaigns/dummy.wmf/player/1/messages	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[global]
-packet_version="1"

=== removed directory 'data/campaigns/dummy.wmf/player/1/view'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/node_immovable_kinds_1'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/node_immovables_1'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/owners_0'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/roads_1'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/survey_amounts_1'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/survey_times_1'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/surveys_1'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/terrains_1'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/triangle_immovable_kinds_1'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/triangle_immovables_1'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/unseen_times_1'
=== removed file 'data/campaigns/dummy.wmf/player/1/view/vision_1'
Binary files data/campaigns/dummy.wmf/player/1/view/vision_1	2011-01-04 12:17:44 +0000 and data/campaigns/dummy.wmf/player/1/view/vision_1	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/campaigns/dummy.wmf/player_names'
--- data/campaigns/dummy.wmf/player_names	2011-01-04 12:17:44 +0000
+++ data/campaigns/dummy.wmf/player_names	2017-12-17 10:55:06 +0000
@@ -1,3 +1,5 @@
+# Automatically created by Widelands bzr8532[bug-1727987_dummy_map] (Release)
+
 [global]
 packet_version="2"
 

=== modified file 'data/campaigns/dummy.wmf/player_position'
--- data/campaigns/dummy.wmf/player_position	2011-01-04 12:17:44 +0000
+++ data/campaigns/dummy.wmf/player_position	2017-12-17 10:55:06 +0000
@@ -1,3 +1,5 @@
+# Automatically created by Widelands bzr8532[bug-1727987_dummy_map] (Release)
+
 [global]
 packet_version="2"
 player_1="1 1"

=== added file 'data/campaigns/dummy.wmf/port_spaces'
--- data/campaigns/dummy.wmf/port_spaces	1970-01-01 00:00:00 +0000
+++ data/campaigns/dummy.wmf/port_spaces	2017-12-17 10:55:06 +0000
@@ -0,0 +1,7 @@
+# Automatically created by Widelands bzr8532[bug-1727987_dummy_map] (Release)
+
+[global]
+packet_version="1"
+number_of_port_spaces="0"
+
+[port_spaces]

=== modified file 'data/campaigns/dummy.wmf/scripting/init.lua'
--- data/campaigns/dummy.wmf/scripting/init.lua	2016-01-28 05:24:34 +0000
+++ data/campaigns/dummy.wmf/scripting/init.lua	2017-12-17 10:55:06 +0000
@@ -14,4 +14,4 @@
    height=450,
    posy=1,
 }
-campaign_message_box(dummy_msg.title, dummy_msg.body, dummy_msg)
+campaign_message_box(dummy_msg)

=== added file 'data/campaigns/dummy.wmf/version'
--- data/campaigns/dummy.wmf/version	1970-01-01 00:00:00 +0000
+++ data/campaigns/dummy.wmf/version	2017-12-17 10:55:06 +0000
@@ -0,0 +1,11 @@
+# Automatically created by Widelands bzr8532[bug-1727987_dummy_map] (Release)
+
+[global]
+map_source_url=
+map_release=
+map_creator_version="bzr8532[bug-1727987_dummy_map]"
+map_version_major="0"
+map_version_minor="1"
+map_version_timestamp="1513452941"
+packet_version="1"
+packet_compatibility="1"