← Back to branch summary

~ubuntu-branches/debian/sid/freeciv/sid

« back to all changes in this revision

Viewing changes to server/spacerace.c

  • Committer: Package Import Robot
  • Author(s): Clint Adams, Karl Goetz, Clint Adams
  • Date: 2011-08-28 22:40:00 UTC
  • mfrom: (1.2.19 upstream)
  • Revision ID: package-import@ubuntu.com-20110828224000-j2r1erewlem25dox
Tags: 2.3.0-1
[ Karl Goetz ]
* New upstream version.
* Fix themes_sdl_use_system_fonts.diff to apply cleanly on 2.3.0
* Massage work_around_unity_induced_breakage.diff to get it
  applying to the new codebase (The patch assumes commits made
  after 2.3.0 was tagged upstream).

[ Clint Adams ]
* Fudge build system to think there is no libtool mismatch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/spacerace.c
15
15
#include <config.h>
16
16
#endif
17
17
 
18
 
#include <assert.h>
19
18
#include <string.h>
20
19
 
21
20
/* utility */
53
52
  int life_support=0;
54
53
  int solar_panels=0;
55
54
 
56
 
  assert(ship->structurals <= NUM_SS_STRUCTURALS);
57
 
  assert(ship->components <= NUM_SS_COMPONENTS);
58
 
  assert(ship->modules <= NUM_SS_MODULES);
 
55
  fc_assert_ret(ship->structurals <= NUM_SS_STRUCTURALS);
 
56
  fc_assert_ret(ship->components <= NUM_SS_COMPONENTS);
 
57
  fc_assert_ret(ship->modules <= NUM_SS_MODULES);
59
58
  
60
59
  ship->mass = 0;
61
60
  ship->support_rate = ship->energy_rate =
165
164
  struct player_spaceship *ship = &pplayer->spaceship;
166
165
  int arrival;
167
166
 
168
 
  if (!find_palace(pplayer)) {
 
167
  if (!player_palace(pplayer)) {
169
168
    notify_player(pplayer, NULL, E_SPACESHIP, ftc_server,
170
169
                  _("You need to have a capital in order to launch "
171
170
                    "your spaceship."));
189
188
 
190
189
  notify_player(NULL, NULL, E_SPACESHIP, ftc_server,
191
190
                _("The %s have launched a spaceship!  "
192
 
                  "It is estimated to arrive on Alpha Centauri in %s."),
 
191
                  "It is estimated to arrive at Alpha Centauri in %s."),
193
192
                nation_plural_for_player(pplayer),
194
193
                textyear(arrival));
195
194
 
338
337
    send_spaceship_info(pplayer, NULL);
339
338
    return;
340
339
  }
341
 
  freelog(LOG_ERROR, "Received unknown spaceship place type %d from %s",
342
 
       type, player_name(pplayer));
 
340
  log_error("Received unknown spaceship place type %d from %s",
 
341
            type, player_name(pplayer));
343
342
}
344
343
 
345
344
/**************************************************************************