Make sure that structure IDs are never zero for converted maps. Fixes ticket:2833

perim · perim · commit ca8595f25a37 · 2011-07-31T22:49:55.000+02:00
diff --git a/data/base/multiplay/maps/2c-startup/struct.ini b/data/base/multiplay/maps/2c-startup/struct.ini
@@ -1,6 +1,6 @@
 
-[structure_0000]
-id = 0
+[structure_4275817112]
+id = 4275817112
 position = 4800, 13248, 112
 rotation = 0, 0, 0
 name = PillBox1
diff --git a/data/base/multiplay/maps/4c-basingstoke/struct.ini b/data/base/multiplay/maps/4c-basingstoke/struct.ini
@@ -1,6 +1,6 @@
 
-[structure_0000]
-id = 0
+[structure_4275817112]
+id = 4275817112
 position = 768, 1024, 94
 rotation = 0, 0, 0
 name = A0CommandCentre
diff --git a/data/base/multiplay/maps/4c-littleegypt/struct.ini b/data/base/multiplay/maps/4c-littleegypt/struct.ini
@@ -1,6 +1,6 @@
 
-[structure_0000]
-id = 0
+[structure_4275817112]
+id = 4275817112
 position = 2688, 13440, 148
 rotation = 0, 0, 0
 name = A0CommandCentre
diff --git a/data/base/multiplay/maps/4c-rollinghills/struct.ini b/data/base/multiplay/maps/4c-rollinghills/struct.ini
@@ -1,6 +1,6 @@
 
-[structure_0000]
-id = 0
+[structure_4275817112]
+id = 4275817112
 position = 3648, 21312, 81
 rotation = 0, 0, 0
 name = A0HardcreteMk1Wall
diff --git a/data/base/multiplay/maps/8c-bananas/struct.ini b/data/base/multiplay/maps/8c-bananas/struct.ini
@@ -1,6 +1,6 @@
 
-[structure_0000]
-id = 0
+[structure_4275817112]
+id = 4275817112
 position = 6784, 4096, 23
 rotation = 0, 0, 0
 name = A0ComDroidControl
diff --git a/data/base/multiplay/maps/8c-beggarskanyon/struct.ini b/data/base/multiplay/maps/8c-beggarskanyon/struct.ini
@@ -1,6 +1,6 @@
 
-[structure_0000]
-id = 0
+[structure_4275817112]
+id = 4275817112
 position = 3008, 15552, 132
 rotation = 0, 0, 0
 name = A0LightFactory
diff --git a/data/base/multiplay/maps/8c-mizamaze/struct.ini b/data/base/multiplay/maps/8c-mizamaze/struct.ini
@@ -1,6 +1,6 @@
 
-[structure_0000]
-id = 0
+[structure_4275817112]
+id = 4275817112
 position = 2560, 1280, 324
 rotation = 0, 0, 0
 name = A0CommandCentre
diff --git a/data/base/multiplay/maps/8c-thepit/struct.ini b/data/base/multiplay/maps/8c-thepit/struct.ini
@@ -1,6 +1,6 @@
 
-[structure_0000]
-id = 0
+[structure_4275817112]
+id = 4275817112
 position = 12416, 22784, 226
 rotation = 0, 0, 0
 name = A0PowerGenerator
diff --git a/data/base/multiplay/maps/8c-yinyang/struct.ini b/data/base/multiplay/maps/8c-yinyang/struct.ini
@@ -1,6 +1,6 @@
 
-[structure_0000]
-id = 0
+[structure_4275817112]
+id = 4275817112
 position = 17216, 6080, 0
 rotation = 0, 0, 0
 name = A0LightFactory
diff --git a/tools/map/mapconv.cpp b/tools/map/mapconv.cpp
@@ -237,6 +237,7 @@ int main(int argc, char **argv)
 				continue; // do not write modules as separate entries
 			}
 
+			if (psObj->id == 0) psObj->id = 0xFEDBCA98; // fix broken ID
 			MADD("\n[structure_%04u]", psObj->id);
 			MADD("id = %u", psObj->id);
 			MADD("position = %u, %u, %u", psObj->x, psObj->y, psObj->z);

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,7 @@ int main(int argc, char **argv)`
`237`	`237`	`continue; // do not write modules as separate entries`
`238`	`238`	`}`
`239`	`239`
	`240`	`+ if (psObj->id == 0) psObj->id = 0xFEDBCA98; // fix broken ID`
`240`	`241`	`MADD("\n[structure_%04u]", psObj->id);`
`241`	`242`	`MADD("id = %u", psObj->id);`
`242`	`243`	`MADD("position = %u, %u, %u", psObj->x, psObj->y, psObj->z);`