diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index e8c2bbba..6439c27a 100755 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -20,7 +20,7 @@ mapmodel 0 8 0 0 "ladder_8x" //6 mapmodel 0 10 0 0 "ladder_10x" //7 mapmodel 0 11 0 0 "ladder_11x" //8 mapmodel 0 15 0 0 "ladder_15x" //9 -mapmodel 1 11 0 0 "dcp/streetlamp" //10 +mapmodel 1 12 0 0 "streetlamp" //10 mapmodel 1 12 0 0 "streetlamp" //11 mapmodel 3 2 0 0 "bench" //12 mapmodel 2 4 0 0 "dumpster" //13 @@ -47,7 +47,7 @@ mapmodel 0 0 0 0 "bulb" //30 mapmodel 1 3 0 0 "barrel" //31 mapmodel 1 2 0 0 "barrel2" //32 mapmodel 0 0 0 0 "elektro" //33 -mapmodel 3 1 0 0 "dcp/palette" //34 +mapmodel 3 1 0 0 "europalette" //34 mapmodel 0 0 0 0 "gastank" //35 use nothing model to clip mapmodel 2 1 0 0 "gutter_h" //36 mapmodel 1 2 0 0 "gutter_v" //37 diff --git a/config/menus.cfg b/config/menus.cfg index 73f2b8df..192827cd 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -131,8 +131,8 @@ menuitem "Ladder(15)" "newent mapmodel 9" newmenu street -menuitem "Streetlight1" "newent mapmodel 10" -menuitem "Streetlight2" "newent mapmodel 11" + +menuitem "Streetlight" "newent mapmodel 11" menuitem "Bench" "newent mapmodel 12" menuitem "Dumpster" "newent mapmodel 13" menuitem "Roadblock" "newent mapmodel 14" diff --git a/packages/maps/ac_complex.cfg b/packages/maps/ac_complex.cfg index 937f6e63..362cd222 100644 --- a/packages/maps/ac_complex.cfg +++ b/packages/maps/ac_complex.cfg @@ -10,8 +10,8 @@ mapmodel 0 10 0 0 "ladder_10x" mapmodel 1 3 0 0 "barrel" mapmodel 1 2 0 0 "barrel2" mapmodel 0 0 0 0 "elektro" -mapmodel 1 11 0 0 "dcp/streetlamp" -mapmodel 3 1 0 0 "dcp/palette" +mapmodel 1 11 0 0 "streetlamp" +mapmodel 3 1 0 0 "europalette" mapmodel 3 2 0 0 "bench" mapmodel 0 0 0 0 "signs/flammable" mapmodel 0 0 0 0 "signs/speed" diff --git a/packages/maps/ac_depot.cfg b/packages/maps/ac_depot.cfg index 77c1ff39..88a26122 100644 --- a/packages/maps/ac_depot.cfg +++ b/packages/maps/ac_depot.cfg @@ -43,8 +43,8 @@ mapmodel 0 10 0 0 "ladder_10x" //4 mapmodel 1 3 0 0 "barrel" //5 mapmodel 1 2 0 0 "barrel2" //6 mapmodel 0 0 0 0 "elektro" //7 -mapmodel 1 11 0 0 "dcp/streetlamp" //8 -mapmodel 3 1 0 0 "dcp/palette" //9 +mapmodel 1 11 0 0 "streetlamp" //8 +mapmodel 3 1 0 0 "europalette" //9 mapmodel 3 2 0 0 "bench" //10 mapmodel 0 0 0 0 "signs/flammable"//11 mapmodel 0 0 0 0 "signs/speed" //12 diff --git a/packages/maps/ac_mines.cfg b/packages/maps/ac_mines.cfg index 94d9ad34..fdb43150 100644 --- a/packages/maps/ac_mines.cfg +++ b/packages/maps/ac_mines.cfg @@ -9,8 +9,8 @@ mapmodel 0 0 0 0 "ladder_10x" //4 mapmodel 1 3 0 0 "barrel" //5 mapmodel 1 2 0 0 "barrel2" //6 mapmodel 0 0 0 0 "elektro" //7 -mapmodel 1 11 0 0 "dcp/streetlamp" //8 -mapmodel 3 1 0 0 "dcp/palette" //9 +mapmodel 1 11 0 0 "streetlamp" //8 +mapmodel 3 1 0 0 "europalette" //9 mapmodel 3 2 0 0 "bench" //10 mapmodel 0 0 0 0 "signs/flammable"//11 mapmodel 0 0 0 0 "signs/speed" //12 diff --git a/packages/models/mapmodels/dcp/palette/skin.jpg b/packages/models/mapmodels/dcp/palette/skin.jpg deleted file mode 100755 index 596164d5..00000000 Binary files a/packages/models/mapmodels/dcp/palette/skin.jpg and /dev/null differ diff --git a/packages/models/mapmodels/dcp/palette/tris.md2 b/packages/models/mapmodels/dcp/palette/tris.md2 deleted file mode 100755 index 5762c234..00000000 Binary files a/packages/models/mapmodels/dcp/palette/tris.md2 and /dev/null differ diff --git a/packages/models/mapmodels/dcp/streetlamp/readme.txt b/packages/models/mapmodels/dcp/streetlamp/readme.txt deleted file mode 100755 index 72ca31b1..00000000 --- a/packages/models/mapmodels/dcp/streetlamp/readme.txt +++ /dev/null @@ -1,34 +0,0 @@ -model: street lamp - designed for use in the game cube - created 01.2004 using milkshape 3D - - -creator: dietmar pier, http://www.dietmarpier.de - -stats: vertices: 145 - polygons: 240 - skins: 1 - -description: unzip the tris.md2 and skin.pcx files to cube/packages/models/ using 'full path information' (how is this - option named exactly in the english version of winzip???) - - add the following lines at the END of cube/data/models.cfg - - loadmodel "streetlamp" - mapmodel 1 10 0 0 - - when editing a map, select a floor cube, hit the console key and type 'newent mapmodel XY Z' where XY has to - be replaced by the correspondent number of the new mapmodel in your models.cfg... - - note: when you place the lamp, the head of it will point to your position... - -copyright: it's free to use for eveyone who likes to. if you want to use it for something else than cube, please drop - me a line, i just want to know... - -credits: id-software (.tris) - - chumbalum-soft (milkshape3D, it just took 3 days to understand the basics, one more to make my first working - models for cube) - - aardappel (i love cube! it's so easy/fun to modify things like models, textures, sounds. man, you gave me a - new chance to make use of my pathologic creativity, since my musical carrier has come to a grinding halt...) diff --git a/packages/models/mapmodels/dcp/streetlamp/skin.jpg b/packages/models/mapmodels/dcp/streetlamp/skin.jpg deleted file mode 100755 index 5e94a42a..00000000 Binary files a/packages/models/mapmodels/dcp/streetlamp/skin.jpg and /dev/null differ diff --git a/packages/models/mapmodels/dcp/streetlamp/tris.md2 b/packages/models/mapmodels/dcp/streetlamp/tris.md2 deleted file mode 100755 index ad935f9e..00000000 Binary files a/packages/models/mapmodels/dcp/streetlamp/tris.md2 and /dev/null differ diff --git a/packages/models/mapmodels/europalette/skin.jpg b/packages/models/mapmodels/europalette/skin.jpg new file mode 100644 index 00000000..d0a185b8 Binary files /dev/null and b/packages/models/mapmodels/europalette/skin.jpg differ diff --git a/packages/models/mapmodels/europalette/tris.md2 b/packages/models/mapmodels/europalette/tris.md2 new file mode 100644 index 00000000..135906bf Binary files /dev/null and b/packages/models/mapmodels/europalette/tris.md2 differ