ADD: texture for tunnel grounds (Obj=misc, Name=TunnelTexture, Image …

…with numbers 0,3,6,9) git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@3290 8aca7d54-2c30-db11-9de9-000461428c89
artdent · May 15, 2010 · 8177cdb · 8177cdb
1 parent e5e0bc2
commit 8177cdb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/boden/tunnelboden.cc b/boden/tunnelboden.cc
@@ -47,7 +47,7 @@ tunnelboden_t::calc_bild_internal()
 				boden_t::calc_bild_internal();
 			}
 			// default tunnel ground images
-			set_bild(skinverwaltung_t::fussweg->get_bild_nr(0));
+			set_bild(skinverwaltung_t::tunnel_texture->get_bild_nr(0));
 			clear_flag(draw_as_ding);
 		}
 		else {
@@ -70,7 +70,7 @@ tunnelboden_t::calc_bild_internal()
 		clear_back_bild();
 		if (is_visible()) {
 			// default tunnel ground images
-			set_bild(skinverwaltung_t::fussweg->get_bild_nr(get_disp_slope()));
+			set_bild(skinverwaltung_t::tunnel_texture->get_bild_nr(get_disp_slope()));
 		}
 		else {
 			set_bild(IMG_LEER);

diff --git a/simskin.cc b/simskin.cc
@@ -51,6 +51,7 @@ const skin_besch_t* skinverwaltung_t::construction_site  = NULL;
 const skin_besch_t* skinverwaltung_t::fussweg            = NULL;
 const skin_besch_t* skinverwaltung_t::pumpe              = NULL;
 const skin_besch_t* skinverwaltung_t::senke              = NULL;
+const skin_besch_t* skinverwaltung_t::tunnel_texture     = NULL;
 
 slist_tpl<const skin_besch_t *>skinverwaltung_t::extra_obj;
 
@@ -60,6 +61,7 @@ static spezial_obj_tpl<skin_besch_t> misc_objekte[] = {
 	{ &skinverwaltung_t::pumpe,             "PowerSource"  },
 	{ &skinverwaltung_t::construction_site, "Construction" },
 	{ &skinverwaltung_t::fussweg,           "Sidewalk"     },
+	{ &skinverwaltung_t::tunnel_texture,    "TunnelTexture"},
 	{ NULL, NULL }
 };
 
@@ -122,7 +124,13 @@ bool skinverwaltung_t::alles_geladen(skintyp_t type)
 		case menu:    sb = menu_objekte;       break;
 		case cursor:  sb = cursor_objekte;     break;
 		case symbol:  sb = symbol_objekte;     break;
-		case misc:    sb = misc_objekte;	   break;
+		case misc:
+			sb = misc_objekte;
+			// for compatibility: use sidewalk as tunneltexture
+			if (tunnel_texture==NULL) {
+				tunnel_texture = fussweg;
+			}
+			break;
 		case nothing: return true;
 		default:      return false;
 	}

diff --git a/simskin.h b/simskin.h
@@ -67,6 +67,7 @@ class skinverwaltung_t {
 	static const skin_besch_t *fussweg;
 	static const skin_besch_t *pumpe;	// since those are no buildings => change to buildings soon
 	static const skin_besch_t *senke;
+	static const skin_besch_t *tunnel_texture;
 
 	static slist_tpl<const skin_besch_t *>extra_obj;
 

diff --git a/simutrans/history.txt b/simutrans/history.txt
@@ -53,6 +53,7 @@
 	ADD: winter image and timeline for crossings: winter images of [image][0] are [image][1]
 	ADD: powerline stabilisation pak which enforces a single transformer next to factories/power stations
 	ADD: enable to use more than one powerline object
+	ADD: texture for tunnel grounds (Obj=misc, Name=TunnelTexture, Image with numbers 0,3,6,9)
 
 Release of 102.2.2 (r3131 on 8-Mar-2010):
 	FIX: connecting upslope to upper way works in sliced mode (r2949)