← Back to branch summary

~ubuntu-branches/ubuntu/raring/lordsawar/raring

« back to all changes in this revision

Viewing changes to src/gui/destination-dialog.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Barry deFreese, Barry deFreese, Gonéri Le Bouder
  • Date: 2008-06-17 11:15:26 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080617111526-yjyvu9df50zmpdo0
Tags: 0.0.9-1
[ Barry deFreese ]
* New upstream release.
  + Fixes gcc-4.3 builds so drop ftbfs_gcc-4.3_fix.diff.
  + Add new build-dependency for libgnet-dev.
* Add simple man page for new lordsawar-tile-editor.
* Add desktop file for lordsawar-tile-editor.
* Remove French translation on install.

[ Gonéri Le Bouder ]
* bump Debian Policy to 3.8.0. No change needed.
* fix wording in the 0.0.8-3 entry of the Debian changelog

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/destination-dialog.cpp
 
1
//  Copyright (C) 2007, Ole Laursen
 
2
//  Copyright (C) 2007, 2008 Ben Asselstine
 
3
//
1
4
//  This program is free software; you can redistribute it and/or modify
2
5
//  it under the terms of the GNU General Public License as published by
3
6
//  the Free Software Foundation; either version 2 of the License, or
10
13
//
11
14
//  You should have received a copy of the GNU General Public License
12
15
//  along with this program; if not, write to the Free Software
13
 
//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.*
 
16
//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 
 
17
//  02110-1301, USA.
14
18
 
15
19
#include <config.h>
16
20
 
184
188
  VectoredUnitlist *vul = VectoredUnitlist::getInstance();
185
189
  dialog->set_title(city->getName());
186
190
 
187
 
  Player *player = city->getPlayer();
 
191
  Player *player = city->getOwner();
188
192
  unsigned int as = player->getArmyset();
189
193
  Glib::RefPtr<Gdk::Pixbuf> pic;
190
194
  GraphicsCache *gc = GraphicsCache::getInstance();
191
 
  int slot = city->getProductionIndex();
 
195
  int slot = city->getActiveProductionSlot();
192
196
  SDL_Surface *s
193
197
    = GraphicsCache::getInstance()->getArmyPic(as, 0, player, NULL);
194
198
  Glib::RefPtr<Gdk::Pixbuf> empty_pic
222
226
    }
223
227
  else
224
228
    {
225
 
      const Army* a = city->getArmy(slot);
 
229
      const Army* a = city->getProductionBase(slot);
226
230
      pic = to_pixbuf(gc->getArmyPic(as, a->getType(), player, NULL));
227
231
      s1 = String::ucompose(_("%1t"), city->getDuration());
228
232
      turns_label->set_markup("<i>" + s1 + "</i>");