Merge remote branch 'origin/fruitiex/dance_delete_flyingbarrel'

diff --git a/maps/dance.map b/maps/dance.map
index a2170f77f5c3745d26e65516e1e8316823037509..6d8fcaf12f407bab6fd73579ceed5033a7a88f8f 100644 (file)
--- a/maps/dance.map
+++ b/maps/dance.map
@@ -22135,21 +22135,12 @@ effects_jumppad/jumppadfx1_a
 }
 {
 "classname" "misc_model"
-"origin" "1052.000000 747.999939 92.000000"
-"model" "models/containers/barrel01.md3"
-"spawnflags" "2"
-"_receiveshadows" "1"
-"_castshadows" "1"
-"angle" "-45.828182"
-}
-{
-"classname" "misc_model"
-"origin" "1084.000000 704.000000 107.000023"
+"origin" "-1083.999878 -672.000000 106.999786"
 "model" "models/containers/barrel01.md3"
 "spawnflags" "2"
 "_receiveshadows" "1"
 "_castshadows" "1"
-"angles" "18.369183 11.335669 90.000000"
+"angles" "61.630806 -169.335648 -90.000000"
 }
 {
 "classname" "misc_model"
@@ -22162,15 +22153,6 @@ effects_jumppad/jumppadfx1_a
 }
 {
 "classname" "misc_model"
-"origin" "1111.999878 723.999939 91.999992"
-"model" "models/containers/barrel01.md3"
-"spawnflags" "2"
-"_receiveshadows" "1"
-"_castshadows" "1"
-"angle" "18.369181"
-}
-{
-"classname" "misc_model"
 "origin" "1422.999878 732.000183 91.999985"
 "model" "models/containers/barrel01.md3"
 "spawnflags" "2"
@@ -23753,15 +23735,6 @@ effects_jumppad/jumppadfx1_a
 }
 {
 "classname" "misc_model"
-"origin" "-1567.845703 1709.588135 -1642.999634"
-"model" "models/containers/barrel01.md3"
-"spawnflags" "2"
-"_receiveshadows" "1"
-"_castshadows" "1"
-"angles" "-18.369184 -168.664337 -90.000000"
-}
-{
-"classname" "misc_model"
 "origin" "-1450.999512 -699.000000 91.999985"
 "model" "models/containers/barrel01.md3"
 "spawnflags" "2"
@@ -23872,3 +23845,30 @@ effects_jumppad/jumppadfx1_a
 "origin" "-832.000000 2560.000000 144.000000"
 "angle" "0.000003"
 }
+{
+"classname" "misc_model"
+"origin" "1052.000000 747.999939 92.000000"
+"model" "models/containers/barrel01.md3"
+"spawnflags" "2"
+"_receiveshadows" "1"
+"_castshadows" "1"
+"angle" "-45.828182"
+}
+{
+"classname" "misc_model"
+"origin" "1111.999878 723.999939 91.999992"
+"model" "models/containers/barrel01.md3"
+"spawnflags" "2"
+"_receiveshadows" "1"
+"_castshadows" "1"
+"angle" "18.369181"
+}
+{
+"classname" "misc_model"
+"origin" "1084.000000 704.000000 107.000023"
+"model" "models/containers/barrel01.md3"
+"spawnflags" "2"
+"_receiveshadows" "1"
+"_castshadows" "1"
+"angles" "18.369183 11.335669 90.000000"
+}