Changeset - r2:9221be573970
Parent rev.
Child rev.
[Not reviewed]
master
0 7 0
darkvater - 20 years ago 2004-08-10 14:32:17
darkvater@openttd.org
(svn r3) -[1005611] Player Window patch: When looking in dropdownlist for player stuff, it will say
for all human players (Player #), not only for the first 2
7 files changed with 17 insertions and 15 deletions:
functions.h
1
1
graph_gui.c
3
3
lang/english.txt
1
2
main_gui.c
1
1
player_gui.c
3
3
players.c
6
3
town_gui.c
2
2
0 comments (0 inline, 0 general)
functions.h
➞
Show inline comments
 
@@ -80,13 +80,13 @@ void TileLoop_Water(uint tile);
 
/* players.c */
 
bool CheckPlayerHasMoney(int32 cost);
 
void SubtractMoneyFromPlayer(int32 cost);
 
void SubtractMoneyFromPlayerFract(byte player, int32 cost);
 
bool CheckOwnership(byte owner);
 
bool CheckTileOwnership(uint tile);
 
StringID GetPlayerNameString(byte player);
 
StringID GetPlayerNameString(byte player, byte index);
 

			




	
	
	
		
 
/* standard */

			




	
	
	
		
 
void ShowInfo(const char *str);

			




	
	
	
		
 
void CDECL ShowInfoF(const char *str, ...);

			




	
	
	
		
 
void NORETURN CDECL error(const char *str, ...);

			




	
	
	
		
 
void memswap(void *a, void *b, size_t size);

			




        

    


    
    

    

        

                

                    graph_gui.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -209,13 +209,13 @@ static void GraphLegendWndProc(Window *w

			




	
	
	
		
 
				continue;

			




	
	
	
		
 

			




	
	
	
		
 
			DrawPlayerIcon(p->index, 4, 18+p->index*12);

			




	
	
	
		
 

			




	
	
	
		
 
			SET_DPARAM16(0, p->name_1);

			




	
	
	
		
 
			SET_DPARAM32(1, p->name_2);

			




	
	
	
		
 
			SET_DPARAM16(2, GetPlayerNameString(p->index));

			




	
	
	
		
 
			SET_DPARAM16(2, GetPlayerNameString(p->index, 3));

			




	
	
	
		
 
			DrawString(21,17+p->index*12,STR_7021,HASBIT(_legend_showbits, p->index) ? 0x10 : 0xC);

			




	
	
	
		
 
		}

			




	
	
	
		
 
		break;

			




	
	
	
		
 

			




	
	
	
		
 
	case WE_CLICK:

			




	
	
	
		
 
		if (IS_INT_INSIDE(e->click.widget, 3, 11)) {

			




	
	
		
 
@@ -820,14 +820,14 @@ static void CompanyLeagueWndProc(Window 

			




	
	
	
		
 
		do {

			




	
	
	
		
 
			SET_DPARAM16(0, i + 1 + STR_01AB);

			




	
	
	
		
 
			p = plist[i];

			




	
	
	
		
 
			SET_DPARAM16(1, p->name_1);

			




	
	
	
		
 
			SET_DPARAM32(2, p->name_2);

			




	
	
	
		
 
			

			




	
	
	
		
 
			SET_DPARAM16(3, GetPlayerNameString(p->index));

			




	
	
	
		
 
			SET_DPARAM16(4, GetPerformanceTitleFromValue(p->old_economy[1].performance_history));

			




	
	
	
		
 
			SET_DPARAM16(3, GetPlayerNameString(p->index, 4));

			




	
	
	
		
 
			SET_DPARAM16(5, GetPerformanceTitleFromValue(p->old_economy[1].performance_history));

			




	
	
	
		
 

			




	
	
	
		
 
			DrawString(2, 15 + i * 10, i == 0 ? STR_7054 : STR_7055, 0);

			




	
	
	
		
 
			DrawPlayerIcon(p->index, 27, 16 + i * 10);

			




	
	
	
		
 
		} while (++i != pl_num);

			




	
	
	
		
 

			




	
	
	
		
 
		break;

			




        

    


    
    

    

        

                

                    lang/english.txt
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1721,14 +1721,13 @@ STR_6839_PERMISSIVE		:Permissive

			




	
	
	
		
 
STR_683A_TOLERANT			:Tolerant

			




	
	
	
		
 
STR_683B_HOSTILE			:Hostile

			




	
	
	
		
 

			




	
	
	
		
 
##id 0x7000

			




	
	
	
		
 
STR_7000								:

			




	
	
	
		
 
STR_7001								:{WHITE}{STRING}{BLACK}{STRING}

			




	
	
	
		
 
STR_7002_PLAYER_1						: (Player 1)

			




	
	
	
		
 
STR_7003_PLAYER_2						: (Player 2)

			




	
	
	
		
 
STR_7002_PLAYER						: (Player {COMMA16})

			




	
	
	
		
 
STR_7004_NEW_FACE						:{BLACK}New Face

			




	
	
	
		
 
STR_7005_COLOR_SCHEME					:{BLACK}Color Scheme

			




	
	
	
		
 
STR_7006_COLOR_SCHEME					:{GOLD}Color Scheme:

			




	
	
	
		
 
STR_7007_NEW_COLOR_SCHEME				:{WHITE}New Color Scheme

			




	
	
	
		
 
STR_7008_COMPANY_NAME					:{BLACK}Company Name

			




	
	
	
		
 
STR_7009_PRESIDENT_NAME					:{BLACK}President Name

			




        

    


    
    

    

        

                

                    main_gui.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -501,13 +501,13 @@ static void PlayerMenuWndProc(Window *w,

			




	
	
	
		
 
					GfxFillRect(x, y, x + 0xEE, y + 9, 0);

			




	
	
	
		
 
				}

			




	
	
	
		
 
				DrawSprite( ((p->player_color + 0x307)<<16)+0x82EB, x+2, y+1);

			




	
	
	
		
 
			

			




	
	
	
		
 
				SET_DPARAM16(0, p->name_1);

			




	
	
	
		
 
				SET_DPARAM32(1, p->name_2);

			




	
	
	
		
 
				SET_DPARAM16(2, GetPlayerNameString(p->index));

			




	
	
	
		
 
				SET_DPARAM16(2, GetPlayerNameString(p->index, 3));

			




	
	
	
		
 
							

			




	
	
	
		
 
				color = (byte)((p->index==sel) ? 0xC : 0x10);

			




	
	
	
		
 
				if (chk&1) color = 14;

			




	
	
	
		
 
				DrawString(x+0x13, y, STR_7021, color);

			




	
	
	
		
 
				

			




	
	
	
		
 
				y += 10;

			




        

    


    
    

    

        

                

                    player_gui.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -131,14 +131,14 @@ static void PlayerFinancesWndProc(Window

			




	
	
	
		
 
		Player *p = DEREF_PLAYER(w->window_number);

			




	
	
	
		
 
		

			




	
	
	
		
 
		w->disabled_state = p->current_loan != 0 ? 0 : (1 << 6);

			




	
	
	
		
 

			




	
	
	
		
 
		SET_DPARAM16(0, p->name_1);

			




	
	
	
		
 
		SET_DPARAM32(1, p->name_2);

			




	
	
	
		
 
		SET_DPARAM16(2, GetPlayerNameString((byte)w->window_number));

			




	
	
	
		
 
		SET_DPARAM32(3, 10000);

			




	
	
	
		
 
		SET_DPARAM16(2, GetPlayerNameString((byte)w->window_number, 3));

			




	
	
	
		
 
		SET_DPARAM32(4, 10000);

			




	
	
	
		
 
		DrawWindowWidgets(w);

			




	
	
	
		
 

			




	
	
	
		
 
		DrawPlayerEconomyStats(p, (byte)WP(w,def_d).data_1);

			




	
	
	
		
 
	} break;

			




	
	
	
		
 

			




	
	
	
		
 
	case WE_CLICK:

			




	
	
		
 
@@ -477,13 +477,13 @@ static void PlayerCompanyWndProc(Window 

			




	
	
	
		
 
		if (w->widget == _my_player_company_widgets &&

			




	
	
	
		
 
				p->location_of_house != 0)

			




	
	
	
		
 
					w->widget = _my_player_company_bh_widgets;

			




	
	
	
		
 
	

			




	
	
	
		
 
		SET_DPARAM16(0, p->name_1);

			




	
	
	
		
 
		SET_DPARAM32(1, p->name_2);

			




	
	
	
		
 
		SET_DPARAM16(2, GetPlayerNameString((byte)w->window_number));

			




	
	
	
		
 
		SET_DPARAM16(2, GetPlayerNameString((byte)w->window_number, 3));

			




	
	
	
		
 

			




	
	
	
		
 
		dis = 0;

			




	
	
	
		
 
		if (GetAmountOwnedBy(p, 0xFF) == 0) dis |= 1 << 8;

			




	
	
	
		
 
		if (GetAmountOwnedBy(p, _local_player) == 0) dis |= 1 << 9;

			




	
	
	
		
 

			




	
	
	
		
 
		w->disabled_state = dis;

			




        

    


    
    

    

        

                

                    players.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -556,16 +556,19 @@ void RunOtherPlayersLoop()

			




	
	
	
		
 

			




	
	
	
		
 
	_is_ai_player = false;

			




	
	
	
		
 
// XXX: is this needed?

			




	
	
	
		
 
	_current_player = 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
StringID GetPlayerNameString(byte player)

			




	
	
	
		
 
// index is the next parameter in _decode_parameters to set up

			




	
	
	
		
 
StringID GetPlayerNameString(byte player, byte index)

			




	
	
	
		
 
{

			




	
	
	
		
 
	if (IS_HUMAN_PLAYER(player) && player < 2) // temporarily fixes the names in the list.

			




	
	
	
		
 
		return STR_7002_PLAYER_1+player;

			




	
	
	
		
 
	if (IS_HUMAN_PLAYER(player) && player < MAX_PLAYERS) {

			




	
	
	
		
 
		SET_DPARAM16(index, player+1);

			




	
	
	
		
 
		return STR_7002_PLAYER;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	return STR_EMPTY;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
extern void ShowPlayerFinances(int player);

			




	
	
	
		
 

			




	
	
	
		
 
void PlayersYearlyLoop()

			




        

    


    
    

    

        

                

                    town_gui.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -111,25 +111,25 @@ static void TownAuthorityWndProc(Window 

			




	
	
	
		
 
			FOR_ALL_PLAYERS(p) {

			




	
	
	
		
 
				if (p->is_active && HASBIT(t->have_ratings, p->index)) {

			




	
	
	
		
 
					DrawPlayerIcon(p->index, 2, y);

			




	
	
	
		
 
					

			




	
	
	
		
 
					SET_DPARAM16(0, p->name_1);

			




	
	
	
		
 
					SET_DPARAM32(1, p->name_2);

			




	
	
	
		
 
					SET_DPARAM16(2, GetPlayerNameString(p->index));

			




	
	
	
		
 
					SET_DPARAM16(2, GetPlayerNameString(p->index, 3));

			




	
	
	
		
 

			




	
	
	
		
 
					r = t->ratings[p->index];

			




	
	
	
		
 
					(str = STR_3035_APPALLING, r <= -400) ||	// Apalling

			




	
	
	
		
 
					(str++, r <= -200) ||											// Very Poor

			




	
	
	
		
 
					(str++, r <= 0) ||												// Poor

			




	
	
	
		
 
					(str++, r <= 200) ||											// Mediocore

			




	
	
	
		
 
					(str++, r <= 400) ||											// Good

			




	
	
	
		
 
					(str++, r <= 600) ||											// Very Good

			




	
	
	
		
 
					(str++, r <= 800) ||											// Excellent

			




	
	
	
		
 
					(str++, true);														// Outstanding

			




	
	
	
		
 

			




	
	
	
		
 
					SET_DPARAM16(3, str);

			




	
	
	
		
 
					SET_DPARAM16(4, str);

			




	
	
	
		
 
					DrawString(19, y, STR_2024, 0);

			




	
	
	
		
 
					y+=10;

			




	
	
	
		
 
				}

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    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