Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop

This commit is contained in:
SoftCoder 2014-11-28 20:45:40 -08:00
parent e27c44bb8f 645778a490
commit 8e7dfbd43a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mk/windoze/vc2012/glest_game.vcxproj
View File

@ -435,6 +435,7 @@
<ClCompile Include="..\..\..\source\glest_game\network\server_interface.cpp" />
<ClCompile Include="..\..\..\source\glest_game\sound\sound_container.cpp" />
<ClCompile Include="..\..\..\source\glest_game\sound\sound_renderer.cpp" />
<ClCompile Include="..\..\..\source\glest_game\types\projectile_type.cpp" />
<ClCompile Include="..\..\..\source\glest_game\types\tileset_model_type.cpp" />
<ClCompile Include="..\..\..\source\glest_game\type_instances\command.cpp" />
<ClCompile Include="..\..\..\source\glest_game\type_instances\faction.cpp" />
@ -562,4 +563,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

2
source/glest_game/types/unit_type.h
View File

@ -291,7 +291,7 @@ public:
int getTargetHeight() const {return targetHeight;}
int getStoredResourceCount() const {return (int)storedResources.size();}
inline const Resource *getStoredResource(int i) const {return &storedResources[i];}
int getLootableResourceCount() const {return lootableResources.size();}
int getLootableResourceCount() const {return (int)lootableResources.size();}
inline const LootableResource getLootableResource(int i) const {return lootableResources.at(i);}
const set<string> &getTags() const {return tags;}
bool getCellMapCell(int x, int y, CardinalDir facing) const;