Changeset 6378 for code/branches/presentation2/src/orxonox
- Timestamp:
- Dec 18, 2009, 12:48:19 PM (15 years ago)
- Location:
- code/branches/presentation2/src/orxonox
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc
r6349 r6378 37 37 #include "core/ConsoleCommand.h" 38 38 #include "core/ConfigValueIncludes.h" 39 #include "core/CoreIncludes.h" 39 40 #include "core/GraphicsManager.h" 40 41 #include "core/GUIManager.h" -
code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc
r6160 r6378 30 30 31 31 #include "util/Clock.h" 32 #include "core/BaseObject.h" 32 33 #include "core/ConsoleCommand.h" 33 34 #include "core/Game.h" … … 58 59 { 59 60 unsigned int nr=0; 60 for(ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; ++it){ 61 if( dynamic_cast<Synchronisable*>(*it) ) 61 for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; ++it) 62 { 63 if (dynamic_cast<Synchronisable*>(*it)) 62 64 COUT(0) << "object: " << it->getIdentifier()->getName() << " id: " << dynamic_cast<Synchronisable*>(*it)->getObjectID() << std::endl; 63 65 else … … 66 68 } 67 69 COUT(0) << "currently got " << nr << " objects" << std::endl; 68 69 70 } 70 71 -
code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc
r6340 r6378 35 35 #include "util/Exception.h" 36 36 #include "util/StringUtils.h" 37 #include "core/Resource.h"38 37 #include "sound/SoundManager.h" 39 38 -
code/branches/presentation2/src/orxonox/sound/SoundBuffer.h
r6332 r6378 31 31 32 32 #include "OrxonoxPrereqs.h" 33 34 #include <list> 33 35 #include <boost/shared_ptr.hpp> 36 #include "core/Resource.h" 34 37 35 38 namespace orxonox -
code/branches/presentation2/src/orxonox/sound/SoundManager.cc
r6373 r6378 39 39 #include "util/Clock.h" 40 40 #include "core/ConfigValueIncludes.h" 41 #include "core/CoreIncludes.h" 41 42 #include "core/GameMode.h" 42 43 #include "core/ScopedSingletonManager.h" -
code/branches/presentation2/src/orxonox/sound/SoundStreamer.cc
r6354 r6378 26 26 */ 27 27 #include "SoundStreamer.h" 28 #include "SoundManager.h" 28 29 29 #include <al.h> 30 30 #include <vorbis/vorbisfile.h> 31 #include "SoundManager.h" 31 32 32 33 namespace orxonox -
code/branches/presentation2/src/orxonox/sound/SoundStreamer.h
r6354 r6378 33 33 #include <string> 34 34 #include <OgreDataStream.h> 35 #include "core/CorePrereqs.h" 35 36 36 37 namespace orxonox
Note: See TracChangeset
for help on using the changeset viewer.