industry_cmd.c
changeset 3494 ba64f1689870
parent 3491 35d747bb5e82
child 3495 6672c181ace4
equal deleted inserted replaced
3493:c77bcf04294d 3494:ba64f1689870
   412 static void GetAcceptedCargo_Industry(TileIndex tile, AcceptedCargo ac)
   412 static void GetAcceptedCargo_Industry(TileIndex tile, AcceptedCargo ac)
   413 {
   413 {
   414 	uint gfx = GetIndustryGfx(tile);
   414 	uint gfx = GetIndustryGfx(tile);
   415 	CargoID a;
   415 	CargoID a;
   416 
   416 
   417 	a = _industry_map5_accepts_1[gfx];
   417 	a = _industry_section_accepts_1[gfx];
   418 	if (a != CT_INVALID) ac[a] = (a == 0) ? 1 : 8;
   418 	if (a != CT_INVALID) ac[a] = (a == 0) ? 1 : 8;
   419 
   419 
   420 	a = _industry_map5_accepts_2[gfx];
   420 	a = _industry_section_accepts_2[gfx];
   421 	if (a != CT_INVALID) ac[a] = 8;
   421 	if (a != CT_INVALID) ac[a] = 8;
   422 
   422 
   423 	a = _industry_map5_accepts_3[gfx];
   423 	a = _industry_section_accepts_3[gfx];
   424 	if (a != CT_INVALID) ac[a] = 8;
   424 	if (a != CT_INVALID) ac[a] = 8;
   425 }
   425 }
   426 
   426 
   427 static void GetTileDesc_Industry(TileIndex tile, TileDesc *td)
   427 static void GetTileDesc_Industry(TileIndex tile, TileDesc *td)
   428 {
   428 {
   480 		i->last_mo_production[0] += cw;
   480 		i->last_mo_production[0] += cw;
   481 
   481 
   482 		am = MoveGoodsToStation(i->xy, i->width, i->height, i->produced_cargo[0], cw);
   482 		am = MoveGoodsToStation(i->xy, i->width, i->height, i->produced_cargo[0], cw);
   483 		i->last_mo_transported[0] += am;
   483 		i->last_mo_transported[0] += am;
   484 		if (am != 0) {
   484 		if (am != 0) {
   485 			uint newgfx = _industry_produce_map5[GetIndustryGfx(tile)];
   485 			uint newgfx = _industry_produce_section[GetIndustryGfx(tile)];
   486 
   486 
   487 			if (newgfx != 0xFF) {
   487 			if (newgfx != 0xFF) {
   488 				_m[tile].m1 = 0x80;
   488 				_m[tile].m1 = 0x80;
   489 				SetIndustryGfx(tile, newgfx);
   489 				SetIndustryGfx(tile, newgfx);
   490 				MarkTileDirtyByTile(tile);
   490 				MarkTileDirtyByTile(tile);
   754 
   754 
   755 	if (_game_mode == GM_EDITOR) return;
   755 	if (_game_mode == GM_EDITOR) return;
   756 
   756 
   757 	TransportIndustryGoods(tile);
   757 	TransportIndustryGoods(tile);
   758 
   758 
   759 	newgfx = _industry_map5_animation_next[GetIndustryGfx(tile)];
   759 	newgfx = _industry_section_animation_next[GetIndustryGfx(tile)];
   760 	if (newgfx != 255) {
   760 	if (newgfx != 255) {
   761 		_m[tile].m1 = 0;
   761 		_m[tile].m1 = 0;
   762 		SetIndustryGfx(tile, newgfx);
   762 		SetIndustryGfx(tile, newgfx);
   763 		MarkTileDirtyByTile(tile);
   763 		MarkTileDirtyByTile(tile);
   764 		return;
   764 		return;
  1257 	}
  1257 	}
  1258 
  1258 
  1259 	return t;
  1259 	return t;
  1260 }
  1260 }
  1261 
  1261 
  1262 static const byte _industry_map5_bits[] = {
  1262 static const byte _industry_section_bits[] = {
  1263 	16, 16, 16, 16, 16, 16, 16, 16,
  1263 	16, 16, 16, 16, 16, 16, 16, 16,
  1264 	16, 16, 16, 16, 16, 16, 16, 16,
  1264 	16, 16, 16, 16, 16, 16, 16, 16,
  1265 	16, 16, 16, 16, 16, 16, 16, 16,
  1265 	16, 16, 16, 16, 16, 16, 16, 16,
  1266 	16, 16, 16, 16, 16, 16, 16, 16,
  1266 	16, 16, 16, 16, 16, 16, 16, 16,
  1267 	16, 16, 16, 16, 16, 16, 16, 16,
  1267 	16, 16, 16, 16, 16, 16, 16, 16,
  1314 				tileh = GetTileSlope(cur_tile, NULL);
  1314 				tileh = GetTileSlope(cur_tile, NULL);
  1315 				if (IsSteepTileh(tileh)) return false;
  1315 				if (IsSteepTileh(tileh)) return false;
  1316 
  1316 
  1317 				if (tileh != 0) {
  1317 				if (tileh != 0) {
  1318 					int t;
  1318 					int t;
  1319 					byte bits = _industry_map5_bits[it->gfx];
  1319 					byte bits = _industry_section_bits[it->gfx];
  1320 
  1320 
  1321 					if (bits & 0x10) return false;
  1321 					if (bits & 0x10) return false;
  1322 
  1322 
  1323 					t = ~tileh;
  1323 					t = ~tileh;
  1324 
  1324