~ubuntu-branches/ubuntu/maverick/btanks/maverick

« back to all changes in this revision

Viewing changes to objects/shilka.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Ansgar Burchardt
  • Date: 2010-01-17 00:02:57 UTC
  • mfrom: (4.2.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100117000257-iw6esnvsz1rvp6kb
Tags: 0.9.8083-2
* Fix build failure when building only arch-specific package.
* debian/control: Add DM-Upload-Allowed: yes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
 
2
2
/* Battle Tanks Game
3
 
 * Copyright (C) 2006-2008 Battle Tanks team
 
3
 * Copyright (C) 2006-2009 Battle Tanks team
4
4
 *
5
5
 * This program is free software; you can redistribute it and/or
6
6
 * modify it under the terms of the GNU General Public License
71
71
        GET_CONFIG_VALUE("objects.shilka.special-fire-rate", float, sfr, 0.4f);
72
72
        _special_fire.set(sfr);
73
73
        play("hold", true);
74
 
        play_sound("vehicle-sound", true, 0.4f);
75
74
}
76
75
 
77
76
Object * Shilka::clone() const {
132
131
        }
133
132
 
134
133
        Object::tick(dt);
 
134
        
 
135
        if (!playing_sound("vehicle-sound")) {
 
136
                play_sound("vehicle-sound", true, 0.4f);
 
137
        }
 
138
        
135
139
        {
136
140
                PlayerState state = _state;
137
141
                state.left = 0;
246
250
void Shilka::deserialize(const mrt::Serializator &s) {
247
251
        Object::deserialize(s);
248
252
        s.get(_special_fire);
249
 
        if (!playing_sound("vehicle-sound"))
250
 
                play_sound("vehicle-sound", true, 0.4f);
251
253
}