← Back to branch summary

~ubuntu-branches/debian/squeeze/freeciv/squeeze

« back to all changes in this revision

Viewing changes to client/gui-win32/gotodlg.c

  • Committer: Bazaar Package Importer
  • Author(s): Clint Adams, Karl Goetz, Clint Adams
  • Date: 2010-02-23 22:09:02 UTC
  • mfrom: (1.2.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20100223220902-kiyrmr9i4152cka5
Tags: 2.2.0-1
http://bugs.debian.org/523772
http://bugs.debian.org/517787
[ Karl Goetz ]
* Remove civserver files in /etc/ggzd/ (Closes: 523772, 517787)
* Adding ${misc:Depends} to all binary packages (lintian warnings)

[ Clint Adams ]
* New upstream version.
  - Drop data_dsc_use_bindir.diff (binary pathnames have changed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/gui-win32/gotodlg.c
21
21
#include <windows.h>
22
22
#include <windowsx.h>
23
23
 
 
24
/* utility */
24
25
#include "fcintl.h"
 
26
#include "log.h"
 
27
#include "support.h"
 
28
 
 
29
/* common */
25
30
#include "game.h"
26
31
#include "map.h"
27
32
#include "packets.h"
28
33
#include "player.h"
29
 
#include "support.h"
30
34
#include "unit.h"
31
35
#include "unitlist.h"
32
36
 
33
 
#include "clinet.h"
34
 
#include "civclient.h"
 
37
/* client */
 
38
#include "client_main.h"
35
39
#include "control.h"
36
40
#include "dialogs.h"
37
41
#include "goto.h"
180
184
**************************************************************************/
181
185
static void update_goto_dialog(HWND list)
182
186
{
183
 
  int    i, j;
 
187
  int    j;
184
188
  char   name[MAX_LEN_NAME+3];
185
189
 
186
190
  ListBox_ResetContent(list);
187
191
  Button_SetState(GetDlgItem(goto_dialog,ID_ALL),show_all_cities);
188
192
 
189
 
  for(i=0; i<game.info.nplayers; i++) {
190
 
    if (!show_all_cities && i != game.info.player_idx) {
 
193
  players_iterate(pplayer) {
 
194
    if (!show_all_cities && pplayer != client.conn.playing) {
191
195
      continue;
192
196
    }
193
 
    city_list_iterate(game.players[i].cities, pcity) {
 
197
    city_list_iterate(pplayer->cities, pcity) {
194
198
      sz_strlcpy(name, city_name(pcity));
195
199
      /* FIXME: should use unit_can_airlift_to(). */
196
200
      if (pcity->airlift) {
198
202
      }
199
203
      j=ListBox_AddString(list,name);
200
204
      ListBox_SetItemData(list,j,pcity->id);
201
 
    }
202
 
    city_list_iterate_end;
203
 
  }
 
205
    } city_list_iterate_end;
 
206
  } players_iterate_end;
204
207
}
205
208
 
206
209
/**************************************************************************