Changeset 6412 for code/branches/pickup2/src/orxonox/OrxonoxPrereqs.h

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (4 diffs)

code/branches/pickup2/src/orxonox/OrxonoxPrereqs.h

@@ -139 +139 @@
     class AmbientSound;
     class BaseSound;
+    class SoundBuffer;
     class SoundManager;
+    class SoundStreamer;
     class WorldSound;
 
@@ -156 +158 @@
     class CameraPosition;
     class ControllableEntity;
+    class EffectContainer;
     class ExplosionChunk;
     class MobileEntity;
@@ -163 +166 @@
     class TeamSpawnPoint;
     class WorldEntity;
+    class Rocket;
     // worldentities, pawns
     class Destroyer;
@@ -196 +200 @@
 typedef unsigned int ALuint;
 typedef int ALint;
+typedef int ALenum;
 
 #endif /* _OrxonoxPrereqs_H__ */