Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5818 for code/branches/core5


Ignore:
Timestamp:
Sep 27, 2009, 10:26:49 PM (15 years ago)
Author:
rgrieder
Message:

Small bugfix for the second to last commit: InputStates only exist in graphics mode.
And added destruction code for the ScoreBoard.

Location:
code/branches/core5/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core5/src/libraries/core/SubclassIdentifier.h

    r5814 r5818  
    3838#define _SubclassIdentifier_H__
    3939
    40 #include <cstdlib>
    41 
    4240#include "CorePrereqs.h"
    4341
     42#include <cstdlib>
    4443#include "util/Debug.h"
    4544#include "Identifier.h"
  • code/branches/core5/src/modules/gamestates/GSLevel.cc

    r5816 r5818  
    196196        if (this->scope_GSLevel_)
    197197        {
    198             InputManager::getInstance().destroyState("guiKeysOnly");
    199             InputManager::getInstance().destroyState("guiMouseOnly");
    200198            delete this->scope_GSLevel_;
    201199            this->scope_GSLevel_ = NULL;
     
    208206            guiKeysOnlyInputState_->setHandler(0);
    209207            InputManager::getInstance().destroyState("game");
     208            InputManager::getInstance().destroyState("guiKeysOnly");
     209            InputManager::getInstance().destroyState("guiMouseOnly");
    210210            if (this->keyBinder_)
    211211            {
  • code/branches/core5/src/modules/overlays/stats/Scoreboard.cc

    r5738 r5818  
    4444    {
    4545        RegisterObject(Scoreboard);
     46    }
     47
     48    Scoreboard::~Scoreboard()
     49    {
     50        while (this->lines_.size() > 0)
     51        {
     52            // destroy lines
     53            delete this->lines_.back();
     54            this->lines_.pop_back();
     55        }
    4656    }
    4757
  • code/branches/core5/src/modules/overlays/stats/Scoreboard.h

    r5738 r5818  
    4242    public: // functions
    4343        Scoreboard(BaseObject* creator);
    44         virtual ~Scoreboard() {}
     44        virtual ~Scoreboard();
    4545
    4646        virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
Note: See TracChangeset for help on using the changeset viewer.