cpp/openttd-patchpack/source Changeset - r3652:28f6627cedcb

Changeset - r3652:28f6627cedcb

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

belugas - 18 years ago 2006-04-24 17:32:09
belugas@openttd.org

(svn r4564) CodeChange : Constify the sprites of _cargo_types_base_values

2 files changed with 43 insertions and 4 deletions:

table/landscape_const.h

table/sprites.h

0 comments (0 inline, 0 general)

table/landscape_const.h

➞

Show inline comments

 /* $Id$ */
 #include "sprites.h"
 typedef struct CargoTypesValues {
 	StringID names[NUM_CARGO];
 	StringID units_volume[NUM_CARGO];
 	byte weights[NUM_CARGO];
 	SpriteID sprites[NUM_CARGO];
@@ @@ -52,13 +54,15 @@ static const CargoTypesValues _cargo_typ @@
+		{
 , 16, 4, 16, 3, 8, 16, 16, 16, 16, 2, 0,
 		},
 		/* normal sprites */
+		{
 x10C9, 0x10CA, 0x10CB, 0x10CC, 0x10CD, 0x10CE, 0x10CF, 0x10D0, 0x10D1, 0x10D2, 0x10D3,
 			SPR_CARGO_PASSENGER,      SPR_CARGO_COAL,  SPR_CARGO_MAIL, SPR_CARGO_OIL,      SPR_CARGO_LIVESTOCK,
 			SPR_CARGO_GOODS,          SPR_CARGO_GRAIN, SPR_CARGO_WOOD, SPR_CARGO_IRON_ORE, SPR_CARGO_STEEL,
 			SPR_CARGO_VALUES_GOLD,    SPR_ASCII_SPACE
 		},
 		/* normal initial cargo payment */
+		{
 , 5916, 4550, 4437, 4322, 6144, 4778, 5005, 5120, 5688, 7509, 5688
 		},
@@ @@ -114,13 +118,15 @@ static const CargoTypesValues _cargo_typ @@
+		{
 , 16, 4, 16, 3, 8, 16, 16, 0, 16, 8, 16
 		},
 		/* hilly sprites */
+		{
 x10C9, 0x10CA, 0x10CB, 0x10CC, 0x10CD, 0x10CE, 0x10CF, 0x10D0, 0x2, 0x10D9, 0x10D3, 0x10D8
 			SPR_CARGO_PASSENGER,   SPR_CARGO_COAL,  SPR_CARGO_MAIL, SPR_CARGO_OIL,   SPR_CARGO_LIVESTOCK,
 			SPR_CARGO_GOODS,       SPR_CARGO_GRAIN, SPR_CARGO_WOOD, SPR_ASCII_SPACE, SPR_CARGO_PAPER,
 			SPR_CARGO_VALUES_GOLD, SPR_CARGO_FOOD
 		},
 		/* hilly initial cargo payment */
+		{
 , 5916, 4550, 4437, 4322, 6144, 4778, 5005, 5120, 5461, 5802, 5688
 		},
@@ @@ -176,13 +182,15 @@ static const CargoTypesValues _cargo_typ @@
+		{
 , 16, 4, 16, 16, 8, 16, 16, 16, 16, 2, 16,
 		},
 		/* desert sprites */
+		{
 x10C9, 0x10DA, 0x10CB, 0x10CC, 0x10D4, 0x10CE, 0x10CF, 0x10D0, 0x10D5, 0x10D6, 0x10D7, 0x10D8
 			SPR_CARGO_PASSENGER, SPR_CARGO_RUBBER, SPR_CARGO_MAIL, SPR_CARGO_OIL,        SPR_CARGO_FRUIT,
 			SPR_CARGO_GOODS,     SPR_CARGO_GRAIN,  SPR_CARGO_WOOD, SPR_CARGO_COPPER_ORE, SPR_CARGO_WATERCOLA,
 			SPR_CARGO_DIAMONDS,  SPR_CARGO_FOOD
 		},
 		/* desert initial cargo payment */
+		{
 , 4437, 4550, 4892, 4209, 6144, 4322, 7964, 4892, 4664, 5802, 5688
 		},
@@ @@ -238,13 +246,15 @@ static const CargoTypesValues _cargo_typ @@
+		{
 , 16, 4, 2, 4, 5, 16, 16, 16, 1, 16, 2
 		},
 		/* candy sprites */
+		{
 x10C9, 0x10DC, 0x10CB, 0x10DD, 0x10E3, 0x10DB, 0x10E0, 0x10D6, 0x10DE, 0x10E1, 0x10E2, 0x10DF
 			SPR_CARGO_PASSENGER, SPR_CARGO_SUGAR,  SPR_CARGO_MAIL,      SPR_CARGO_TOYS,        SPR_CARGO_BATTERIES,
 			SPR_CARGO_CANDY,     SPR_CARGO_TOFFEE, SPR_CARGO_WATERCOLA, SPR_CARGO_COTTONCANDY, SPR_CARGO_BUBBLES,
 			SPR_CARGO_PLASTIC,   SPR_CARGO_FIZZYDRINK
 		},
 		/* candy initial cargo payment */
+		{
 , 4437, 4550, 5574, 4322, 6144, 4778, 4892, 5005, 5077, 4664, 6250
 		},

table/sprites.h

➞

Show inline comments

@@ @@ -909,12 +909,41 @@ enum Sprites { @@
 	SPR_IT_TOY_FACTORY_STAMP_HOLDER = 4717,
 	SPR_IT_TOY_FACTORY_STAMP        = 4718,
 	SPR_IT_TOY_FACTORY_CLAY         = 4719,
 	SPR_IT_TOY_FACTORY_ROBOT        = 4720,
 	SPR_IT_POWER_PLANT_TRANSFORMERS = 2054,
 	/*small icons of cargo available in station waiting*/
 	SPR_CARGO_PASSENGER             = 4297,
 	SPR_CARGO_COAL                  = 4298,
 	SPR_CARGO_MAIL                  = 4299,
 	SPR_CARGO_OIL                   = 4300,
 	SPR_CARGO_LIVESTOCK             = 4301,
 	SPR_CARGO_GOODS                 = 4302,
 	SPR_CARGO_GRAIN                 = 4303,
 	SPR_CARGO_WOOD                  = 4304,
 	SPR_CARGO_IRON_ORE              = 4305,
 	SPR_CARGO_STEEL                 = 4306,
 	SPR_CARGO_VALUES_GOLD           = 4307,  /*shared between temperate and arctic*/
 	SPR_CARGO_FRUIT                 = 4308,
 	SPR_CARGO_COPPER_ORE            = 4309,
 	SPR_CARGO_WATERCOLA             = 4310,  /*shared between desert and toyland*/
 	SPR_CARGO_DIAMONDS              = 4311,
 	SPR_CARGO_FOOD                  = 4312,
 	SPR_CARGO_PAPER                 = 4313,
 	SPR_CARGO_RUBBER                = 4314,
 	SPR_CARGO_CANDY                 = 4315,
 	SPR_CARGO_SUGAR                 = 4316,
 	SPR_CARGO_TOYS                  = 4317,
 	SPR_CARGO_COTTONCANDY           = 4318,
 	SPR_CARGO_FIZZYDRINK            = 4319,
 	SPR_CARGO_TOFFEE                = 4320,
 	SPR_CARGO_BUBBLES               = 4321,
 	SPR_CARGO_PLASTIC               = 4322,
 	SPR_CARGO_BATTERIES             = 4323,
 	/* Effect vehicles */
 	SPR_BULLDOZER_NE = 1416,
 	SPR_BULLDOZER_SE = 1417,
 	SPR_BULLDOZER_SW = 1418,
 	SPR_BULLDOZER_NW = 1419,

0 comments (0 inline, 0 general)