Changeset 5720 for code/branches/libraries2/src/orxonox
- Timestamp:
- Aug 31, 2009, 5:03:29 PM (15 years ago)
- Location:
- code/branches/libraries2/src/orxonox
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.cc
r3280 r5720 37 37 #include "core/XMLPort.h" 38 38 #include "core/EventIncludes.h" 39 #include "o rxonox/objects/worldentities/pawns/Pawn.h"40 #include "o rxonox/objects/worldentities/triggers/PlayerTrigger.h"39 #include "objects/worldentities/pawns/Pawn.h" 40 #include "objects/worldentities/triggers/PlayerTrigger.h" 41 41 #include "QuestEffect.h" 42 42 … … 52 52 { 53 53 RegisterObject(QuestEffectBeacon); 54 54 55 55 this->status_ = QuestEffectBeaconStatus::Active; 56 56 this->times_ = INFINITE_TIME; … … 63 63 { 64 64 } 65 65 66 66 /** 67 67 @brief … … 74 74 XMLPortParam(QuestEffectBeacon, "times", setTimes, getTimes, xmlelement, mode); 75 75 XMLPortObject(QuestEffectBeacon, QuestEffect, "effects", addEffect, getEffect, xmlelement, mode); 76 76 77 77 COUT(3) << "New QuestEffectBeacon created." << std::endl; 78 78 } 79 79 80 80 /** 81 81 @brief … … 85 85 { 86 86 SUPER(QuestEffectBeacon, processEvent, event); 87 87 88 88 ORXONOX_SET_SUBCLASS_EVENT(QuestEffectBeacon, "execute", execute, event, PlayerTrigger); 89 89 } 90 90 91 91 /** 92 92 @brief … … 109 109 return false; 110 110 } 111 111 112 112 if(!trigger->isForPlayer()) //!< The PlayerTrigger is not exclusively for ControllableEntities which means we cannot extract one. 113 113 { … … 123 123 return false; 124 124 } 125 125 126 126 //! Extract the PlayerInfo from the ControllableEntity. 127 127 PlayerInfo* player = pawn->getPlayer(); 128 128 129 129 if(player == NULL) 130 130 { … … 144 144 return false; 145 145 } 146 146 147 147 /** 148 148 @brief … … 159 159 return false; 160 160 } 161 161 162 162 if(activate) 163 163 { … … 165 165 return true; 166 166 } 167 167 168 168 this->status_ = QuestEffectBeaconStatus::Inactive; 169 169 return true; 170 170 } 171 171 172 172 /** 173 173 @brief … … 186 186 return true; 187 187 } 188 188 189 189 this->times_ = this->times_ - 1; //!< Decrement number of times the QuestEffectBeacon can be executed. 190 190 if(this->getTimes() == 0) //!< Set the QuestEffectBeacon to inactive when the number of times it can be executed is reduced to 0. … … 192 192 this->status_ = QuestEffectBeaconStatus::Inactive; 193 193 } 194 195 return true; 196 } 197 194 195 return true; 196 } 197 198 198 /** 199 199 @brief … … 212 212 return false; 213 213 } 214 214 215 215 this->times_ = n; 216 216 return true; 217 217 } 218 218 219 219 /** 220 220 @brief … … 238 238 return true; 239 239 } 240 240 241 241 /** 242 242 @brief -
code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.h
r5693 r5720 38 38 39 39 #include <list> 40 #include "o rxonox/objects/worldentities/StaticEntity.h"40 #include "objects/worldentities/StaticEntity.h" 41 41 42 42 namespace orxonox -
code/branches/libraries2/src/orxonox/objects/quest/notifications/NotificationOverlay.h
r5693 r5720 39 39 40 40 #include <string> 41 #include "o rxonox/overlays/OverlayText.h"41 #include "overlays/OverlayText.h" 42 42 43 43 namespace orxonox -
code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
r3325 r5720 31 31 #include "core/CoreIncludes.h" 32 32 #include "core/XMLPort.h" 33 #include "o rxonox/objects/worldentities/pawns/Pawn.h"33 #include "objects/worldentities/pawns/Pawn.h" 34 34 35 35 namespace orxonox -
code/branches/libraries2/src/orxonox/overlays/CMakeLists.txt
r5693 r5720 3 3 OverlayGroup.cc 4 4 ) 5 6 SET_SOURCE_FILES(OVERLAYS_SRC_FILES7 OverlayText.cc8 FadeoutText.cc9 GUIOverlay.cc10 )11 12 ADD_SUBDIRECTORY(debug)13 ADD_SUBDIRECTORY(hud)14 ADD_SUBDIRECTORY(stats)15 16 ORXONOX_ADD_LIBRARY(overlays17 MODULE18 FIND_HEADER_FILES19 DEFINE_SYMBOL20 "OVERLAYS_SHARED_BUILD"21 PCH_FILE22 ../OrxonoxPrecompiledHeaders.h23 LINK_LIBRARIES24 orxonox25 SOURCE_FILES ${OVERLAYS_SRC_FILES}26 ) -
code/branches/libraries2/src/orxonox/sound/SoundBase.cc
r5695 r5720 37 37 #include "core/Core.h" 38 38 #include "core/Resource.h" 39 #include "o rxonox/objects/worldentities/WorldEntity.h"39 #include "objects/worldentities/WorldEntity.h" 40 40 #include "SoundManager.h" 41 41 42 namespace orxonox 42 namespace orxonox 43 43 { 44 44 SoundBase::SoundBase(WorldEntity* entity) -
code/branches/libraries2/src/orxonox/sound/SoundManager.cc
r3370 r5720 32 32 33 33 #include "util/Math.h" 34 #include " orxonox/CameraManager.h"35 #include "o rxonox/objects/worldentities/Camera.h"34 #include "CameraManager.h" 35 #include "objects/worldentities/Camera.h" 36 36 #include "SoundBase.h" 37 37 … … 146 146 Vector3 at = orient.zAxis(); 147 147 148 ALfloat orientation[6] = { at.x, at.y, at.z, 148 ALfloat orientation[6] = { at.x, at.y, at.z, 149 149 up.x, up.y, up.z }; 150 150 … … 158 158 (*i)->update(); 159 159 } 160 160 161 161 /** 162 162 * Check if sound is available
Note: See TracChangeset
for help on using the changeset viewer.