Changeset - r5273:6960a710403e
Parent rev.
Child rev.
[Not reviewed]
master
0 3 0
Darkvater - 18 years ago 2006-12-07 13:00:41
darkvater@openttd.org
(svn r7415) -Codechange: Don't use typedef enum for simple widget enumerators when we will never use
their type anyways.
3 files changed with 6 insertions and 6 deletions:
build_vehicle_gui.c
2
2
player_gui.c
2
2
train_gui.c
2
2
0 comments (0 inline, 0 general)
build_vehicle_gui.c
➞
Show inline comments
 
@@ -2,61 +2,61 @@
 

			




	
	
	
		
 
#include "stdafx.h"

			




	
	
	
		
 
#include "openttd.h"

			




	
	
	
		
 
#include "aircraft.h"

			




	
	
	
		
 
#include "debug.h"

			




	
	
	
		
 
#include "functions.h"

			




	
	
	
		
 
#include "table/sprites.h"

			




	
	
	
		
 
#include "table/strings.h"

			




	
	
	
		
 
#include "window.h"

			




	
	
	
		
 
#include "gui.h"

			




	
	
	
		
 
#include "vehicle.h"

			




	
	
	
		
 
#include "gfx.h"

			




	
	
	
		
 
#include "station.h"

			




	
	
	
		
 
#include "command.h"

			




	
	
	
		
 
#include "engine.h"

			




	
	
	
		
 
#include "player.h"

			




	
	
	
		
 
#include "depot.h"

			




	
	
	
		
 
#include "airport.h"

			




	
	
	
		
 
#include "vehicle_gui.h"

			




	
	
	
		
 
#include "newgrf_engine.h"

			




	
	
	
		
 
#include "date.h"

			




	
	
	
		
 
#include "strings.h"

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
typedef enum BuildVehicleWidgets {

			




	
	
	
		
 
enum BuildVehicleWidgets {

			




	
	
	
		
 
	BUILD_VEHICLE_WIDGET_CLOSEBOX = 0,

			




	
	
	
		
 
	BUILD_VEHICLE_WIDGET_CAPTION,

			




	
	
	
		
 
	BUILD_VEHICLE_WIDGET_SORT_ASSENDING_DESCENDING,

			




	
	
	
		
 
	BUILD_VEHICLE_WIDGET_SORT_TEXT,

			




	
	
	
		
 
	BUILD_VEHICLE_WIDGET_SORT_DROPDOWN,

			




	
	
	
		
 
	BUILD_VEHICLE_WIDGET_LIST,

			




	
	
	
		
 
	BUILD_VEHICLE_WIDGET_SCROLLBAR,

			




	
	
	
		
 
	BUILD_VEHICLE_WIDGET_PANEL,

			




	
	
	
		
 
	BUILD_VEHICLE_WIDGET_BUILD,

			




	
	
	
		
 
	BUILD_VEHICLE_WIDGET_RENAME,

			




	
	
	
		
 
	BUILD_VEHICLE_WIDGET_RESIZE,

			




	
	
	
		
 
} BuildVehicleWidget;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static const Widget _build_vehicle_widgets[] = {

			




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

			




	
	
	
		
 
	{    WWT_CAPTION,   RESIZE_NONE,    14,    11,   239,     0,    13, STR_A005_NEW_AIRCRAFT,   STR_018C_WINDOW_TITLE_DRAG_THIS },

			




	
	
	
		
 
	{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,    80,    14,    25, STR_SORT_BY,             STR_SORT_ORDER_TIP},

			




	
	
	
		
 
	{      WWT_PANEL,   RESIZE_NONE,    14,    81,   227,    14,    25, 0x0,                     STR_SORT_CRITERIA_TIP},

			




	
	
	
		
 
	{    WWT_TEXTBTN,   RESIZE_NONE,    14,   228,   239,    14,    25, STR_0225,                STR_SORT_CRITERIA_TIP},

			




	
	
	
		
 
	{     WWT_MATRIX, RESIZE_BOTTOM,    14,     0,   227,    26,   121, 0x401,                   STR_A025_AIRCRAFT_SELECTION_LIST },

			




	
	
	
		
 
	{  WWT_SCROLLBAR, RESIZE_BOTTOM,    14,   228,   239,    26,   121, 0x0,                     STR_0190_SCROLL_BAR_SCROLLS_LIST },

			




	
	
	
		
 
	{      WWT_PANEL,     RESIZE_TB,    14,     0,   239,   122,   213, 0x0,                     STR_NULL },

			




	
	
	
		
 

			




	
	
	
		
 
	{ WWT_PUSHTXTBTN,     RESIZE_TB,    14,     0,   114,   214,   225, STR_A006_BUILD_AIRCRAFT, STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT },

			




	
	
	
		
 
	{ WWT_PUSHTXTBTN,     RESIZE_TB,    14,   115,   227,   214,   225, STR_A037_RENAME,         STR_A038_RENAME_AIRCRAFT_TYPE },

			




	
	
	
		
 
	{  WWT_RESIZEBOX,     RESIZE_TB,    14,   228,   239,   214,   225, 0x0,                     STR_RESIZE_BUTTON },

			




	
	
	
		
 
	{   WIDGETS_END},

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static bool _internal_sort_order; // descending/ascending

			




	
	
	
		
 
static byte _last_sort_criteria = 0;

			




	
	
	
		
 
static bool _last_sort_order = false;

			




	
	
	
		
 

			




	
	
	
		
 
static int CDECL EngineNumberSorter(const void *a, const void *b)

			




	
	
	
		
 
{

			




	
	
	
		
 
	const EngineID va = *(const EngineID*)a;

			




        

    


    
    

    

        

                

                    player_gui.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -538,62 +538,62 @@ static void SelectPlayerFaceWndProc(Wind

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
static const Widget _select_player_face_widgets[] = {

			




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

			




	
	
	
		
 
{    WWT_CAPTION,   RESIZE_NONE,    14,    11,   189,     0,    13, STR_7043_FACE_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS},

			




	
	
	
		
 
{      WWT_PANEL,   RESIZE_NONE,    14,     0,   189,    14,   136, 0x0,                     STR_NULL},

			




	
	
	
		
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,    94,   137,   148, STR_012E_CANCEL,         STR_7047_CANCEL_NEW_FACE_SELECTION},

			




	
	
	
		
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,    95,   189,   137,   148, STR_012F_OK,             STR_7048_ACCEPT_NEW_FACE_SELECTION},

			




	
	
	
		
 
{    WWT_TEXTBTN,   RESIZE_NONE,    14,    95,   187,    25,    36, STR_7044_MALE,           STR_7049_SELECT_MALE_FACES},

			




	
	
	
		
 
{    WWT_TEXTBTN,   RESIZE_NONE,    14,    95,   187,    37,    48, STR_7045_FEMALE,         STR_704A_SELECT_FEMALE_FACES},

			




	
	
	
		
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,    95,   187,    79,    90, STR_7046_NEW_FACE,       STR_704B_GENERATE_RANDOM_NEW_FACE},

			




	
	
	
		
 
{   WIDGETS_END},

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static const WindowDesc _select_player_face_desc = {

			




	
	
	
		
 
	WDP_AUTO, WDP_AUTO, 190, 149,

			




	
	
	
		
 
	WC_PLAYER_FACE,0,

			




	
	
	
		
 
	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,

			




	
	
	
		
 
	_select_player_face_widgets,

			




	
	
	
		
 
	SelectPlayerFaceWndProc

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
/* Names of the widgets. Keep them in the same order as in the widget array */

			




	
	
	
		
 
typedef enum PlayerCompanyWindowWidgets {

			




	
	
	
		
 
enum PlayerCompanyWindowWidgets {

			




	
	
	
		
 
	PCW_WIDGET_CLOSEBOX = 0,

			




	
	
	
		
 
	PCW_WIDGET_CAPTION,

			




	
	
	
		
 
	PCW_WIDGET_FACE,

			




	
	
	
		
 
	PCW_WIDGET_NEW_FACE,

			




	
	
	
		
 
	PCW_WIDGET_COLOR_SCHEME,

			




	
	
	
		
 
	PCW_WIDGET_PRESIDENT_NAME,

			




	
	
	
		
 
	PCW_WIDGET_COMPANY_NAME,

			




	
	
	
		
 
	PCW_WIDGET_BUILD_VIEW_HQ,

			




	
	
	
		
 
	PCW_WIDGET_RELOCATE_HQ,

			




	
	
	
		
 
	PCW_WIDGET_BUY_SHARE,

			




	
	
	
		
 
	PCW_WIDGET_SELL_SHARE,

			




	
	
	
		
 
	PCW_WIDGET_COMPANY_PASSWORD,

			




	
	
	
		
 
} PlayerCompanyWindowWidget;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static const Widget _player_company_widgets[] = {

			




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

			




	
	
	
		
 
{    WWT_CAPTION,   RESIZE_NONE,    14,    11,   359,     0,    13, STR_7001,                          STR_018C_WINDOW_TITLE_DRAG_THIS},

			




	
	
	
		
 
{      WWT_PANEL,   RESIZE_NONE,    14,     0,   359,    14,   157, 0x0,                               STR_NULL},

			




	
	
	
		
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,    89,   158,   169, STR_7004_NEW_FACE,                 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT},

			




	
	
	
		
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,    90,   179,   158,   169, STR_7005_COLOR_SCHEME,             STR_7031_CHANGE_THE_COMPANY_VEHICLE},

			




	
	
	
		
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   180,   269,   158,   169, STR_7009_PRESIDENT_NAME,           STR_7032_CHANGE_THE_PRESIDENT_S},

			




	
	
	
		
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   270,   359,   158,   169, STR_7008_COMPANY_NAME,             STR_7033_CHANGE_THE_COMPANY_NAME},

			




	
	
	
		
 
{    WWT_TEXTBTN,   RESIZE_NONE,    14,   266,   355,    18,    29, STR_7072_VIEW_HQ,                  STR_7070_BUILD_COMPANY_HEADQUARTERS},

			




	
	
	
		
 
{    WWT_TEXTBTN,   RESIZE_NONE,    14,   266,   355,    32,    43, STR_RELOCATE_HQ,                   STR_RELOCATE_COMPANY_HEADQUARTERS},

			




	
	
	
		
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,   179,   158,   169, STR_7077_BUY_25_SHARE_IN_COMPANY,  STR_7079_BUY_25_SHARE_IN_THIS_COMPANY},

			




	
	
	
		
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   180,   359,   158,   169, STR_7078_SELL_25_SHARE_IN_COMPANY, STR_707A_SELL_25_SHARE_IN_THIS_COMPANY},

			




	
	
	
		
 
{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   266,   355,   138,   149, STR_COMPANY_PASSWORD,              STR_COMPANY_PASSWORD_TOOLTIP},

			




	
	
	
		
 
{   WIDGETS_END},

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static void DrawPlayerVehiclesAmount(PlayerID player)

			




	
	
	
		
 
{

			




	
	
	
		
 
	const int x = 110;

			




	
	
	
		
 
	int y = 72;

			




	
	
	
		
 
	const Vehicle *v;

			




	
	
	
		
 
	uint train = 0;

			




	
	
	
		
 
	uint road  = 0;

			




        

    


    
    

    

        

                

                    train_gui.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3,61 +3,61 @@

			




	
	
	
		
 
#include "stdafx.h"

			




	
	
	
		
 
#include "openttd.h"

			




	
	
	
		
 
#include "debug.h"

			




	
	
	
		
 
#include "functions.h"

			




	
	
	
		
 
#include "rail_map.h"

			




	
	
	
		
 
#include "table/sprites.h"

			




	
	
	
		
 
#include "table/strings.h"

			




	
	
	
		
 
#include "map.h"

			




	
	
	
		
 
#include "engine.h"

			




	
	
	
		
 
#include "window.h"

			




	
	
	
		
 
#include "gui.h"

			




	
	
	
		
 
#include "gfx.h"

			




	
	
	
		
 
#include "vehicle.h"

			




	
	
	
		
 
#include "viewport.h"

			




	
	
	
		
 
#include "station.h"

			




	
	
	
		
 
#include "command.h"

			




	
	
	
		
 
#include "player.h"

			




	
	
	
		
 
#include "vehicle_gui.h"

			




	
	
	
		
 
#include "depot.h"

			




	
	
	
		
 
#include "train.h"

			




	
	
	
		
 
#include "newgrf_engine.h"

			




	
	
	
		
 
#include "date.h"

			




	
	
	
		
 
#include "strings.h"

			




	
	
	
		
 

			




	
	
	
		
 
typedef enum BuildTrainWidgets {

			




	
	
	
		
 
enum BuildTrainWidgets {

			




	
	
	
		
 
	BUILD_TRAIN_WIDGET_CLOSEBOX = 0,

			




	
	
	
		
 
	BUILD_TRAIN_WIDGET_CAPTION,

			




	
	
	
		
 
	BUILD_TRAIN_WIDGET_SORT_ASCENDING_DESCENDING,

			




	
	
	
		
 
	BUILD_TRAIN_WIDGET_SORT_TEXT,

			




	
	
	
		
 
	BUILD_TRAIN_WIDGET_SORT_DROPDOWN,

			




	
	
	
		
 
	BUILD_TRAIN_WIDGET_LIST,

			




	
	
	
		
 
	BUILD_TRAIN_WIDGET_SCROLLBAR,

			




	
	
	
		
 
	BUILD_TRAIN_WIDGET_PANEL,

			




	
	
	
		
 
	BUILD_TRAIN_WIDGET_BUILD,

			




	
	
	
		
 
	BUILD_TRAIN_WIDGET_RENAME,

			




	
	
	
		
 
	BUILD_TRAIN_WIDGET_RESIZE,

			




	
	
	
		
 
} BuildTrainWidget;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static const Widget _new_rail_vehicle_widgets[] = {

			




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

			




	
	
	
		
 
	{    WWT_CAPTION,   RESIZE_NONE,    14,    11,   227,     0,    13, STR_JUST_STRING,        STR_018C_WINDOW_TITLE_DRAG_THIS},

			




	
	
	
		
 
	{ WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,    80,    14,    25, STR_SORT_BY,            STR_SORT_ORDER_TIP},

			




	
	
	
		
 
	{      WWT_PANEL,   RESIZE_NONE,    14,    81,   215,    14,    25, 0x0,                    STR_SORT_CRITERIA_TIP},

			




	
	
	
		
 
	{    WWT_TEXTBTN,   RESIZE_NONE,    14,   216,   227,    14,    25, STR_0225,               STR_SORT_CRITERIA_TIP},

			




	
	
	
		
 
	{     WWT_MATRIX, RESIZE_BOTTOM,    14,     0,   215,    26,   137, 0x801,                  STR_8843_TRAIN_VEHICLE_SELECTION},

			




	
	
	
		
 
	{  WWT_SCROLLBAR, RESIZE_BOTTOM,    14,   216,   227,    26,   137, 0x0,                    STR_0190_SCROLL_BAR_SCROLLS_LIST},

			




	
	
	
		
 
	{      WWT_PANEL,     RESIZE_TB,    14,     0,   227,   138,   239, 0x0,                    STR_NULL},

			




	
	
	
		
 
	{ WWT_PUSHTXTBTN,     RESIZE_TB,    14,     0,   107,   240,   251, STR_881F_BUILD_VEHICLE, STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN},

			




	
	
	
		
 
	{ WWT_PUSHTXTBTN,     RESIZE_TB,    14,   108,   215,   240,   251, STR_8820_RENAME,        STR_8845_RENAME_TRAIN_VEHICLE_TYPE},

			




	
	
	
		
 
	{  WWT_RESIZEBOX,     RESIZE_TB,    14,   216,   227,   240,   251, 0x0,                    STR_RESIZE_BUTTON},

			




	
	
	
		
 
	{   WIDGETS_END},

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
static bool _internal_sort_order; // false = ascending, true = descending

			




	
	
	
		
 
static byte _last_sort_criteria = 0;

			




	
	
	
		
 
static bool _last_sort_order = false;

			




	
	
	
		
 

			




	
	
	
		
 
static int CDECL TrainEngineNumberSorter(const void *a, const void *b)

			




	
	
	
		
 
{

			




	
	
	
		
 
	const EngineID va = *(const EngineID*)a;

			




	
	
	
		
 
	const EngineID vb = *(const EngineID*)b;

			




        

    



    


    



    



      

      





    
    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