diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/closet.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/closet.png new file mode 100644 index 000000000..8b67519b8 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/closet.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/lattice.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/lattice.png deleted file mode 100644 index dcdc8be00..000000000 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/lattice.png and /dev/null differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/naamah_portrait.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/naamah_portrait.png new file mode 100644 index 000000000..0c2234ad4 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/naamah_portrait.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/e.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/e.png index 5eace4c91..2c37c9bf3 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/e.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/e.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/et.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/et.png index f457fcaba..915082e6c 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/et.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/et.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/h.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/h.png index 70c262612..5fce6f2d5 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/h.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/h.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/n.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/n.png index 3f2dd7af5..a0a980f75 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/n.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/n.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/ne.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/ne.png index 79c7ac2f6..853ed1000 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/ne.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/ne.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/nt.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/nt.png index 01ac33940..89dfa6367 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/nt.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/nt.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/nw.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/nw.png index 24204e45c..2011c7c7e 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/nw.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/nw.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/o.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/o.png index 0ea18d0fe..7eb2ba391 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/o.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/o.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/s.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/s.png index a8489c011..ed8498bd1 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/s.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/s.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/se.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/se.png index d9bc38976..78df64c27 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/se.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/se.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/st.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/st.png index a9b4c1f70..29524c47b 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/st.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/st.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/sw.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/sw.png index 787058e68..673b87013 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/sw.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/sw.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/v.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/v.png index 42d8ed47f..148dc44c5 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/v.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/v.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/w.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/w.png index d705bb0da..ba80b9690 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/w.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/w.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/wt.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/wt.png index b595d0090..7dd55d46c 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/wt.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/wt.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/x.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/x.png index a79c9b9f1..a17f4d7dd 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/x.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/landscape/x.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/e.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/e.png new file mode 100644 index 000000000..b8d7cc560 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/e.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/et.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/et.png new file mode 100644 index 000000000..dce6b2c6d Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/et.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/h.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/h.png new file mode 100644 index 000000000..bce6e0fe5 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/h.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/n.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/n.png new file mode 100644 index 000000000..8fccd39ac Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/n.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/ne.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/ne.png new file mode 100644 index 000000000..8fccd39ac Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/ne.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/nt.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/nt.png new file mode 100644 index 000000000..8fccd39ac Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/nt.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/nw.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/nw.png new file mode 100644 index 000000000..255b388d5 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/nw.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/o.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/o.png new file mode 100644 index 000000000..b8d7cc560 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/o.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/s.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/s.png new file mode 100644 index 000000000..1247dea37 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/s.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/se.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/se.png new file mode 100644 index 000000000..1247dea37 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/se.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/st.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/st.png new file mode 100644 index 000000000..1247dea37 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/st.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/sw.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/sw.png new file mode 100644 index 000000000..1247dea37 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/sw.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/v.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/v.png new file mode 100644 index 000000000..dce6b2c6d Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/v.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/w.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/w.png new file mode 100644 index 000000000..b8d7cc560 Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/w.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/wt.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/wt.png new file mode 100644 index 000000000..dce6b2c6d Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/wt.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/x.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/x.png new file mode 100644 index 000000000..dce6b2c6d Binary files /dev/null and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/wall/wood2/x.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json b/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json index 456f5618b..3b10d6bf5 100644 --- a/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json +++ b/data/.wolf3d/N3Ddata.cdogscpn/map_objects.json @@ -293,7 +293,17 @@ }, "Offset": [-8, -11], "Health": 0, - "Flags": ["Outside", "OnWall"] + "Flags": ["Inside", "OnWall"] + }, + { + "Name": "naamah_portrait", + "Pic": { + "Type": "Normal", + "Pic": "naamah_portrait" + }, + "Offset": [-8, -11], + "Health": 0, + "Flags": ["Inside", "OnWall"] }, { "Name": "eagle_portrait", @@ -426,14 +436,14 @@ "Flags": ["OnWall"] }, { - "Name": "lattice", + "Name": "closet", "Pic": { "Type": "Normal", - "Pic": "lattice" + "Pic": "closet" }, "Offset": [-8, -11], "Health": 0, - "Flags": ["OnWall"] + "Flags": ["Inside", "OnWall"] }, { "Name": "lattice_broken", diff --git a/data/.wolf3d/N3Ddata.cdogscpn/missions.json b/data/.wolf3d/N3Ddata.cdogscpn/missions.json index c92e933c6..3203e8ca6 100644 --- a/data/.wolf3d/N3Ddata.cdogscpn/missions.json +++ b/data/.wolf3d/N3Ddata.cdogscpn/missions.json @@ -104,8 +104,8 @@ "15": { "Name": "wall", "Type": "Wall", - "Style": "bunker", - "Mask": "d2d1ceff", + "Style": "wood2", + "Mask": "d9923cff", "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, @@ -116,8 +116,8 @@ "16": { "Name": "wall", "Type": "Wall", - "Style": "steel", - "Mask": "06e9fcff", + "Style": "wood2", + "Mask": "d9923cff", "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, @@ -128,8 +128,8 @@ "17": { "Name": "wall", "Type": "Wall", - "Style": "steel", - "Mask": "06e9fcff", + "Style": "wood2", + "Mask": "5f4320ff", "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, @@ -152,9 +152,9 @@ "19": { "Name": "wall", "Type": "Wall", - "Style": "brick2", - "Mask": "fc2c04ff", - "MaskAlt": "9c682aff", + "Style": "greenstain", + "Mask": "fac079ff", + "MaskAlt": "ffba65ff", "CanWalk": false, "IsOpaque": true, "Shootable": true, @@ -176,9 +176,9 @@ "20": { "Name": "wall", "Type": "Wall", - "Style": "brick2", - "Mask": "fc2c04ff", - "MaskAlt": "9c682aff", + "Style": "greenstain", + "Mask": "fac079ff", + "MaskAlt": "ffba65ff", "CanWalk": false, "IsOpaque": true, "Shootable": true, @@ -212,8 +212,8 @@ "23": { "Name": "wall", "Type": "Wall", - "Style": "plasteel", - "Mask": "ffffffff", + "Style": "wood2", + "Mask": "d9923cff", "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, @@ -224,8 +224,8 @@ "24": { "Name": "wall", "Type": "Wall", - "Style": "plasteel", - "Mask": "ffffffff", + "Style": "wood2", + "Mask": "d9923cff", "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, @@ -260,8 +260,8 @@ "27": { "Name": "wall", "Type": "Wall", - "Style": "rock", - "Mask": "b801b6ff", + "Style": "wood2", + "Mask": "d9923cff", "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, @@ -272,9 +272,9 @@ "28": { "Name": "wall", "Type": "Wall", - "Style": "cobble", - "Mask": "ffffffff", - "MaskAlt": "008400ff", + "Style": "wood2", + "Mask": "d9923cff", + "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, "Shootable": true, @@ -284,9 +284,9 @@ "29": { "Name": "wall", "Type": "Wall", - "Style": "cobble", - "Mask": "ffffffff", - "MaskAlt": "008400ff", + "Style": "wood2", + "Mask": "d9923cff", + "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, "Shootable": true, @@ -308,9 +308,9 @@ "30": { "Name": "wall", "Type": "Wall", - "Style": "cobble", - "Mask": "ffffffff", - "MaskAlt": "008400ff", + "Style": "wood2", + "Mask": "d9923cff", + "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, "Shootable": true, @@ -320,9 +320,9 @@ "31": { "Name": "wall", "Type": "Wall", - "Style": "rock", - "Mask": "f09c49ff", - "MaskAlt": "008400ff", + "Style": "wood2", + "Mask": "d9923cff", + "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, "Shootable": true, @@ -332,9 +332,9 @@ "32": { "Name": "wall", "Type": "Wall", - "Style": "rock", - "Mask": "f09c49ff", - "MaskAlt": "008400ff", + "Style": "wood2", + "Mask": "d9923cff", + "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, "Shootable": true, @@ -344,9 +344,9 @@ "33": { "Name": "wall", "Type": "Wall", - "Style": "rock", - "Mask": "f09c49ff", - "MaskAlt": "008400ff", + "Style": "wood2", + "Mask": "d9923cff", + "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, "Shootable": true, @@ -368,8 +368,8 @@ "35": { "Name": "wall", "Type": "Wall", - "Style": "plasteel", - "Mask": "ffffffff", + "Style": "wood2", + "Mask": "d9923cff", "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, @@ -380,9 +380,9 @@ "36": { "Name": "wall", "Type": "Wall", - "Style": "brick", - "Mask": "060effff", - "MaskAlt": "008400ff", + "Style": "wood2", + "Mask": "d9923cff", + "MaskAlt": "9c682aff", "CanWalk": false, "IsOpaque": true, "Shootable": true, @@ -867,8 +867,7 @@ "StaticItems": [{ "MapObject": "no_sign", "Positions": [[7, 8], - [1, 12], - [11, 4]] + [1, 12]] }, { "MapObject": "bloodstain2", @@ -891,14 +890,9 @@ "MapObject": "wall_vent", "Positions": [[9, 10]] }, - { - "MapObject": "elevator_entrance", - "Positions": [[9, 4]] - }, { "MapObject": "swastika_wreath", - "Positions": [[3, 6], - [9, 14]] + "Positions": [[9, 14]] }, { "MapObject": "coat_of_arms_flag", @@ -1145,6 +1139,14 @@ { "MapObject": "jail_cell_broken", "Positions": [[7, 4]] + }, + { + "MapObject": "closet", + "Positions": [[11, 4]] + }, + { + "MapObject": "naamah_portrait", + "Positions": [[3, 6]] }], "StaticCharacters": [{ "Index": 0, diff --git a/src/cdogs/map_wolf.c b/src/cdogs/map_wolf.c index 7f3a537c3..89261fc4e 100644 --- a/src/cdogs/map_wolf.c +++ b/src/cdogs/map_wolf.c @@ -1296,7 +1296,7 @@ static void TryLoadWallObject( switch (map->type) { case CWMAPTYPE_N3D: - moName = "curtain_red"; + moName = "duck_picture"; break; default: switch (spearMission) @@ -1315,7 +1315,7 @@ static void TryLoadWallObject( switch (map->type) { case CWMAPTYPE_N3D: - moName = "duck_picture"; + moName = "wood_color"; break; default: switch (spearMission) @@ -1331,7 +1331,7 @@ static void TryLoadWallObject( switch (map->type) { case CWMAPTYPE_N3D: - moName = "wood_color"; + moName = "lattice_broken"; break; default: switch (spearMission) @@ -1353,7 +1353,6 @@ static void TryLoadWallObject( switch (map->type) { case CWMAPTYPE_N3D: - moName = "lattice_broken"; break; default: switch (spearMission) @@ -1372,6 +1371,7 @@ static void TryLoadWallObject( switch (map->type) { case CWMAPTYPE_N3D: + moName = "jail_cell_broken"; break; default: switch (spearMission) @@ -1390,7 +1390,6 @@ static void TryLoadWallObject( switch (map->type) { case CWMAPTYPE_N3D: - moName = "jail_cell_broken"; break; default: moName = "elevator_entrance"; @@ -1398,46 +1397,76 @@ static void TryLoadWallObject( } break; case CWWALL_STEEL_SIGN: - switch (spearMission) + switch (map->type) { - case 1: - moName = "no_sign"; + case CWMAPTYPE_N3D: + moName = "closet"; break; - case 2: - moName = "wet_cobble"; + default: + switch (spearMission) + { + case 1: + moName = "no_sign"; + break; + case 2: + moName = "wet_cobble"; + break; + } break; } break; case CWWALL_STEEL: - switch (spearMission) + switch (map->type) { - case 3: - moName = "no_sign"; + case CWMAPTYPE_N3D: + break; + default: + switch (spearMission) + { + case 3: + moName = "no_sign"; + break; + } break; } break; case CWWALL_RED_BRICK: - switch (spearMission) + switch (map->type) { - case 2: - moName = "wall_chart"; + case CWMAPTYPE_N3D: break; - case 3: - moName = "skull_wall"; + default: + switch (spearMission) + { + case 2: + moName = "wall_chart"; + break; + case 3: + moName = "skull_wall"; + break; + } break; } break; case CWWALL_RED_BRICK_SWASTIKA: - switch (spearMission) + switch (map->type) { - case 1: - moName = "swastika_wreath"; - break; - case 2: - moName = "wall_nuke_sign"; + case CWMAPTYPE_N3D: + moName = "naamah_portrait"; break; - case 3: - moName = "swastika_wall"; + default: + switch (spearMission) + { + case 1: + moName = "swastika_wreath"; + break; + case 2: + moName = "wall_nuke_sign"; + break; + case 3: + moName = "swastika_wall"; + break; + } break; } break;