← Back to branch summary

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

« back to all changes in this revision

Viewing changes to client/gui-sdl/inteldlg.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-sdl/inteldlg.c
19
19
 
20
20
/* utility */
21
21
#include "fcintl.h"
 
22
#include "log.h"
22
23
 
23
24
/* common */
24
 
#include "game.h"
25
25
#include "government.h"
26
26
 
 
27
/* client */
 
28
#include "client_main.h"
 
29
 
27
30
/* gui-sdl */
28
31
#include "graphics.h"
29
32
#include "gui_id.h"
200
203
  SDL_String16 *pStr;
201
204
  SDL_Rect dst;
202
205
  char cBuf[256];
203
 
  int i, n = 0, count = 0, col;
 
206
  int n = 0, count = 0, col;
204
207
  struct city *pCapital;
205
208
  SDL_Rect area;
206
209
  struct player_research* research;
323
326
    FREESURFACE(pTmpSurf);
324
327
    n = 0;
325
328
    pLast = pBuf;
326
 
    for(i = A_FIRST; i<game.control.num_tech_types; i++) {
327
 
      if(get_invention(p, i) == TECH_KNOWN &&
328
 
        tech_is_available(game.player_ptr, i) &&
329
 
        get_invention(game.player_ptr, i) != TECH_KNOWN) {
330
 
        
 
329
    advance_index_iterate(A_FIRST, i) {
 
330
      if (TECH_KNOWN == player_invention_state(p, i)
 
331
       && player_invention_reachable(client.conn.playing, i)
 
332
       && TECH_KNOWN != player_invention_state(client.conn.playing, i)) {
 
333
 
331
334
        pBuf = create_icon2(get_tech_icon(i), pWindow->dst,
332
335
          (WF_RESTORE_BACKGROUND|WF_WIDGET_HAS_INFO_LABEL|WF_FREE_STRING | WF_FREE_THEME));
333
336
        pBuf->action = tech_callback;
334
337
        set_wstate(pBuf, FC_WS_NORMAL);
335
338
  
336
 
        pBuf->string16 = create_str16_from_char(advance_name_translation(i), adj_font(12));
 
339
        pBuf->string16 = create_str16_from_char(
 
340
                           advance_name_translation(advance_by_number(i)),
 
341
                           adj_font(12));
337
342
          
338
343
        add_to_gui_list(ID_ICON, pBuf);
339
344
          
343
348
        
344
349
        n++;    
345
350
      }
346
 
    }
 
351
    }  advance_index_iterate_end;
347
352
    
348
353
    pdialog->pdialog->pBeginWidgetList = pBuf;
349
354