mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed ore to metal in C++.

Browse Source 
This was SVN commit r4596.
This commit is contained in:
Matei
2006-10-26 22:01:26 +00:00
parent ab4246bb29
commit 005cc8d355
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation/Technology.cpp
+4 -4
View File
@@ -123,7 +123,7 @@ bool CTechnology::loadELReq( XMBElement Req, CXeromyces& XeroFile )
EL(food);
EL(tech);
EL(stone);
EL(ore);
EL(metal);
EL(wood);
EL(entity);
@@ -153,8 +153,8 @@ bool CTechnology::loadELReq( XMBElement Req, CXeromyces& XeroFile )
m_ReqWood = resValue.ToFloat();
else if ( resName == el_stone )
m_ReqStone = resValue.ToFloat();
else if ( resName == el_ore )
m_ReqOre = resValue.ToFloat();
else if ( resName == el_metal )
m_ReqMetal = resValue.ToFloat();
else
{
const char* tagName = XeroFile.getElementString(name).c_str();
@@ -432,7 +432,7 @@ void CTechnology::ScriptingInit()
AddProperty<float>(L"food", &CTechnology::m_ReqFood);
AddProperty<float>(L"wood", &CTechnology::m_ReqWood);
AddProperty<float>(L"stone", &CTechnology::m_ReqStone);
AddProperty<float>(L"ore", &CTechnology::m_ReqOre);
AddProperty<float>(L"metal", &CTechnology::m_ReqMetal);
AddProperty<bool>(L"in_progress", &CTechnology::m_inProgress);
AddMethod<jsval, &CTechnology::ApplyEffects>( "applyEffects", 2 );
source/simulation/Technology.h
+1 -1
View File
@@ -66,7 +66,7 @@ private:
float m_ReqWood;
float m_ReqFood;
float m_ReqStone;
float m_ReqOre;
float m_ReqMetal;
std::vector<CStr> m_ReqEntities;
std::vector<CStr> m_ReqTechs;