← Back to branch summary

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

« back to all changes in this revision

Viewing changes to client/gui-xaw/spaceshipdlg.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-xaw/spaceshipdlg.c
32
32
#include "canvas.h"
33
33
#include "pixcomm.h"
34
34
 
 
35
/* utility */
35
36
#include "fcintl.h"
 
37
#include "log.h"
 
38
#include "mem.h"
 
39
#include "shared.h"
 
40
#include "support.h"
 
41
 
 
42
/* common */
36
43
#include "game.h"
37
44
#include "map.h"
38
 
#include "mem.h"
39
45
#include "packets.h"
40
46
#include "player.h"
41
 
#include "shared.h"
42
47
#include "spaceship.h"
43
 
#include "support.h"
44
48
 
45
 
#include "clinet.h"
 
49
/* client */
 
50
#include "client_main.h"
 
51
#include "climisc.h"
46
52
#include "colors.h"
47
53
#include "dialogs.h"
48
54
#include "graphics.h"
55
61
#include "repodlgs.h"
56
62
#include "text.h"
57
63
#include "tilespec.h"
58
 
#include "climisc.h"
59
64
 
60
65
#include "spaceshipdlg.h"
61
66
 
124
129
  pship=&(pdialog->pplayer->spaceship);
125
130
 
126
131
  if (game.info.spacerace
127
 
     && pplayer->player_no == game.info.player_idx
 
132
     && pplayer == client.conn.playing
128
133
     && pship->state == SSHIP_STARTED
129
134
     && pship->success_rate > 0) {
130
135
    XtSetSensitive(pdialog->launch_command, TRUE);
323
328
void spaceship_launch_callback(Widget w, XtPointer client_data,
324
329
                               XtPointer call_data)
325
330
{
326
 
  send_packet_spaceship_launch(&aconnection);
 
331
  send_packet_spaceship_launch(&client.conn);
327
332
  /* close_spaceship_dialog((struct spaceship_dialog *)client_data); */
328
333
}