From f7abff5f963cddfdd134ac52ffd8e72e3ed88f0c Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 14 Nov 2005 19:48:04 +0000 Subject: (svn r3181) -Bracing -Indentation -Whitespace -DeMorgan's Law -Test with NULL or 0 for non-booleans -'\0' instead of 0 for chars -Remove redundantly redundant comments (like DoFoo(); // Do foo) -Join multiple short lines with a single statement -Split single lines with multiple statements -Avoid assignments in if --- player_gui.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'player_gui.c') diff --git a/player_gui.c b/player_gui.c index 300abd686..eba18b143 100644 --- a/player_gui.c +++ b/player_gui.c @@ -685,10 +685,10 @@ static const WindowDesc _other_player_company_desc = { void ShowPlayerCompany(PlayerID player) { - Window *w; - w = AllocateWindowDescFront(player == _local_player ? &_my_player_company_desc : &_other_player_company_desc, player); - if (w) - w->caption_color = w->window_number; + Window* w; + + w = AllocateWindowDescFront(player == _local_player ? &_my_player_company_desc : &_other_player_company_desc, player); + if (w != NULL) w->caption_color = w->window_number; } @@ -881,7 +881,7 @@ void ShowHighscoreTable(int difficulty, int8 ranking) if (!_networking) DoCommandP(0, 1, 0, NULL, CMD_PAUSE); /* Close all always on-top windows to get a clean screen */ - if (_game_mode != GM_MENU) HideVitalWindows(); + if (_game_mode != GM_MENU) HideVitalWindows(); DeleteWindowByClass(WC_HIGHSCORE); w = AllocateWindowDesc(&_highscore_desc); -- cgit v1.2.3-54-g00ecf