Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9567 for code/branches/core6


Ignore:
Timestamp:
Mar 24, 2013, 7:18:06 PM (12 years ago)
Author:
landauf
Message:

details

Location:
code/branches/core6/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core6/src/libraries/core/CoreIncludes.h

    r9564 r9567  
    165165    /**
    166166        @brief Returns the Identifier with a given 'this' pointer.
    167         @note This of course only works with OrxonoxClasses.
     167        @note This of course only works with Identifiables.
    168168              The only use is in conjunction with macros that don't know the class type.
    169         @param object Pointer to an OrxonoxClass
     169        @param object Pointer to an Identifiable
    170170    */
    171171    template <class T>
  • code/branches/core6/src/libraries/core/GUIManager.h

    r9563 r9567  
    4949#include "util/Singleton.h"
    5050#include "input/InputHandler.h"
    51 #include "class/OrxonoxClass.h"
    5251#include "WindowEventListener.h"
    5352
  • code/branches/core6/src/libraries/core/class/Identifiable.cc

    r9565 r9567  
    2929/**
    3030    @file
    31     @brief Implementation of OrxonoxClass.
     31    @brief Implementation of Identifiable.
    3232*/
    3333
  • code/branches/core6/src/libraries/core/command/Shell.h

    r9563 r9567  
    200200            unsigned int              historyOffset_;       ///< The command history is a circular buffer, this variable defines the current write-offset
    201201            std::vector<std::string>  commandHistory_;      ///< The history of commands that were entered by the user
    202             static unsigned int       cacheSize_s;          ///< The maximum cache size of the CommandExecutor - this is stored here for better readability of the config file and because CommandExecutor is no OrxonoxClass
     202            static unsigned int       cacheSize_s;          ///< The maximum cache size of the CommandExecutor - this is stored here for better readability of the config file and because CommandExecutor is not configurable
    203203    };
    204204}
  • code/branches/core6/src/modules/notifications/NotificationManager.h

    r9563 r9567  
    4242#include <string>
    4343
    44 #include "core/class/OrxonoxClass.h"
    4544#include "util/Singleton.h"
    4645#include "interfaces/NotificationListener.h"
  • code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc

    r8855 r9567  
    4646        Constructor. Registers the object and initializes some default values.
    4747    */
    48     BasicProjectile::BasicProjectile() : OrxonoxClass()
     48    BasicProjectile::BasicProjectile()
    4949    {
    5050        RegisterRootObject(BasicProjectile);// Register the BasicProjectile class to the core
  • code/branches/core6/src/orxonox/controllers/FormationController.h

    r9563 r9567  
    3636
    3737#include "util/Math.h"
    38 #include "core/class/OrxonoxClass.h"
    3938#include "controllers/Controller.h"
    4039#include "worldentities/ControllableEntity.h"
  • code/branches/core6/src/orxonox/gamestates/GSLevel.h

    r9563 r9567  
    3434#include <string>
    3535#include <set>
    36 #include "core/class/OrxonoxClass.h"
    3736#include "core/GameState.h"
    3837
Note: See TracChangeset for help on using the changeset viewer.