Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 17, 2010, 11:37:48 AM (15 years ago)
Author:
scheusso
Message:

made registerVariables always private. otherwise bad things may happen with variables registered twice or even 3 times (as has happened in ControllableEntity until now)

Location:
code/branches/network2/src/orxonox/infos
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/network2/src/orxonox/infos/GametypeInfo.h

    r5781 r6448  
    4545            virtual ~GametypeInfo();
    4646
    47             void registerVariables();
    48 
    4947            inline bool hasStarted() const
    5048                { return this->bStarted_; }
    … …  
    7068
    7169        private:
     70            void registerVariables();
     71
    7272            bool bStarted_;
    7373            bool bEnded_;

  • code/branches/network2/src/orxonox/infos/HumanPlayer.h

    r5781 r6448  
    4343            virtual ~HumanPlayer();
    4444
    45             void registerVariables();
    4645            void setConfigValues();
    4746
    … …  
    101100            std::string gametypeHudTemplate_;
    102101            OverlayGroup* gametypeHud_;
     102        private:
     103            void registerVariables();
    103104    };
    104105}

  • code/branches/network2/src/orxonox/infos/PlayerInfo.h

    r6417 r6448  
    4242            PlayerInfo(BaseObject* creator);
    4343            virtual ~PlayerInfo();
    44 
    45             void registerVariables();
    4644
    4745            virtual void changedName();
    … …  
    9189
    9290        private:
     91            void registerVariables();
    9392            void networkcallback_changedcontrollableentityID();
    9493            void networkcallback_changedgtinfoID();
Note: See TracChangeset for help on using the changeset viewer.