Changeset 5961 in orxonox.OLD for branches/avi_play/src/world_entities

Timestamp:

Dec 7, 2005, 2:53:43 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/avi_play: merged the trunk back to the avi_play branche again
merged with command
svn merge -r 5924:HEAD ../trunk/ avi_play/

Location:

branches/avi_play/src/world_entities/weapons

Files:

• aiming_turret.cc (modified) (1 diff)
• cannon.cc (modified) (1 diff)
• test_gun.cc (modified) (1 diff)
• turret.cc (modified) (1 diff)
• weapon.cc (modified) (1 diff)

branches/avi_play/src/world_entities/weapons/aiming_turret.cc

@@ -26 +26 @@
 
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "factory.h"

branches/avi_play/src/world_entities/weapons/cannon.cc

@@ -32 +32 @@
 #include "list.h"
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "null_parent.h"

branches/avi_play/src/world_entities/weapons/test_gun.cc

@@ -32 +32 @@
 #include "list.h"
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "null_parent.h"

branches/avi_play/src/world_entities/weapons/turret.cc

@@ -26 +26 @@
 #include "list.h"
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "factory.h"

branches/avi_play/src/world_entities/weapons/weapon.cc

@@ -28 +28 @@
 #include "load_param.h"
 #include "state.h"
-#include "sound_engine.h"
 #include "animation3d.h"
 #include "vector.h"
+
+#include "sound_source.h"
+#include "sound_buffer.h"
 
 ////////////////////