← Back to branch summary

~ubuntu-branches/ubuntu/saucy/lordsawar/saucy

« back to all changes in this revision

Viewing changes to src/editor/ruin-dialog.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Barry deFreese, Barry deFreese
  • Date: 2008-12-20 13:52:12 UTC
  • mfrom: (1.1.6 upstream) (5.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20081220135212-noeb2w3y98ebo7o9
Tags: 0.1.4-1
[ Barry deFreese ]
* New upstream release.
* Move 0.0.8-2.1 changelog entry to correct point in changelog.
* Make lordsawar-data suggest lordsawar.
* Update my e-mail address.
* Add build-depends on intltool, uuid-dev, and libboost-dev.
* Don't install locales since there are no translations currently.
* Add simple man page for new lordsawar-pbm binary.
* Drop gcc4.3 patches as they have been fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/editor/ruin-dialog.cpp
25
25
#include "ruin-dialog.h"
26
26
 
27
27
#include "glade-helpers.h"
28
 
#include "../ucompose.hpp"
29
 
#include "../playerlist.h"
30
 
#include "../CreateScenarioRandomize.h"
31
 
#include "../defs.h"
32
 
#include "../ruin.h"
33
 
#include "../stack.h"
34
 
#include "../army.h"
 
28
#include "ucompose.hpp"
 
29
#include "playerlist.h"
 
30
#include "CreateScenarioRandomize.h"
 
31
#include "defs.h"
 
32
#include "ruin.h"
 
33
#include "stack.h"
 
34
#include "army.h"
 
35
#include "reward.h"
35
36
 
36
37
#include "select-army-dialog.h"
37
38
#include "select-reward-dialog.h"
61
62
 
62
63
    xml->get_widget("name_entry", name_entry);
63
64
    name_entry->set_text(ruin->getName());
 
65
    xml->get_widget("description_entry", description_entry);
 
66
    description_entry->set_text(ruin->getDescription());
64
67
 
65
68
    xml->get_widget("type_entry", type_entry);
66
69
    type_entry->set_value(ruin->getType());
161
164
        Location *l = ruin;
162
165
        RenamableLocation *renamable_ruin = static_cast<RenamableLocation*>(l);
163
166
        renamable_ruin->setName(name_entry->get_text());
 
167
        renamable_ruin->setDescription(description_entry->get_text());
164
168
        ruin->setType(type_entry->get_value_as_int());
165
169
 
166
170
        // get rid of old occupant and insert new
200
204
    else
201
205
    {
202
206
        //put the ruin name back.
203
 
        if (name_entry->get_text() != DEFAULT_RUIN_NAME)
 
207
        if (name_entry->get_text() != Ruin::getDefaultName())
204
208
          d_randomizer->pushRandomRuinName(name_entry->get_text());
205
209
        delete keeper;
206
210
        keeper = 0;
238
242
    d.set_parent_window(*dialog.get());
239
243
    d.run();
240
244
 
241
 
    const Army *army = d.get_selected_army();
 
245
    const ArmyProto *army = d.get_selected_army();
242
246
    if (army)
243
247
      {
244
248
        keeper->flClear();
252
256
void RuinDialog::on_randomize_name_clicked()
253
257
{
254
258
  std::string existing_name = name_entry->get_text();
255
 
  if (existing_name == DEFAULT_RUIN_NAME)
 
259
  if (existing_name == Ruin::getDefaultName())
256
260
    name_entry->set_text(d_randomizer->popRandomRuinName());
257
261
  else
258
262
    {
289
293
  if (picked_reward)
290
294
    {
291
295
      on_clear_reward_clicked();
292
 
      reward = new Reward(*picked_reward);
 
296
      reward = Reward::copy(picked_reward);
293
297
    }
294
298
 
295
299
    set_reward_name();