Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix non-pch build.

Browse Source 
This was SVN commit r12872.
This commit is contained in:
leper 2012-11-24 17:15:07 +00:00
parent b1720ebdbc
commit ed98320acc
5 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml
View File

@ -5,7 +5,6 @@
<SelectionGroupName>units/cart_support_healer_b</SelectionGroupName>
<SpecificName>Kehinit</SpecificName>
<History>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. </History>
<Tooltip>Heal units within her aura. (Not implemented yet)</Tooltip>
<Icon>units/cart_support_healer.png</Icon>
<Rank>Basic</Rank>
</Identity>

1
source/soundmanager/SoundManager.cpp
View File

@ -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;

1
source/soundmanager/data/SoundData.h
View File

@ -26,7 +26,6 @@
#include "lib/file/vfs/vfs_path.h"
#include "ps/CStr.h"
#include <string>
#include <map>
class CSoundData;

6
source/soundmanager/items/CSoundBase.h
View File

@ -26,9 +26,6 @@
#include "soundmanager/items/ISoundItem.h"
#include "soundmanager/data/SoundData.h"
#include <string>
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

3
source/soundmanager/items/ISoundItem.h
View File

@ -24,8 +24,7 @@
#include "lib/external_libraries/openal.h"
#include "maths/Vector3D.h"
#include <string>
#include "ps/CStr.h"
class ISoundItem
{