← Back to branch summary

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

« back to all changes in this revision

Viewing changes to client/gui-win32/ratesdlg.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/ratesdlg.c
20
20
#include <windows.h>
21
21
#include <windowsx.h>
22
22
 
23
 
 
 
23
/* common & utility */
24
24
#include "fcintl.h"
25
 
#include "game.h"
26
25
#include "government.h"
27
26
#include "packets.h"
28
27
#include "player.h"
30
29
#include "support.h"
31
30
#include "gui_main.h" 
32
31
 
 
32
/* client */
 
33
#include "client_main.h"
33
34
#include "gui_stuff.h"
34
35
#include "mapview.h"
35
36
 
36
37
#include "ratesdlg.h"
37
38
 
38
 
 
39
 
extern struct connection aconnection;    
40
39
extern HINSTANCE freecivhinst;
 
40
 
41
41
static HWND ratesdlg;
42
 
int rates_tax_value, rates_lux_value, rates_sci_value;     
 
42
 
 
43
int rates_tax_value, rates_lux_value, rates_sci_value;
 
44
 
43
45
 
44
46
/**************************************************************************
45
47
 
58
60
  lux_lock=IsDlgButtonChecked(ratesdlg,ID_RATES_LUXURYLOCK);
59
61
  sci_lock=IsDlgButtonChecked(ratesdlg,ID_RATES_SCIENCELOCK);
60
62
  
61
 
  maxrate = get_player_bonus(game.player_ptr, EFT_MAX_RATES);
 
63
  maxrate = get_player_bonus(client.conn.playing, EFT_MAX_RATES);
62
64
  /* This's quite a simple-minded "double check".. */     
63
65
  tax=MIN(tax, maxrate);
64
66
  lux=MIN(lux, maxrate);
264
266
          break;
265
267
        case IDOK:
266
268
          DestroyWindow(hWnd);
267
 
          dsend_packet_player_rates(&aconnection, rates_tax_value,
 
269
          dsend_packet_player_rates(&client.conn, rates_tax_value,
268
270
                                    rates_lux_value, rates_sci_value);
269
271
          break;
270
272
        }
327
329
    fcwin_box_add_button(hbox,_("Ok"),IDOK,0,TRUE,TRUE,20);
328
330
    fcwin_box_add_button(hbox,_("Cancel"),IDCANCEL,0,TRUE,TRUE,20);
329
331
    fcwin_box_add_box(vbox,hbox,TRUE,TRUE,10);
330
 
  
 
332
 
331
333
    my_snprintf(buf, sizeof(buf), _("%s max rate: %d%%"),
332
 
                government_name_for_player(game.player_ptr),
333
 
                get_player_bonus(game.player_ptr, EFT_MAX_RATES));
 
334
                government_name_for_player(client.conn.playing),
 
335
                get_player_bonus(client.conn.playing, EFT_MAX_RATES));
334
336
    SetWindowText(GetDlgItem(ratesdlg,ID_RATES_MAX),buf);
335
337
    ScrollBar_SetRange(GetDlgItem(ratesdlg,ID_RATES_TAX),0,10,TRUE);
336
338
    ScrollBar_SetRange(GetDlgItem(ratesdlg,ID_RATES_LUXURY),0,10,TRUE);
337
339
    ScrollBar_SetRange(GetDlgItem(ratesdlg,ID_RATES_SCIENCE),0,10,TRUE);
338
 
    rates_set_values( game.player_ptr->economic.tax, 0,
339
 
                      game.player_ptr->economic.luxury, 0,
340
 
                      game.player_ptr->economic.science, 0 );          
341
 
    
 
340
    rates_set_values( client.conn.playing->economic.tax, 0,
 
341
                      client.conn.playing->economic.luxury, 0,
 
342
                      client.conn.playing->economic.science, 0 );
 
343
 
342
344
    fcwin_set_box(ratesdlg,vbox);
343
345
    ShowWindow(ratesdlg,SW_SHOWNORMAL);
344
346
  }