~ubuntu-branches/ubuntu/trusty/plee-the-bear/trusty-proposed

« back to all changes in this revision

Viewing changes to bear-engine/lib/src/generic_items/code/decorative_item.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Julien Jorge, Julien Jorge
  • Date: 2010-11-17 20:13:34 UTC
  • mfrom: (6.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20101117201334-o4dp7uq437to7oxb
Tags: 0.5.1-1
[ Julien Jorge ]
* New upstream release (Closes: #565062, #546514).
* Add armhf architecture (Closes: #604689).
* Remove patches integrated upstream: rpath-editors.diff, rpath-game.diff,
  editors-menu-section.diff.
* Bump the Standard-Version, no changes.
* Update my email address.
* Set build dependency of libclaw to 1.6.0.
* Add the missing ${misc:Depends} in debian/control.
* List gettext translations in bear-factory.install and plee-the-bear.install.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*
2
2
  Bear Engine
3
3
 
4
 
  Copyright (C) 2005-2009 Julien Jorge, Sebastien Angibaud
 
4
  Copyright (C) 2005-2010 Julien Jorge, Sebastien Angibaud
5
5
 
6
6
  This program is free software; you can redistribute it and/or modify it
7
7
  under the terms of the GNU General Public License as published by the
55
55
  if ( m_kill_on_contact && has_contact() )
56
56
    kill();
57
57
  else if ( m_kill_when_finished && get_animation().is_finished() )
58
 
      kill();
 
58
    kill();
59
59
} // decorative_item::progress()
60
60
 
61
61
/*----------------------------------------------------------------------------*/
74
74
    m_kill_when_finished = value;
75
75
  else if (name == "decorative_item.kill_on_contact")
76
76
    m_kill_on_contact = value;
 
77
  else if (name == "decorative_item.kill_when_leaving")
 
78
    m_kill_when_leaving = value;
77
79
  else
78
80
    ok = super::set_bool_field(name, value);
79
81
 
116
118
 */
117
119
void bear::decorative_item::leaves_active_region()
118
120
{
 
121
  super::leaves_active_region();
 
122
 
119
123
  if (m_kill_when_leaving)
120
124
    kill();
121
125
} // decorative_item::leaves_active_region()