petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r2992) Use PlayerID, StationID and INVALID_STATION instead of int, int and -1

Browse Source
This commit is contained in:
tron
2005-09-27 18:51:04 +00:00
parent 50f1a93664
commit ff30404170
8 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ship_gui.c
View File

@@ -990,8 +990,8 @@ static const Widget _other_player_ships_widgets[] = {
static void PlayerShipsWndProc(Window *w, WindowEvent *e)
{
int station = (int)w->window_number >> 16;
int owner = w->window_number & 0xff;
StationID station = GB(w->window_number, 16, 16);
PlayerID owner = GB(w->window_number, 0, 8);
vehiclelist_d *vl = &WP(w, vehiclelist_d);
switch(e->event) {
@@ -1013,7 +1013,7 @@ static void PlayerShipsWndProc(Window *w, WindowEvent *e)
/* draw the widgets */
{
const Player *p = GetPlayer(owner);
if (station == -1) {
if (station == INVALID_STATION) {
/* Company Name -- (###) Trains */
SetDParam(0, p->name_1);
SetDParam(1, p->name_2);
@@ -1186,7 +1186,7 @@ static const WindowDesc _other_player_ships_desc = {
};
void ShowPlayerShips(int player, int station)
void ShowPlayerShips(PlayerID player, StationID station)
{
Window *w;