Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9876 in orxonox.OLD for trunk


Ignore:
Timestamp:
Oct 3, 2006, 2:38:31 PM (18 years ago)
Author:
bensch
Message:

compiles better on Windows

Location:
trunk/src/lib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/event/event_def.h

    r8148 r9876  
    88
    99#ifdef HAVE_SDL_H
    10 #include "SDL_keysym.h"
     10 #include "SDL_keysym.h"
    1111#else
    12 #include "SDL/SDL_keysym.h"
     12 #include "SDL/SDL_keysym.h"
    1313#endif
    1414
    15 
    1615//! these are the extended event types, that are not included in SDL_keysym
    17 typedef enum extEventTyes
    18 {
     16typedef enum {
    1917  EV_MOUSE_BUTTON_LEFT           = SDLK_LAST + 1,
    2018  EV_MOUSE_BUTTON_MIDDLE,
    … …  
    3735
    3836  EV_NUMBER
    39 };
     37} extEventTyes;
    4038
    4139
    4240//! this is an enumeration of all states of the event_handler/game
    43 typedef enum elState
     41typedef enum
    4442{
    4543  ES_NULL         = -1,
    … …  
    4846  ES_MENU         = 2,       //!< orxonox menu state
    4947  ES_SHELL        = 3,       //!< if we are in shell Modus
    50 
     48 
    5149  ES_ALL          = 4,       //!< you want to register events for all states
    5250
    53   ES_NUMBER       = 5,       //!< the number of states
    54 };
    55 
    56 
    57 
     51  ESTATE_NUMBER   = 5        //!< the number of states < Namespace-problem in windows.
     52} elState;
    5853
    5954#endif /* _EVENT_DEF_H */

  • trunk/src/lib/event/event_handler.h

    r9869 r9876  
    7171  static EventHandler*         singletonRef;                    //!< the singleton reference
    7272
    73   std::vector<EventListener*>  listeners[ES_NUMBER][EV_NUMBER]; //!< a list of registered listeners.
     73  std::vector<EventListener*>  listeners[ESTATE_NUMBER][EV_NUMBER]; //!< a list of registered listeners.
    7474  elState                      state;                           //!< the state of the event handlder.
    7575  std::stack<short>            stateStack;                      //!< a stack for the States we are in.
    7676  KeyMapper                    keyMapper;                       //!< reference to the key mapper.
    7777
    78   bool                         bUNICODE[ES_NUMBER];             //!< If unicode should be enabled.
     78  bool                         bUNICODE[ESTATE_NUMBER];             //!< If unicode should be enabled.
    7979  bool                         eventsGrabbed;                   //!< If the events should be grabbed
    8080

  • trunk/src/lib/event/event_listener.h

    r9869 r9876  
    88
    99#include "base_object.h"
     10#include "event_def.h"
    1011#include "event.h"
    11 #include "event_def.h"
    1212
    1313//! A class for event listener

  • trunk/src/lib/graphics/graphics_engine.cc

    r9869 r9876  
    376376#ifdef __WIN32__
    377377  // REBUILDING TEXTURES (ON WINDOWS CONTEXT SWITCH)
    378   const std::list<BaseObject*>* texList = ClassList::getList(CL_TEXTURE);
    379   if (texList != NULL)
    380   {
    381     std::list<BaseObject*>::const_iterator reTex;
    382     for (reTex = texList->begin(); reTex != texList->end(); reTex++)
    383       dynamic_cast<Texture*>(*reTex)->rebuild();
    384   }
     378  ObjectList<Texture>::const_iterator retex;
     379  for (retex = Texture::objectList().begin(); retex != Texture::objectList().end(); ++retex)
     380    (*retex)->rebuild();
     381
    385382  // REBUILDING MODELS
    386   const std::list<BaseObject*>* modelList = ClassList::getList(CL_STATIC_MODEL);
    387   if (texList != NULL)
    388   {
    389     std::list<BaseObject*>::const_iterator reModel;
    390     for (reModel = modelList->begin(); reModel != modelList->end(); reModel++)
    391       dynamic_cast<StaticModel*>(*reModel)->rebuild();
    392   }
     383  ObjectList<StaticModel>::const_iterator remod;
     384  for (remod = StaticModel::objectList().begin(); remod != StaticModel::objectList().end(); ++remod)
     385    (*remod)->rebuild();
     386
    393387#endif /* __WIN32__ */
    394388  return 1;

  • trunk/src/lib/graphics/importer/md2/md2Model.h

    r9869 r9876  
    8383  FALLBACK,        //9
    8484  WAVE,            //10
    85   POINT,           //11
     85  /// TODO: DO THIS BACK  POINT,           //11
    8686  CROUCH_STAND,
    8787  CROUCH_WALK,

  • trunk/src/lib/graphics/spatial_separation/Makefile.am

    r5463 r9876  
    44noinst_LIBRARIES = libORXquadtree.a
    55
    6 libORXquadtree_a_SOURCES = quadtree.cc \
     6libORXquadtree_a_SOURCES =
     7# quadtree.cc \
    78                           quadtree_node.cc \
    89                           spatial_separation.cc

  • trunk/src/lib/util/filesys/directory.cc

    r9869 r9876  
    4545#include <windows.h>
    4646#include <winbase.h>
    47 const char Direcotry::delimiter = '\\';
     47const char Directory::delimiter = '\\';
    4848#endif
    4949
Note: See TracChangeset for help on using the changeset viewer.