diff options
| -rw-r--r-- | src/CBot/CBot.h | 2 | ||||
| -rw-r--r-- | src/graphics/common/engine.h | 2 | ||||
| -rw-r--r-- | src/graphics/common/particle.h | 2 | ||||
| -rw-r--r-- | src/sound/sound.h | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/CBot/CBot.h b/src/CBot/CBot.h index d618131..3b7d7e8 100644 --- a/src/CBot/CBot.h +++ b/src/CBot/CBot.h @@ -32,7 +32,7 @@ // fix for MSVC instruction __asm int 3 (setting a trap)
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || defined(__GNUC__)
#define ASM_TRAP() asm("int $3");
#else
#define ASM_TRAP() __asm int 3;
diff --git a/src/graphics/common/engine.h b/src/graphics/common/engine.h index 6d2937c..b36ccbc 100644 --- a/src/graphics/common/engine.h +++ b/src/graphics/common/engine.h @@ -481,7 +481,7 @@ public: void SetLightMode(bool present); bool RetLightMode(); - void SetEditIndentMode(bool auto); + void SetEditIndentMode(bool indentAuto); bool RetEditIndentMode(); void SetEditIndentValue(int value); diff --git a/src/graphics/common/particle.h b/src/graphics/common/particle.h index e430e2a..b72075f 100644 --- a/src/graphics/common/particle.h +++ b/src/graphics/common/particle.h @@ -305,7 +305,7 @@ protected: void DrawParticuleWheel(int i); CObject* SearchObjectGun(Math::Vector old, Math::Vector pos, ParticuleType type, CObject *father); CObject* SearchObjectRay(Math::Vector pos, Math::Vector goal, ParticuleType type, CObject *father); - void Play(Snd::Sound sound, Math::Vector pos, float amplitude); + void Play(Sound sound, Math::Vector pos, float amplitude); bool TrackMove(int i, Math::Vector pos, float progress); void TrackDraw(int i, ParticuleType type); diff --git a/src/sound/sound.h b/src/sound/sound.h index 598ffe3..2eb92a0 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -28,6 +28,8 @@ #include <plugins/plugin.h>
+#include <string>
+
/*!
* Maximum possible audio volume
*/
|