From ed98320acceef50244dd473398a22a466dd4d52d Mon Sep 17 00:00:00 2001 From: leper Date: Sat, 24 Nov 2012 17:15:07 +0000 Subject: [PATCH] Fix non-pch build. This was SVN commit r12872. --- .../simulation/templates/units/cart_support_healer_b.xml | 1 - source/soundmanager/SoundManager.cpp | 1 + source/soundmanager/data/SoundData.h | 1 - source/soundmanager/items/CSoundBase.h | 6 ------ source/soundmanager/items/ISoundItem.h | 3 +-- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml index 89b8d731ac..5e58aac040 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml @@ -5,7 +5,6 @@ units/cart_support_healer_b Kehinit Tanit (also spelled TINITH, TINNIT, or TINT), chief goddess of Carthage, equivalent of Astarte. Although she seems to have had some connection with the heavens, she was also a mother goddess, and fertility symbols often accompany representations of her. She was probably the consort of Baal Hammon (or Amon), the chief god of Carthage, and was often given the attribute "face of Baal." Although Tanit did not appear at Carthage before the 5th century BC, she soon eclipsed the more established cult of Baal Hammon and, in the Carthaginian area at least, was frequently listed before him on the monuments. In the worship of Tanit and Baal Hammon, children, probably firstborn, were sacrificed. Ample evidence of the practice has been found west of Carthage in the precinct of Tanit, where a tofet (a sanctuary for the sacrifice of children) was discovered. Tanit was also worshipped on Malta, Sardinia, and in Spain. There is no other reason for giving the Carthaginians a priestess instead of a priest in 0 A.D., although Tanit was the most popular of their two main gods with the people. - Heal units within her aura. (Not implemented yet) units/cart_support_healer.png Basic diff --git a/source/soundmanager/SoundManager.cpp b/source/soundmanager/SoundManager.cpp index ce0049f4e1..f5996ea4fd 100644 --- a/source/soundmanager/SoundManager.cpp +++ b/source/soundmanager/SoundManager.cpp @@ -28,6 +28,7 @@ #include "soundmanager/js/MusicSound.h" #include "soundmanager/js/Sound.h" #include "ps/CLogger.h" +#include "ps/CStr.h" #include "ps/Profiler2.h" CSoundManager* g_SoundManager = NULL; diff --git a/source/soundmanager/data/SoundData.h b/source/soundmanager/data/SoundData.h index 60a98aed5e..e783081944 100644 --- a/source/soundmanager/data/SoundData.h +++ b/source/soundmanager/data/SoundData.h @@ -26,7 +26,6 @@ #include "lib/file/vfs/vfs_path.h" #include "ps/CStr.h" -#include #include class CSoundData; diff --git a/source/soundmanager/items/CSoundBase.h b/source/soundmanager/items/CSoundBase.h index 7e532ac405..3bbb281932 100644 --- a/source/soundmanager/items/CSoundBase.h +++ b/source/soundmanager/items/CSoundBase.h @@ -26,9 +26,6 @@ #include "soundmanager/items/ISoundItem.h" #include "soundmanager/data/SoundData.h" -#include - - class CSoundBase : public ISoundItem { protected: @@ -85,11 +82,8 @@ protected: void SetNameFromPath(VfsPath& itemPath); void ResetFade(); bool HandleFade(); - - }; #endif // CONFIG2_AUDIO #endif // INCLUDED_CSOUNDBASE_H - diff --git a/source/soundmanager/items/ISoundItem.h b/source/soundmanager/items/ISoundItem.h index 6e96cf9f20..0bec057d6d 100644 --- a/source/soundmanager/items/ISoundItem.h +++ b/source/soundmanager/items/ISoundItem.h @@ -24,8 +24,7 @@ #include "lib/external_libraries/openal.h" #include "maths/Vector3D.h" - -#include +#include "ps/CStr.h" class ISoundItem {