Changeset - r2565:d2f57f9bcfa6
Parent rev.
Child rev.
[Not reviewed]
master
0 2 0
Darkvater - 18 years ago 2005-10-29 22:27:34
darkvater@openttd.org
(svn r3102) - Fix (regression): Newly added sprite had problems when newgrf's where loaded. Thanks Tron for explaining what the problem was and how it should be solved.
2 files changed with 9 insertions and 4 deletions:
gfxinit.c
8
3
table/sprites.h
1
1
0 comments (0 inline, 0 general)
gfxinit.c
➞
Show inline comments
 
@@ -266,7 +266,12 @@ static const SpriteID trg1idx[] = {
 
	0xFFFF
 
};
 

			




	
	
	
		
 
#define OPENTTD_SPRITES_COUNT 100

			




	
	
	
		
 
/* NOTE: When adding a normal sprite, increase OPENTTD_SPRITES_COUNT with the

			




	
	
	
		
 
 * amount of sprites and add them to the end of the list, with the index of

			




	
	
	
		
 
 * the old sprite-count offset from SPR_OPENTTD_BASE. With this there is no

			




	
	
	
		
 
 * correspondence of any kind with the ID's in the grf file, but results in

			




	
	
	
		
 
 * a maximum use of sprite slots. */

			




	
	
	
		
 
#define OPENTTD_SPRITES_COUNT 101

			




	
	
	
		
 
static const SpriteID _openttd_grf_indexes[] = {

			




	
	
	
		
 
	SPR_OPENTTD_BASE + 0, SPR_OPENTTD_BASE + 7, // icons etc

			




	
	
	
		
 
	134, 134,  // euro symbol medium size

			




	
	
		
 
@@ -277,7 +282,7 @@ static const SpriteID _openttd_grf_index

			




	
	
	
		
 
	616, 616, // nordic char: Æ

			




	
	
	
		
 
	666, 666, // nordic char: ø

			




	
	
	
		
 
	634, 634, // nordic char: Ø

			




	
	
	
		
 
	SPR_OPENTTD_BASE+62, SPR_OPENTTD_BASE + OPENTTD_SPRITES_COUNT, // more icons

			




	
	
	
		
 
	SPR_OPENTTD_BASE+62, SPR_OPENTTD_BASE + 100, // more icons

			




	
	
	
		
 
	382, 383, // ¼ ½ tiny

			




	
	
	
		
 
	158, 159, // ¼ ½ medium

			




	
	
	
		
 
	606, 607, // ¼ ½ large

			




	
	
		
 
@@ -303,7 +308,7 @@ static const SpriteID _openttd_grf_index

			




	
	
	
		
 
	317, 320, // { | } ~ tiny

			




	
	
	
		
 
	 93,  96, // { | } ~ medium

			




	
	
	
		
 
	541, 544, // { | } ~ large

			




	
	
	
		
 
	SPR_OPENTTD_BASE+138, SPR_OPENTTD_BASE+138, // icon

			




	
	
	
		
 
	SPR_OPENTTD_BASE + 101, SPR_OPENTTD_BASE + OPENTTD_SPRITES_COUNT, // icon (HOUSE)

			




	
	
	
		
 
	0xffff,

			




	
	
	
		
 
};

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    table/sprites.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -60,7 +60,7 @@ enum Sprites {

			




	
	
	
		
 
	SPR_BOX_EMPTY     = SPR_OPENTTD_BASE + 66,

			




	
	
	
		
 
	SPR_BOX_CHECKED   = SPR_OPENTTD_BASE + 67,

			




	
	
	
		
 
	SPR_WINDOW_RESIZE = SPR_OPENTTD_BASE + 94,   // resize icon

			




	
	
	
		
 
	SPR_HOUSE_ICON    = SPR_OPENTTD_BASE + 138,

			




	
	
	
		
 
	SPR_HOUSE_ICON    = SPR_OPENTTD_BASE + 101,

			




	
	
	
		
 
	// arrow icons pointing in all 4 directions

			




	
	
	
		
 
	SPR_ARROW_DOWN    = SPR_OPENTTD_BASE + 95,

			




	
	
	
		
 
	SPR_ARROW_UP      = SPR_OPENTTD_BASE + 96,

			




        

    



    


    



    



      

      





    
    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