diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index dfe4fe2a..5235937a 100644 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -158,7 +158,7 @@ mapmodel 1 2 0 0 "toca/barbwire" // 127 mapmodel 1 1 0 0 "toca/shelf" // 128 mapmodel 4 1 15 0 "toca/guardtower" // 129 mapmodel 1 2 0 0 "toca/treetrunk1" // 130 -mapmodel 1 2 0 0 "jcdpc/cardboardbox" // 131 +mapmodel 0 2 0 0 "toca/cardboardbox" // 131 mapmodel 0 0 4 0 "jcdpc/hanginglamp" // 132 mapmodel 0 2 0 0 "jcdpc/ventflap" // 133 mapmodel 1 1 0 0 "ratboy/toca_milkcrate_red" // 134 diff --git a/packages/maps/new.cfg b/packages/maps/new.cfg index e5f1f1bd..1e82a15b 100644 --- a/packages/maps/new.cfg +++ b/packages/maps/new.cfg @@ -49,6 +49,7 @@ mapmodel 0 1 0 0 "toca/paintcan" //43 mapmodel 0 0 0 0 "toca/droppedceiling/single" //44 mapmodel 0 0 0 0 "toca/droppedceiling/light1" //45 mapmodel 0 0 0 0 "toca/droppedceiling/light2" //46 +mapmodel 0 2 0 0 "toca/cardboardbox" //47 diff --git a/packages/maps/new.cgz b/packages/maps/new.cgz index 5de4b30a..2598ff48 100644 Binary files a/packages/maps/new.cgz and b/packages/maps/new.cgz differ diff --git a/packages/models/mapmodels/jcdpc/cardboardbox/skin.jpg b/packages/models/mapmodels/jcdpc/cardboardbox/skin.jpg deleted file mode 100644 index 462d5411..00000000 Binary files a/packages/models/mapmodels/jcdpc/cardboardbox/skin.jpg and /dev/null differ diff --git a/packages/models/mapmodels/jcdpc/cardboardbox/tris.md2 b/packages/models/mapmodels/jcdpc/cardboardbox/tris.md2 deleted file mode 100644 index 90fda647..00000000 Binary files a/packages/models/mapmodels/jcdpc/cardboardbox/tris.md2 and /dev/null differ diff --git a/packages/models/mapmodels/toca/cardboardbox/skin.jpg b/packages/models/mapmodels/toca/cardboardbox/skin.jpg new file mode 100644 index 00000000..664b5927 Binary files /dev/null and b/packages/models/mapmodels/toca/cardboardbox/skin.jpg differ diff --git a/packages/models/mapmodels/toca/cardboardbox/tris.md3 b/packages/models/mapmodels/toca/cardboardbox/tris.md3 new file mode 100644 index 00000000..c532f1d4 Binary files /dev/null and b/packages/models/mapmodels/toca/cardboardbox/tris.md3 differ