Changeset - r6600:2b0be8fe1fde
Parent rev.
Child rev.
[Not reviewed]
master
0 5 0
maedhros - 17 years ago 2007-05-08 14:28:55
maedhros@openttd.org
(svn r9814) -Fix (r1): Remove the duplicate sign sprite from openttd.grf since it's in the original data files.
5 files changed with 34 insertions and 35 deletions:
bin/data/openttd.grf
bin+mod
src/table/files.h
1
1
src/table/sprites.h
31
32
src/terraform_gui.cpp
1
1
src/transparency_gui.cpp
1
1
0 comments (0 inline, 0 general)
bin/data/openttd.grf
➞
Show inline comments
 
binary diff not shown
src/table/files.h
➞
Show inline comments
 
@@ -56,10 +56,10 @@ static MD5File files_openttd[] = {
 
	{ "nsignalsw.grf", { 0x65, 0xb9, 0xd7, 0x30, 0x56, 0x06, 0xcc, 0x9e, 0x27, 0x57, 0xc8, 0xe4, 0x9b, 0xb3, 0x66, 0x81 } },
 
	{ "2ccmap.grf",    { 0x20, 0x03, 0x32, 0x1a, 0x43, 0x6c, 0xc1, 0x05, 0x80, 0xbd, 0x43, 0xeb, 0xe1, 0xfd, 0x0c, 0x62 } },
 
	{ "airports.grf",  { 0xfd, 0xa4, 0x38, 0xd6, 0x9c, 0x81, 0x74, 0xfe, 0xa0, 0x98, 0xa2, 0x14, 0x4b, 0x15, 0xb8, 0x4b } },
 
	{ "autorail.grf",  { 0xed, 0x44, 0x7f, 0xbb, 0x19, 0x44, 0x48, 0x4c, 0x07, 0x8a, 0xb1, 0xc1, 0x5c, 0x12, 0x3a, 0x60 } },
 
	{ "canalsw.grf",   { 0x13, 0x9c, 0x98, 0xcf, 0xb8, 0x7c, 0xd7, 0x1f, 0xca, 0x34, 0xa5, 0x6b, 0x65, 0x31, 0xec, 0x0f } },
 
	{ "elrailsw.grf",  { 0x4f, 0xf9, 0xac, 0x79, 0x50, 0x28, 0x9b, 0xe2, 0x15, 0x30, 0xa8, 0x1e, 0xd5, 0xfd, 0xe1, 0xda } },
 
	{ "openttd.grf",   { 0x10, 0xc1, 0x68, 0x56, 0x9e, 0x1e, 0x0e, 0x85, 0x9d, 0xf8, 0x53, 0x27, 0x48, 0x7e, 0x17, 0x58 } },
 
	{ "openttd.grf",   { 0x85, 0x4f, 0xf6, 0xb5, 0xd2, 0xf7, 0xbc, 0x1e, 0xb9, 0xdc, 0x44, 0xef, 0x35, 0x5f, 0x64, 0x9b } },
 
	{ "trkfoundw.grf", { 0x12, 0x33, 0x3f, 0xa3, 0xd1, 0x86, 0x8b, 0x04, 0x53, 0x18, 0x9c, 0xee, 0xf9, 0x2d, 0xf5, 0x95 } },
 
	{ "roadstops.grf", { 0x8c, 0xd9, 0x45, 0x21, 0x28, 0x82, 0x96, 0x45, 0x33, 0x22, 0x7a, 0xb9, 0x0d, 0xf3, 0x67, 0x4a } },
 
};
src/table/sprites.h
➞
Show inline comments
 
@@ -44,13 +44,13 @@ enum Sprites {
 
	/* ASCII */
 
	SPR_ASCII_SPACE       = 2,
 
	SPR_ASCII_SPACE_SMALL = 226,
 
	SPR_ASCII_SPACE_BIG   = 450,
 

			




	
	
	
		
 
	/* Extra graphic spritenumbers */

			




	
	
	
		
 
	OPENTTD_SPRITES_COUNT = 117, // number of gfx-sprites in openttd.grf

			




	
	
	
		
 
	OPENTTD_SPRITES_COUNT = 116, // number of gfx-sprites in openttd.grf

			




	
	
	
		
 
	SPR_SIGNALS_BASE  = 4896,

			




	
	
	
		
 
	SPR_CANALS_BASE   = SPR_SIGNALS_BASE + 486,

			




	
	
	
		
 
	SPR_SLOPES_BASE   = SPR_CANALS_BASE + 70,

			




	
	
	
		
 
	SPR_AUTORAIL_BASE = SPR_SLOPES_BASE + 78,

			




	
	
	
		
 
	SPR_ELRAIL_BASE   = SPR_AUTORAIL_BASE + 55,

			




	
	
	
		
 
	SPR_2CCMAP_BASE   = SPR_ELRAIL_BASE + 53,

			




	
	
		
 
@@ -59,50 +59,50 @@ enum Sprites {

			




	
	
	
		
 
	SPR_BLOT = SPR_OPENTTD_BASE + 29, // colored circle (mainly used as vehicle profit marker and for sever compatibility)

			




	
	
	
		
 

			




	
	
	
		
 
	SPR_PIN_UP        = SPR_OPENTTD_BASE + 55,   // pin icon

			




	
	
	
		
 
	SPR_PIN_DOWN      = SPR_OPENTTD_BASE + 56,

			




	
	
	
		
 
	SPR_BOX_EMPTY     = SPR_OPENTTD_BASE + 59,

			




	
	
	
		
 
	SPR_BOX_CHECKED   = SPR_OPENTTD_BASE + 60,

			




	
	
	
		
 
	SPR_WINDOW_RESIZE = SPR_OPENTTD_BASE + 87,   // resize icon

			




	
	
	
		
 
	SPR_HOUSE_ICON    = SPR_OPENTTD_BASE + 94,

			




	
	
	
		
 
	SPR_WINDOW_RESIZE = SPR_OPENTTD_BASE + 86,   // resize icon

			




	
	
	
		
 
	SPR_HOUSE_ICON    = SPR_OPENTTD_BASE + 93,

			




	
	
	
		
 
	// arrow icons pointing in all 4 directions

			




	
	
	
		
 
	SPR_ARROW_DOWN    = SPR_OPENTTD_BASE + 88,

			




	
	
	
		
 
	SPR_ARROW_UP      = SPR_OPENTTD_BASE + 89,

			




	
	
	
		
 
	SPR_ARROW_LEFT    = SPR_OPENTTD_BASE + 90,

			




	
	
	
		
 
	SPR_ARROW_RIGHT   = SPR_OPENTTD_BASE + 91,

			




	
	
	
		
 
	SPR_ARROW_DOWN    = SPR_OPENTTD_BASE + 87,

			




	
	
	
		
 
	SPR_ARROW_UP      = SPR_OPENTTD_BASE + 88,

			




	
	
	
		
 
	SPR_ARROW_LEFT    = SPR_OPENTTD_BASE + 89,

			




	
	
	
		
 
	SPR_ARROW_RIGHT   = SPR_OPENTTD_BASE + 90,

			




	
	
	
		
 

			




	
	
	
		
 
	SPR_LARGE_SMALL_WINDOW = 682,

			




	
	
	
		
 

			




	
	
	
		
 
	/* Clone vehicles stuff */

			




	
	
	
		
 
	SPR_CLONE_TRAIN    = SPR_OPENTTD_BASE + 92,

			




	
	
	
		
 
	SPR_CLONE_ROADVEH  = SPR_OPENTTD_BASE + 109,

			




	
	
	
		
 
	SPR_CLONE_SHIP     = SPR_OPENTTD_BASE + 111,

			




	
	
	
		
 
	SPR_CLONE_AIRCRAFT = SPR_OPENTTD_BASE + 113,

			




	
	
	
		
 
	SPR_CLONE_TRAIN    = SPR_OPENTTD_BASE + 91,

			




	
	
	
		
 
	SPR_CLONE_ROADVEH  = SPR_OPENTTD_BASE + 108,

			




	
	
	
		
 
	SPR_CLONE_SHIP     = SPR_OPENTTD_BASE + 110,

			




	
	
	
		
 
	SPR_CLONE_AIRCRAFT = SPR_OPENTTD_BASE + 112,

			




	
	
	
		
 

			




	
	
	
		
 
	SPR_SELL_TRAIN        = SPR_OPENTTD_BASE + 96,

			




	
	
	
		
 
	SPR_SELL_ROADVEH      = SPR_OPENTTD_BASE + 97,

			




	
	
	
		
 
	SPR_SELL_SHIP         = SPR_OPENTTD_BASE + 98,

			




	
	
	
		
 
	SPR_SELL_AIRCRAFT     = SPR_OPENTTD_BASE + 99,

			




	
	
	
		
 
	SPR_SELL_ALL_TRAIN    = SPR_OPENTTD_BASE + 100,

			




	
	
	
		
 
	SPR_SELL_ALL_ROADVEH  = SPR_OPENTTD_BASE + 101,

			




	
	
	
		
 
	SPR_SELL_ALL_SHIP     = SPR_OPENTTD_BASE + 102,

			




	
	
	
		
 
	SPR_SELL_ALL_AIRCRAFT = SPR_OPENTTD_BASE + 103,

			




	
	
	
		
 
	SPR_REPLACE_TRAIN     = SPR_OPENTTD_BASE + 104,

			




	
	
	
		
 
	SPR_REPLACE_ROADVEH   = SPR_OPENTTD_BASE + 105,

			




	
	
	
		
 
	SPR_REPLACE_SHIP      = SPR_OPENTTD_BASE + 106,

			




	
	
	
		
 
	SPR_REPLACE_AIRCRAFT  = SPR_OPENTTD_BASE + 107,

			




	
	
	
		
 
	SPR_SELL_CHAIN_TRAIN  = SPR_OPENTTD_BASE + 108,

			




	
	
	
		
 
	SPR_SELL_TRAIN        = SPR_OPENTTD_BASE + 95,

			




	
	
	
		
 
	SPR_SELL_ROADVEH      = SPR_OPENTTD_BASE + 96,

			




	
	
	
		
 
	SPR_SELL_SHIP         = SPR_OPENTTD_BASE + 97,

			




	
	
	
		
 
	SPR_SELL_AIRCRAFT     = SPR_OPENTTD_BASE + 98,

			




	
	
	
		
 
	SPR_SELL_ALL_TRAIN    = SPR_OPENTTD_BASE + 99,

			




	
	
	
		
 
	SPR_SELL_ALL_ROADVEH  = SPR_OPENTTD_BASE + 100,

			




	
	
	
		
 
	SPR_SELL_ALL_SHIP     = SPR_OPENTTD_BASE + 101,

			




	
	
	
		
 
	SPR_SELL_ALL_AIRCRAFT = SPR_OPENTTD_BASE + 102,

			




	
	
	
		
 
	SPR_REPLACE_TRAIN     = SPR_OPENTTD_BASE + 103,

			




	
	
	
		
 
	SPR_REPLACE_ROADVEH   = SPR_OPENTTD_BASE + 104,

			




	
	
	
		
 
	SPR_REPLACE_SHIP      = SPR_OPENTTD_BASE + 105,

			




	
	
	
		
 
	SPR_REPLACE_AIRCRAFT  = SPR_OPENTTD_BASE + 106,

			




	
	
	
		
 
	SPR_SELL_CHAIN_TRAIN  = SPR_OPENTTD_BASE + 107,

			




	
	
	
		
 

			




	
	
	
		
 
	SPR_SHARED_ORDERS_ICON = SPR_OPENTTD_BASE + 115,

			




	
	
	
		
 
	SPR_SHARED_ORDERS_ICON = SPR_OPENTTD_BASE + 114,

			




	
	
	
		
 

			




	
	
	
		
 
	SPR_WARNING_SIGN      = SPR_OPENTTD_BASE + 116, // warning sign (shown if there are any newgrf errors)

			




	
	
	
		
 
	SPR_WARNING_SIGN      = SPR_OPENTTD_BASE + 115, // warning sign (shown if there are any newgrf errors)

			




	
	
	
		
 

			




	
	
	
		
 
	/* Network GUI sprites */

			




	
	
	
		
 
	SPR_SQUARE = SPR_OPENTTD_BASE + 20,     // colored square (used for newgrf compatibility)

			




	
	
	
		
 
	SPR_LOCK = SPR_OPENTTD_BASE + 19,       // lock icon (for password protected servers)

			




	
	
	
		
 
	SPR_FLAGS_BASE = SPR_OPENTTD_BASE + 83, // start of the flags block (in same order as enum NetworkLanguage)

			




	
	
	
		
 
	SPR_FLAGS_BASE = SPR_OPENTTD_BASE + 82, // start of the flags block (in same order as enum NetworkLanguage)

			




	
	
	
		
 

			




	
	
	
		
 
	SPR_AIRPORTX_BASE = SPR_OPENTTD_BASE + OPENTTD_SPRITES_COUNT, // The sprites used for other airport angles

			




	
	
	
		
 
	SPR_NEWAIRPORT_TARMAC = SPR_AIRPORTX_BASE,

			




	
	
	
		
 
	SPR_NSRUNWAY1 = SPR_AIRPORTX_BASE + 1,

			




	
	
	
		
 
	SPR_NSRUNWAY2 = SPR_AIRPORTX_BASE + 2,

			




	
	
	
		
 
	SPR_NSRUNWAY3 = SPR_AIRPORTX_BASE + 3,

			




	
	
		
 
@@ -937,13 +937,12 @@ enum Sprites {

			




	
	
	
		
 
	SPR_IMG_ROCKS           = 4084,

			




	
	
	
		
 
	SPR_IMG_LIGHTHOUSE_DESERT = 4085, // XXX - is Desert image on the desert-climate

			




	
	
	
		
 
	SPR_IMG_TRANSMITTER     = 4086,

			




	
	
	
		
 
	SPR_IMG_LEVEL_LAND      = SPR_OPENTTD_BASE + 61,

			




	
	
	
		
 
	SPR_IMG_BUILD_CANAL     = SPR_OPENTTD_BASE + 58,

			




	
	
	
		
 
	SPR_IMG_BUILD_LOCK      = SPR_CANALS_BASE + 69,

			




	
	
	
		
 
	SPR_IMG_PLACE_SIGN      = SPR_OPENTTD_BASE + 63,

			




	
	
	
		
 
	SPR_IMG_PAUSE           = 726,

			




	
	
	
		
 
	SPR_IMG_FASTFORWARD     = SPR_OPENTTD_BASE + 54,

			




	
	
	
		
 
	SPR_IMG_SETTINGS        = 751,

			




	
	
	
		
 
	SPR_IMG_SAVE            = 724,

			




	
	
	
		
 
	SPR_IMG_SMALLMAP        = 708,

			




	
	
	
		
 
	SPR_IMG_TOWN            = 4077,

			




	
	
		
 
@@ -1276,16 +1275,16 @@ enum CursorSprite {

			




	
	
	
		
 

			




	
	
	
		
 
	SPR_CURSOR_ROAD_DEPOT     = 1297,

			




	
	
	
		
 
	SPR_CURSOR_BUS_STATION    = 2725,

			




	
	
	
		
 
	SPR_CURSOR_TRUCK_STATION  = 2726,

			




	
	
	
		
 
	SPR_CURSOR_ROAD_TUNNEL    = 2433,

			




	
	
	
		
 

			




	
	
	
		
 
	SPR_CURSOR_CLONE_TRAIN    = SPR_OPENTTD_BASE +  93,

			




	
	
	
		
 
	SPR_CURSOR_CLONE_ROADVEH  = SPR_OPENTTD_BASE + 110,

			




	
	
	
		
 
	SPR_CURSOR_CLONE_SHIP     = SPR_OPENTTD_BASE + 112,

			




	
	
	
		
 
	SPR_CURSOR_CLONE_AIRPLANE = SPR_OPENTTD_BASE + 114,

			




	
	
	
		
 
	SPR_CURSOR_CLONE_TRAIN    = SPR_OPENTTD_BASE +  92,

			




	
	
	
		
 
	SPR_CURSOR_CLONE_ROADVEH  = SPR_OPENTTD_BASE + 109,

			




	
	
	
		
 
	SPR_CURSOR_CLONE_SHIP     = SPR_OPENTTD_BASE + 111,

			




	
	
	
		
 
	SPR_CURSOR_CLONE_AIRPLANE = SPR_OPENTTD_BASE + 113,

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
/// Animation macro in table/animcursors.h (_animcursors[])

			




	
	
	
		
 
enum AnimCursors {

			




	
	
	
		
 
	ANIMCURSOR_DEMOLISH     = -1, ///<  704 -  707 - demolish dynamite

			




	
	
	
		
 
	ANIMCURSOR_LOWERLAND    = -2, ///<  699 -  701 - lower land tool

			




        

    


    
    

    

        

                

                    src/terraform_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -264,13 +264,13 @@ static const Widget _terraform_widgets[]

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,     7,   0,  21,  14,  35, SPR_IMG_TERRAFORM_DOWN,  STR_018E_LOWER_A_CORNER_OF_LAND},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,     7,  22,  43,  14,  35, SPR_IMG_TERRAFORM_UP,    STR_018F_RAISE_A_CORNER_OF_LAND},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,     7,  44,  65,  14,  35, SPR_IMG_LEVEL_LAND,      STR_LEVEL_LAND_TOOLTIP},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,     7,  70,  91,  14,  35, SPR_IMG_DYNAMITE,        STR_018D_DEMOLISH_BUILDINGS_ETC},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,     7,  92, 113,  14,  35, SPR_IMG_BUY_LAND,        STR_0329_PURCHASE_LAND_FOR_FUTURE},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,     7, 114, 135,  14,  35, SPR_IMG_PLANTTREES,      STR_0185_PLANT_TREES_PLACE_SIGNS},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,     7, 136, 157,  14,  35, SPR_IMG_PLACE_SIGN,      STR_0289_PLACE_SIGN},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,     7, 136, 157,  14,  35, SPR_IMG_SIGN,            STR_0289_PLACE_SIGN},

			




	
	
	
		
 

			




	
	
	
		
 
{   WIDGETS_END},

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static const WindowDesc _terraform_desc = {

			




	
	
	
		
 
	WDP_ALIGN_TBR, 22 + 36, 158, 36,

			




        

    


    
    

    

        

                

                    src/transparency_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -61,13 +61,13 @@ static const Widget _transparency_widget

			




	
	
	
		
 
{ WWT_CLOSEBOX,   RESIZE_NONE,  7,   0,  10,   0,  13, STR_00C5,                 STR_018B_CLOSE_WINDOW},

			




	
	
	
		
 
{  WWT_CAPTION,   RESIZE_NONE,  7,  11, 162,   0,  13, STR_TRANSPARENCY_TOOLB,   STR_018C_WINDOW_TITLE_DRAG_THIS},

			




	
	
	
		
 
{WWT_STICKYBOX,   RESIZE_NONE,  7, 163, 174,   0,  13, STR_NULL,                 STR_STICKY_BUTTON},

			




	
	
	
		
 

			




	
	
	
		
 
/* transparency widgets:

			




	
	
	
		
 
 * transparent signs, trees, houses, industries, player's buildings, bridges and unmovable structures */

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,  7,   0,  21,  14,  35, SPR_IMG_PLACE_SIGN,   STR_TRANSPARENT_SIGNS_DESC},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,  7,   0,  21,  14,  35, SPR_IMG_SIGN,         STR_TRANSPARENT_SIGNS_DESC},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,  7,  22,  43,  14,  35, SPR_IMG_PLANTTREES,   STR_TRANSPARENT_TREES_DESC},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,  7,  44,  65,  14,  35, SPR_IMG_TOWN,         STR_TRANSPARENT_HOUSES_DESC},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,  7,  66,  87,  14,  35, SPR_IMG_INDUSTRY,     STR_TRANSPARENT_INDUSTRIES_DESC},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,  7,  88, 109,  14,  35, SPR_IMG_COMPANY_LIST, STR_TRANSPARENT_BUILDINGS_DESC},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,  7, 110, 152,  14,  35, SPR_IMG_BRIDGE,       STR_TRANSPARENT_BRIDGES_DESC},

			




	
	
	
		
 
{   WWT_IMGBTN,   RESIZE_NONE,  7, 153, 174,  14,  35, SPR_IMG_TRANSMITTER,  STR_TRANSPARENT_STRUCTURES_DESC},

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support