Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10818


Ignore:
Timestamp:
Nov 19, 2015, 7:55:11 PM (9 years ago)
Author:
muemart
Message:
  • Fixed some suspicious virtual function signatures
  • Fixed some clang warnings (and errors in the last commit, forgot to mention that)
  • Fix compilation without pch
  • Hack "override" keyword support into Tolua++
Location:
code/branches/cpp11_v2/src
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cpp11_v2/src/external/tolua/lua/package.lua

    r8729 r10818  
    8282    self.code = gsub(self.code,"%s*@%s*","@") -- eliminate spaces beside @
    8383    self.code = gsub(self.code,"%s?inline(%s)","%1") -- eliminate 'inline' keyword
     84    self.code = gsub(self.code,"%)%s?override;",");") -- eliminate 'override' keyword... at least most of the times
    8485    --self.code = gsub(self.code,"%s?extern(%s)","%1") -- eliminate 'extern' keyword
    8586    --self.code = gsub(self.code,"%s?virtual(%s)","%1") -- eliminate 'virtual' keyword

  • code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h

    r10769 r10818  
    6868            ~SettingsConfigFile();
    6969
    70             void load(); // tolua_export
     70            void load() override; // tolua_export
    7171            void setFilename(const std::string& filename); // tolua_export
    7272            void clean(bool bCleanComments = false); // tolua_export

  • code/branches/cpp11_v2/src/libraries/util/Math.h

    r10813 r10818  
    182182    {
    183183        // Default, raise a compiler error without including large boost header cascade.
    184         T temp();
     184        T temp{};
    185185        *********temp; // If you reach this code, you abused zeroise()!
    186186        return temp;

  • code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc

    r10765 r10818  
    142142    }
    143143
    144     inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     144    inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
    145145    {
    146146

  • code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h

    r10817 r10818  
    7070            virtual void updateLevel();
    7171
     72            virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
     73
    7274            float speed, damping, posforeward;
    7375            bool isFireing;
    … …  
    7779
    7880        private:
    79             virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
    8081            DodgeRace* getGame();
    8182            WeakPtr<DodgeRace> game;

  • code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc

    r10765 r10818  
    6464    }
    6565
    66     inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     66    inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
    6767    {
    6868        if(orxonox_cast<InvaderShip*>(otherObject))

  • code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h

    r10817 r10818  
    4747
    4848            virtual void tick(float dt) override;
    49             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
     49            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
    5050            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
    5151            virtual void setPlayer(InvaderShip* player){this->player = player;}

  • code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc

    r10765 r10818  
    148148                getGame()->end();
    149149    }
    150     inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     150    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
    151151    {
    152152        // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;

  • code/branches/cpp11_v2/src/modules/invader/InvaderShip.h

    r10817 r10818  
    6464            virtual void updateLevel();
    6565
    66             virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
     66            virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
    6767
    6868        protected:

  • code/branches/cpp11_v2/src/modules/objects/controllers/TeamTargetProxy.cc

    r10262 r10818  
    2828
    2929#include "TeamTargetProxy.h"
     30#include "core/CoreIncludes.h"
    3031#include "worldentities/ControllableEntity.h"
    3132#include "worldentities/pawns/Pawn.h"

  • code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc

    r10768 r10818  
    3030#include "worldentities/pawns/Pawn.h"
    3131#include "objects/Turret.h"
     32#include "core/object/ObjectList.h"
     33#include "core/CoreIncludes.h"
    3234
    3335 namespace orxonox

  • code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc

    r10765 r10818  
    5555    }
    5656
    57     void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     57    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
    5858    {
    5959        Pawn::damage(damage, healthdamage, shielddamage, originator);

  • code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h

    r10817 r10818  
    3838
    3939        virtual void tick(float dt) override;
    40         virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
     40        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
    4141
    4242    private:

  • code/branches/cpp11_v2/src/orxonox/Level.cc

    r10768 r10818  
    3030
    3131#include "util/Math.h"
     32#include "util/SubString.h"
    3233#include "core/CoreIncludes.h"
    3334#include "core/Loader.h"

  • code/branches/cpp11_v2/src/orxonox/Level.h

    r10817 r10818  
    3737#include "core/BaseObject.h"
    3838#include "network/synchronisable/Synchronisable.h"
     39#include "core/object/Context.h"
    3940#include "graphics/MeshLodInformation.h"
    4041

  • code/branches/cpp11_v2/src/orxonox/Scene.h

    r10817 r10818  
    4040#include "util/OgreForwardRefs.h"
    4141#include "core/BaseObject.h"
     42#include "core/object/Context.h"
    4243#include "network/synchronisable/Synchronisable.h"
    4344#include "tools/interfaces/Tickable.h"

  • code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.cc

    r10624 r10818  
    3030#include "core/singleton/ScopedSingletonIncludes.h"
    3131#include "core/ConfigurablePaths.h"
     32#include "core/CoreIncludes.h"
    3233
    3334#ifndef CHATTEST

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc

    r10768 r10818  
    3434#include "core/GameMode.h"
    3535#include "core/command/ConsoleCommandIncludes.h"
     36#include "core/object/ObjectList.h"
    3637#include "network/NetworkFunctionIncludes.h"
    3738#include "tools/Timer.h"

  • code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc

    r10768 r10818  
    3030
    3131#include "core/XMLPort.h"
     32#include "core/CoreIncludes.h"
    3233#include "BulletDynamics/Dynamics/btRigidBody.h"
    3334

  • code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.cc

    r9667 r10818  
    282282    }
    283283
    284     bool FpsPlayer::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     284    bool FpsPlayer::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
    285285    {
    286286        if (contactPoint.m_normalWorldOnB.y() > 0.6)

  • code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h

    r9667 r10818  
    6969            virtual void fire();
    7070
    71             bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
     71            bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
    7272
    7373            virtual void addedWeaponPack(WeaponPack* wPack);
Note: See TracChangeset for help on using the changeset viewer.