Fix adding static characters #475

cxong · Apr 30, 2020 · e2ff62b · e2ff62b
1 parent fba20ae
commit e2ff62b
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 59 deletions.
diff --git a/missions/doom.cdogscpn/missions.json b/missions/doom.cdogscpn/missions.json
@@ -3270,7 +3270,9 @@
 			[21, 3],
 			[10, 16],
 			[23, 51],
-			[30, 80]]
+			[30, 80],
+			[78, 73],
+			[55, 16]]
 		},
 		{
 			"MapObject": "barrel_nukage",
@@ -3311,7 +3313,8 @@
 		},
 		{
 			"MapObject": "Marine Shotgun spawner",
-			"Positions": [[69, 43]]
+			"Positions": [[69, 43],
+			[24, 69]]
 		},
 		{
 			"MapObject": "Launcher spawner",
@@ -3369,69 +3372,99 @@
 		}],
 		"StaticCharacters": [{
 			"Index": 2,
-			"Positions": [[106, 73],
-			[103, 75],
-			[84, 97],
-			[78, 89],
-			[76, 101],
-			[88, 112],
-			[85, 112],
-			[82, 112],
-			[76, 113],
-			[51, 66],
-			[56, 63],
-			[11, 37],
-			[23, 113],
-			[7, 109],
-			[7, 98],
-			[34, 12],
-			[107, 24],
-			[74, 75]]
+			"Positions": [[76, 57],
+			[78, 56],
+			[80, 18],
+			[31, 9],
+			[26, 11],
+			[14, 21],
+			[7, 28],
+			[5, 31],
+			[13, 38],
+			[8, 45],
+			[12, 43],
+			[17, 48],
+			[11, 47],
+			[12, 51],
+			[11, 55],
+			[4, 60],
+			[12, 60],
+			[5, 73],
+			[6, 82],
+			[17, 84],
+			[37, 49],
+			[36, 47],
+			[35, 48],
+			[41, 48],
+			[39, 52],
+			[39, 45],
+			[56, 84],
+			[61, 84],
+			[64, 84],
+			[66, 84],
+			[62, 74],
+			[57, 75],
+			[57, 67],
+			[55, 56]]
 		},
 		{
 			"Index": 1,
-			"Positions": [[96, 71],
-			[98, 73],
-			[101, 74],
-			[89, 47],
-			[89, 68],
-			[77, 87],
-			[60, 89],
-			[89, 18],
-			[99, 18],
-			[92, 11],
-			[103, 10],
-			[78, 80],
-			[68, 39],
-			[107, 18],
-			[105, 24],
-			[106, 25],
-			[100, 29]]
+			"Positions": [[71, 53],
+			[72, 55],
+			[74, 56],
+			[67, 51],
+			[67, 35],
+			[68, 13],
+			[70, 9],
+			[58, 14],
+			[77, 8],
+			[74, 13],
+			[74, 21],
+			[78, 17],
+			[79, 18],
+			[79, 14],
+			[57, 27],
+			[51, 29],
+			[39, 21],
+			[57, 47],
+			[57, 60],
+			[57, 66],
+			[45, 65],
+			[32, 20]]
 		},
 		{
 			"Index": 3,
-			"Positions": [[95, 16],
-			[75, 17],
-			[6, 92],
-			[7, 53],
-			[34, 8],
-			[103, 24]]
+			"Positions": [[26, 7],
+			[5, 36],
+			[6, 40],
+			[6, 44],
+			[16, 54],
+			[17, 54],
+			[16, 56],
+			[4, 69],
+			[56, 13],
+			[71, 12],
+			[77, 17]]
 		},
 		{
 			"Index": 0,
-			"Positions": [[82, 17],
-			[78, 10],
-			[32, 94],
-			[34, 93],
-			[42, 92],
-			[42, 104],
-			[27, 106],
-			[30, 107],
-			[45, 18],
-			[45, 22],
-			[102, 24],
-			[107, 20],
-			[101, 98]]
+			"Positions": [[76, 17],
+			[79, 15],
+			[61, 13],
+			[59, 8],
+			[75, 73],
+			[21, 79],
+			[24, 79],
+			[31, 77],
+			[31, 69],
+			[26, 69],
+			[23, 70],
+			[21, 16],
+			[22, 15],
+			[21, 4],
+			[22, 5],
+			[33, 13],
+			[33, 16]]
 		}],
 		"StaticObjectives": [{
 			"Index": 0,

diff --git a/src/cdogs/mission_static.c b/src/cdogs/mission_static.c
@@ -1070,9 +1070,6 @@ static bool TryRemoveMapObjectAt(const struct vec2i pos, CArray *objs)
 bool MissionStaticTryAddCharacter(
 	MissionStatic *m, const int ch, const struct vec2i pos)
 {
-	// Remove any characters already there
-	MissionStaticTryRemoveCharacterAt(m, pos);
-
 	const Tile *tile = MapGetTile(&gMap, pos);
 	if (TileIsClear(tile))
 	{