Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc @ 8816

Last change on this file since 8816 was 8729, checked in by rgrieder, 13 years ago

Merged unity_build branch back to trunk.

Features:

  • Implemented fully automatic build units to speed up compilation if requested
  • Added DOUT macro for quick debug output
  • Activated text colouring in the POSIX IOConsole
  • DeclareToluaInterface is not necessary anymore

Improvements:

  • Output levels now change appropriately when switch back and forth from dev mode
  • Log level for the file output is now also correct during startup
  • Removed some header file dependencies in core and tools to speed up compilation

no more file for command line options

  • Improved util::tribool by adapting some concepts from boost::tribool

Regressions:

  • It is not possible anymore to specify command line arguments in an extra file because we've got config values for that purpose.
  • Property svn:eol-style set to native
File size: 2.4 KB
RevLine 
[2918]1/*
2 *   ORXONOX - the hottest 3D action shooter ever to exist
3 *                    > www.orxonox.net <
4 *
5 *
6 *   License notice:
7 *
8 *   This program is free software; you can redistribute it and/or
9 *   modify it under the terms of the GNU General Public License
10 *   as published by the Free Software Foundation; either version 2
11 *   of the License, or (at your option) any later version.
12 *
13 *   This program is distributed in the hope that it will be useful,
14 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
15 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16 *   GNU General Public License for more details.
17 *
18 *   You should have received a copy of the GNU General Public License
19 *   along with this program; if not, write to the Free Software
20 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
21 *
22 *   Author:
23 *      Fabian 'x3n' Landau
24 *   Co-authors:
25 *      ...
26 *
27 */
28
29#include "ReplenishingMunition.h"
[8729]30
[2918]31#include "core/CoreIncludes.h"
[8729]32#include "core/command/Executor.h"
[2918]33
34namespace orxonox
35{
36    CreateFactory(ReplenishingMunition);
37
38    ReplenishingMunition::ReplenishingMunition(BaseObject* creator) : Munition(creator)
39    {
40        RegisterObject(ReplenishingMunition);
41
42        this->replenishIntervall_ = 1.0f;
43        this->replenishMunitionAmount_ = 1;
44
45        // Use the timer to initialize itself after the first tick (because the real values for
46        // replenishIntervall_ and replenishMunitionAmount_ will be set in the constructor of the
47        // inheriting class, which comes after this constructor)
[5929]48        this->replenishingTimer_.setTimer(0.0f, false, createExecutor(createFunctor(&ReplenishingMunition::initializeTimer, this)));
[2918]49    }
50
51    void ReplenishingMunition::initializeTimer()
52    {
53        // Initialize the timer
[5929]54        this->replenishingTimer_.setTimer(this->replenishIntervall_, true, createExecutor(createFunctor(&ReplenishingMunition::replenish, this)));
[2918]55    }
56
57    void ReplenishingMunition::replenish()
58    {
59        // Make a temporary copy of bAllowMunitionRefilling_, because this might be disallowed in every
60        // case except the internal munition replenishing
61        bool temp = this->bAllowMunitionRefilling_;
62        this->bAllowMunitionRefilling_ = true;
63
64        // Replenish munition
65        this->addMunition(this->replenishMunitionAmount_);
66
67        // Write back the temporary value
68        this->bAllowMunitionRefilling_ = temp;
69    }
70}
Note: See TracBrowser for help on using the repository browser.