More cleanup.

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7051 e016b1c5-ed68-44aa-a2f7-31cac88cffde

config/default_map_settings.cfg

@@ -159,11 +159,11 @@ mapmodel 1 2 8 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 "rattrap/cbbox"		// 131
-mapmodel 0 0 4 0 "rattrap/hanginlamp"		// 132
-mapmodel 0 2 0 0 "rattrap/ventflap"		// 133
-mapmodel 1 1 0 0 "rattrap/milkcrate1"		// 134
-mapmodel 1 1 0 0 "rattrap/milkcrate2"		// 135
+mapmodel 1 2 0 0 "jcdpc/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
+mapmodel 1 1 0 0 "ratboy/toca_milkcrate_blue"	// 135
 mapmodel 0 1 1 0 "misterfloppy/hanging_ladder/ladder_2"		// 136
 mapmodel 0 3 3 0 "misterfloppy/hanging_ladder/ladder_6"		// 137
 mapmodel 0 1 1 0 "misterfloppy/hanging_ladder/ladder_top"	// 138

packages/maps/official/ac_aqueous.cfg

@@ -51,7 +51,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_arabian.cfg

@@ -48,7 +48,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_arctic.cfg

@@ -50,7 +50,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_arid.cfg

@@ -50,7 +50,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_avenue.cfg

@@ -48,7 +48,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"
@@ -151,9 +151,9 @@ mapmodel 1 2 8 0 "toca/barbwire"
 mapmodel 1 1 0 0 "toca/shelf"
 mapmodel 4 1 15 0 "toca/guardtower"
 mapmodel 1 2 0 0 "toca/treetrunk1"
-mapmodel 1 2 0 0 "rattrap/cbbox"
-mapmodel 0 0 4 0 "rattrap/hanginlamp"
-mapmodel 0 2 0 0 "rattrap/ventflap"
+mapmodel 1 2 0 0 "jcdpc/cardboardbox"
+mapmodel 0 0 4 0 "jcdpc/hanginglamp"
+mapmodel 0 2 0 0 "jcdpc/ventflap"
 mapmodel 1 1 0 0 "rattrap/milkcrate1"
 mapmodel 1 1 0 0 "rattrap/milkcrate2"
 mapmodel 0 1 1 0 "misterfloppy/hanging_ladder/ladder_2"
@@ -464,12 +464,10 @@ mapsound "ambience/t_alarm01.ogg" -1
 mapsound "ambience/flies.ogg" -1
 mapsound "ambience/deserthawk.ogg" -1
 mapsound "ambience/owl.ogg" -1
-mapsound "ambience/citynoisebirds.ogg" -1nce/t_gastank.ogg" -1
-
+mapsound "ambience/citynoisebirds.ogg" -1
+mapsound "ambience/t_gastank.ogg" -1
 mapsound "ambience/t_keyboard.ogg" 1
-
 mapsound "ambience/t_factory01.ogg" -1
-
 mapsound "ambience/t_vents.ogg" -1
+mapsound "ambience/t_waterfront.ogg" -1
 
-mapsound "ambience/t_waterfront.ogg

packages/maps/official/ac_depot.cfg

@@ -24,7 +24,7 @@ mapmodel 0 0 0 0 "signs/maint"
 mapmodel 0 0 0 0 "signs/caution"
 mapmodel 0 0 0 0 "signs/biohazard"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "light01"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 0 0 0 0 "gastank"

packages/maps/official/ac_depot_classic.cfg

@@ -24,7 +24,7 @@ mapmodel 0 0 0 0 "signs/maint"
 mapmodel 0 0 0 0 "signs/caution"
 mapmodel 0 0 0 0 "signs/biohazard"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "light01"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 0 0 0 0 "gastank"

packages/maps/official/ac_desert.cfg

@@ -32,7 +32,7 @@ mapmodel 0 0 0 0 "grass02_d"
 mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 3 0 "poster"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_desert2.cfg

@@ -31,7 +31,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_desert3.cfg

@@ -30,7 +30,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_douze.cfg

@@ -34,7 +34,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_edifice.cfg

@@ -49,7 +49,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_elevation.cfg

@@ -28,7 +28,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_gothic.cfg

@@ -29,7 +29,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_iceroad.cfg

@@ -49,7 +49,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_industrial.cfg

@@ -49,7 +49,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_ingress.cfg

@@ -57,7 +57,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_keller.cfg

@@ -52,7 +52,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_mines.cfg

@@ -22,7 +22,7 @@ mapmodel 0 0 0 0 "signs/maint"
 mapmodel 0 0 0 0 "signs/caution"
 mapmodel 0 0 0 0 "signs/biohazard"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "light01"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 0 0 0 0 "gastank"

packages/maps/official/ac_outpost.cfg

@@ -55,7 +55,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_power.cfg

@@ -32,7 +32,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 1 7 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_rattrap.cfg

@@ -124,6 +124,7 @@ texture 0 "./rattrap/rb_trim_01.jpg"
 texture 0 "./rattrap/rb_trim_02.jpg"
 texture 0 "./rattrap/rb_window.jpg"
 texture 0 "./rattrap/rb_window2.jpg"
+texture 0 "../models/mapmodels/ratboy/jcdpc_cardboardbox_reskin/skin.jpg"
 mapmodelreset
 mapmodel 1 3 0 0 "barrel"
 mapmodel 1 2 0 0 "barrel2"
@@ -146,7 +147,7 @@ mapmodel 0 0 0 0 "flyer"
 mapmodel 0 0 0 0 "gastank"
 mapmodel 0 0 0 0 "grass01"
 mapmodel 0 0 0 0 "hook"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "light01"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "poster"
@@ -159,10 +160,10 @@ mapmodel 0 0 0 0 "strahler"
 mapmodel 0 12 0 0 "streetlamp"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 0 0 0 0 "wrench"
-mapmodel 1 2 0 0 "rattrap/cbbox"
-mapmodel 1 2 0 0 "rattrap/rbbox"
-mapmodel 0 0 0 0 "rattrap/hanginlamp"
-mapmodel 0 0 0 0 "rattrap/ventflap"
+mapmodel 1 2 0 0 "jcdpc/cardboardbox"
+mapmodel 0 0 0 0 "nothing"
+mapmodel 0 0 0 0 "jcdpc/hanginglamp"
+mapmodel 0 0 0 0 "jcdpc/ventflap"
 mapmodel 0 0 0 0 "toca/bullet"
 mapmodel 1 1 0 0 "toca/cinderblock"
 mapmodel 0 0 0 0 "toca/corrugated/beam"
@@ -183,8 +184,8 @@ mapmodel 1 2 0 0 "toca/trashbag"
 mapmodel 1 3 0 0 "toca/trashcan"
 mapmodel 1 1 0 0 "toca/tyre"
 mapmodel 1 0 0 0 "toca/wheel"
-mapmodel 1 1 0 0 "rattrap/milkcrate1"
-mapmodel 1 1 0 0 "rattrap/milkcrate2"
+mapmodel 1 1 0 0 "ratboy/toca_milkcrate_red"
+mapmodel 1 1 0 0 "ratboy/toca_milkcrate_blue"
 mapmodel 1 3 0 0 "rattrapbarrel"
 mapmodel 1 2 0 0 "rattrapbarrel2"
 mapmodel 0 0 0 0 "toca/platformmet"

packages/maps/official/ac_scaffold.cfg

@@ -29,7 +29,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 1 7 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_shine.cfg

@@ -27,7 +27,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_snow.cfg

@@ -28,7 +28,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_stellar.cfg

@@ -49,7 +49,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_sunset.cfg

@@ -30,7 +30,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 1 7 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_toxic.cfg

@@ -52,7 +52,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 30 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_urban.cfg

@@ -29,7 +29,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 0 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/maps/official/ac_werk.cfg

@@ -52,7 +52,7 @@ mapmodel 0 0 0 0 "plant01_d"
 mapmodel 0 0 0 0 "plant01_s"
 mapmodel 0 0 0 0 "tree01"
 mapmodel 1 2 0 0 "chair1"
-mapmodel 0 0 0 0 "laptop1"
+mapmodel 0 0 0 0 "jcdpc/laptop"
 mapmodel 0 0 0 0 "picture1"
 mapmodel 1 6 0 0 "locker"
 mapmodel 0 0 0 0 "strahler"

packages/models/mapmodels/ratboy/license.txt

@@ -1,11 +1,16 @@
 ================================================================================
-jcdpc_cardboardbox_skin.jpg is a modification of:
+ * ./jcdpc_cardboardbox_reskin/skin.jpg
+
+...is a modification of:
 	../../../textures/zastrow/wood_crate_10.jpg
 
 As such, it is licensed the same. Please read this file for its license:
 	../../../textures/zastrow/license.txt
 ================================================================================
-toca_milkcrate_skin.jpg & toca_milkcrate2_skin.jpg are modifications of:
+ * ./toca_milkcrate_blue/skin.jpg
+ * ./toca_milkcrate_blue/skin.jpg
+
+... are modifications of:
 	../toca/milkcrate/skin.png
 
 As such, it is licensed the same. Please read this file for its license:

packages/models/mapmodels/ratboy/toca_milkcrate_blue/md3.cfg

@@ -0,0 +1,5 @@
+md3load ../../toca/milkcrate/tris.md3
+md3skin mesh ./skin.jpg
+
+// needed so that thin lines don't get too blended
+mdlalphatest 30

packages/models/mapmodels/ratboy/toca_milkcrate_red/md3.cfg

@@ -0,0 +1,5 @@
+md3load ../../toca/milkcrate/tris.md3
+md3skin mesh ./skin.jpg
+
+// needed so that thin lines don't get too blended
+mdlalphatest 30