games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00
Code Issues Releases Activity

[refactor] reduce some code duplication, get rid of few magic nombers.

Browse Source 
*fix deletion of empty pandora box
This commit is contained in:
alexvins 2013-01-12 10:32:03 +00:00
parent 7e7d12095b
commit daf2c285e9
4 changed files with 167 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

305
lib/CObjectHandler.cpp
View File

@ -1,3 +1,13 @@
/*
* CObjectHandler.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h" #include "StdInc.h"
#include "CObjectHandler.h" #include "CObjectHandler.h"
@ -25,16 +35,6 @@
using namespace boost::assign; using namespace boost::assign;
/*
* CObjectHandler.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
// It looks that we can't rely on shadowCoverage correctness (Mantis #866). This may result // It looks that we can't rely on shadowCoverage correctness (Mantis #866). This may result
// in notable performance decrease (SDL blit with custom alpha blit) not notable on my system (Ivan) // in notable performance decrease (SDL blit with custom alpha blit) not notable on my system (Ivan)
#define USE_COVERAGE_MAP 0 #define USE_COVERAGE_MAP 0
@ -52,6 +52,38 @@ std::map<ui8, ui8> CGObelisk::visited; //map: team_id => how many obelisks has b
std::vector<const CArtifact *> CGTownInstance::merchantArtifacts; std::vector<const CArtifact *> CGTownInstance::merchantArtifacts;
std::vector<int> CGTownInstance::universitySkills; std::vector<int> CGTownInstance::universitySkills;
///helpers
static void openWindow(const OpenWindow::EWindow type, const ui32 id1, const ui32 id2 = 0)
{
OpenWindow ow;
ow.window = type;
ow.id1 = id1;
ow.id2 = id2;
IObjectInterface::cb->sendAndApply(&ow);
}
static void showInfoDialog(const TPlayerColor playerID, const ui32 txtID, const ui16 soundID)
{
InfoWindow iw;
iw.soundID = soundID;
iw.player = playerID;
iw.text.addTxt(MetaString::ADVOB_TXT,txtID);
IObjectInterface::cb->sendAndApply(&iw);
}
static void showInfoDialog(const int heroID, const ui32 txtID, const ui16 soundID)
{
const TPlayerColor playerID = IObjectInterface::cb->getOwner(heroID);
showInfoDialog(playerID,txtID,soundID);
}
static void showInfoDialog(const CGHeroInstance* h, const ui32 txtID, const ui16 soundID)
{
const TPlayerColor playerID = h->getOwner();
showInfoDialog(playerID,txtID,soundID);
}
///IObjectInterface
void IObjectInterface::onHeroVisit(const CGHeroInstance * h) const void IObjectInterface::onHeroVisit(const CGHeroInstance * h) const
{} {}
@ -457,29 +489,18 @@ void CGObjectInstance::onHeroVisit( const CGHeroInstance * h ) const
{ {
case Obj::HILL_FORT: case Obj::HILL_FORT:
{ {
OpenWindow ow; openWindow(OpenWindow::HILL_FORT_WINDOW,id,h->id);
ow.window = OpenWindow::HILL_FORT_WINDOW;
ow.id1 = id;
ow.id2 = h->id;
cb->sendAndApply(&ow);
} }
break; break;
case Obj::SANCTUARY: case Obj::SANCTUARY:
{ {
InfoWindow iw; //You enter the sanctuary and immediately feel as if a great weight has been lifted off your shoulders. You feel safe here.
iw.player = h->tempOwner; showInfoDialog(h,114,soundBase::GETPROTECTION);
iw.soundID = soundBase::GETPROTECTION;
iw.text.addTxt(MetaString::ADVOB_TXT, 114); //You enter the sanctuary and immediately feel as if a great weight has been lifted off your shoulders. You feel safe here.
cb->sendAndApply(&iw);
} }
break; break;
case Obj::TAVERN: case Obj::TAVERN:
{ {
OpenWindow ow; openWindow(OpenWindow::TAVERN_WINDOW,h->id,id);
ow.window = OpenWindow::TAVERN_WINDOW;
ow.id1 = h->id;
ow.id2 = id;
cb->sendAndApply(&ow);
} }
break; break;
} }
@ -878,9 +899,7 @@ void CGHeroInstance::onHeroVisit(const CGHeroInstance * h) const
} }
else if(ID == Obj::PRISON) else if(ID == Obj::PRISON)
{ {
InfoWindow iw; int txt_id;
iw.player = h->tempOwner;
iw.soundID = soundBase::ROGUE;
if(cb->getHeroCount(h->tempOwner,false) < 8) //free hero slot if(cb->getHeroCount(h->tempOwner,false) < 8) //free hero slot
{ {
@ -888,14 +907,14 @@ void CGHeroInstance::onHeroVisit(const CGHeroInstance * h) const
cb->setObjProperty(id, ObjProperty::ID, Obj::HERO); //set ID to 34 cb->setObjProperty(id, ObjProperty::ID, Obj::HERO); //set ID to 34
cb->giveHero(id,h->tempOwner); //recreates def and adds hero to player cb->giveHero(id,h->tempOwner); //recreates def and adds hero to player
iw.text << std::pair<ui8,ui32>(11,102); txt_id = 102;
} }
else //already 8 wandering heroes else //already 8 wandering heroes
{ {
iw.text << std::pair<ui8,ui32>(11,103); txt_id = 103;
} }
cb->showInfoDialog(&iw); showInfoDialog(h,txt_id,soundBase::ROGUE);
} }
} }
@ -1634,9 +1653,8 @@ void CGDwelling::onHeroVisit( const CGHeroInstance * h ) const
if( !relations && stacksCount() > 0) //object is guarded, owned by enemy if( !relations && stacksCount() > 0) //object is guarded, owned by enemy
{ {
BlockingDialog bd; BlockingDialog bd(true,false);
bd.player = h->tempOwner; bd.player = h->tempOwner;
bd.flags = BlockingDialog::ALLOW_CANCEL;
bd.text.addTxt(MetaString::GENERAL_TXT, 421); //Much to your dismay, the %s is guarded by %s %s. Do you wish to fight the guards? bd.text.addTxt(MetaString::GENERAL_TXT, 421); //Much to your dismay, the %s is guarded by %s %s. Do you wish to fight the guards?
bd.text.addReplacement(ID == Obj::CREATURE_GENERATOR1 ? MetaString::CREGENS : MetaString::CREGENS4, subID); bd.text.addReplacement(ID == Obj::CREATURE_GENERATOR1 ? MetaString::CREGENS : MetaString::CREGENS4, subID);
bd.text.addReplacement(MetaString::ARRAY_TXT, 176 + Slots().begin()->second->getQuantityID()*3); bd.text.addReplacement(MetaString::ARRAY_TXT, 176 + Slots().begin()->second->getQuantityID()*3);
@ -1650,9 +1668,8 @@ void CGDwelling::onHeroVisit( const CGHeroInstance * h ) const
cb->setOwner(id, h->tempOwner); cb->setOwner(id, h->tempOwner);
} }
BlockingDialog bd; BlockingDialog bd (true,false);
bd.player = h->tempOwner; bd.player = h->tempOwner;
bd.flags = BlockingDialog::ALLOW_CANCEL;
if(ID == Obj::CREATURE_GENERATOR1 || ID == Obj::CREATURE_GENERATOR4) if(ID == Obj::CREATURE_GENERATOR1 || ID == Obj::CREATURE_GENERATOR4)
{ {
bd.text.addTxt(MetaString::ADVOB_TXT, ID == Obj::CREATURE_GENERATOR1 ? 35 : 36); //{%s} Would you like to recruit %s? / {%s} Would you like to recruit %s, %s, %s, or %s? bd.text.addTxt(MetaString::ADVOB_TXT, ID == Obj::CREATURE_GENERATOR1 ? 35 : 36); //{%s} Would you like to recruit %s? / {%s} Would you like to recruit %s, %s, %s, or %s?
@ -2557,7 +2574,7 @@ void CGVisitableOPH::onNAHeroVisit(int heroID, bool alreadyVisited) const
sound = soundBase::gazebo; sound = soundBase::gazebo;
id = Component::EXPERIENCE; id = Component::EXPERIENCE;
subid = 1; subid = 1;
ot = 146; ot = 147;
val = 1; val = 1;
break; break;
case Obj::LIBRARY_OF_ENLIGHTENMENT: case Obj::LIBRARY_OF_ENLIGHTENMENT:
@ -2581,7 +2598,7 @@ void CGVisitableOPH::onNAHeroVisit(int heroID, bool alreadyVisited) const
{ {
BlockingDialog sd(false,true); BlockingDialog sd(false,true);
sd.soundID = sound; sd.soundID = sound;
sd.text << std::pair<ui8,ui32>(11,ot); sd.text.addTxt(MetaString::ADVOB_TXT,ot);
sd.components.push_back(Component(Component::PRIM_SKILL, PrimarySkill::ATTACK, 2, 0)); sd.components.push_back(Component(Component::PRIM_SKILL, PrimarySkill::ATTACK, 2, 0));
sd.components.push_back(Component(Component::PRIM_SKILL, PrimarySkill::DEFENSE, 2, 0)); sd.components.push_back(Component(Component::PRIM_SKILL, PrimarySkill::DEFENSE, 2, 0));
sd.player = cb->getOwner(heroID); sd.player = cb->getOwner(heroID);
@ -2597,7 +2614,7 @@ void CGVisitableOPH::onNAHeroVisit(int heroID, bool alreadyVisited) const
InfoWindow iw; InfoWindow iw;
iw.soundID = sound; iw.soundID = sound;
iw.components.push_back(Component(Component::PRIM_SKILL, subid,val,0)); iw.components.push_back(Component(Component::PRIM_SKILL, subid,val,0));
iw.text << std::pair<ui8,ui32>(11,ot); iw.text.addTxt(MetaString::ADVOB_TXT,ot);
iw.player = cb->getOwner(heroID); iw.player = cb->getOwner(heroID);
cb->showInfoDialog(&iw); cb->showInfoDialog(&iw);
break; break;
@ -2610,7 +2627,7 @@ void CGVisitableOPH::onNAHeroVisit(int heroID, bool alreadyVisited) const
iw.soundID = sound; iw.soundID = sound;
iw.components.push_back(Component(id,subid,val,0)); iw.components.push_back(Component(id,subid,val,0));
iw.player = cb->getOwner(heroID); iw.player = cb->getOwner(heroID);
iw.text << std::pair<ui8,ui32>(11,ot); iw.text.addTxt(MetaString::ADVOB_TXT,ot);
iw.soundID = soundBase::gazebo; iw.soundID = soundBase::gazebo;
cb->showInfoDialog(&iw); cb->showInfoDialog(&iw);
cb->changePrimSkill(heroID,4,val); cb->changePrimSkill(heroID,4,val);
@ -2627,7 +2644,7 @@ void CGVisitableOPH::onNAHeroVisit(int heroID, bool alreadyVisited) const
iw.soundID = sound; iw.soundID = sound;
iw.components.push_back(Component(id,subid,1,0)); iw.components.push_back(Component(id,subid,1,0));
iw.player = cb->getOwner(heroID); iw.player = cb->getOwner(heroID);
iw.text << std::pair<ui8,ui32>(11,148); iw.text.addTxt(MetaString::ADVOB_TXT,148);
cb->showInfoDialog(&iw); cb->showInfoDialog(&iw);
cb->changePrimSkill(heroID,4,val); cb->changePrimSkill(heroID,4,val);
break; break;
@ -2638,13 +2655,13 @@ void CGVisitableOPH::onNAHeroVisit(int heroID, bool alreadyVisited) const
TExpType resval; TExpType resval;
if(ttype==1) if(ttype==1)
{ {
res = 6; res = Res::GOLD;
resval = 2000; resval = 2000;
ot = 149; ot = 149;
} }
else else
{ {
res = 5; res = Res::GEMS;
resval = 10; resval = 10;
ot = 151; ot = 151;
} }
@ -2652,18 +2669,14 @@ void CGVisitableOPH::onNAHeroVisit(int heroID, bool alreadyVisited) const
if(cb->getResource(h->tempOwner,res) < resval) //not enough resources if(cb->getResource(h->tempOwner,res) < resval) //not enough resources
{ {
ot++; ot++;
InfoWindow iw; showInfoDialog(h,ot,sound);
iw.soundID = sound;
iw.player = h->tempOwner;
iw.text << std::pair<ui8,ui32>(11,ot);
cb->showInfoDialog(&iw);
return; return;
} }
BlockingDialog sd (true, false); BlockingDialog sd (true, false);
sd.soundID = sound; sd.soundID = sound;
sd.player = cb->getOwner(heroID); sd.player = cb->getOwner(heroID);
sd.text << std::pair<ui8,ui32>(11,ot); sd.text.addTxt(MetaString::ADVOB_TXT,ot);
sd.components.push_back (Component (Component::RESOURCE, res, resval, 0)); sd.components.push_back (Component (Component::RESOURCE, res, resval, 0));
cb->showBlockingDialog(&sd,boost::bind(&CGVisitableOPH::treeSelected,this,heroID,res,resval,val,_1)); cb->showBlockingDialog(&sd,boost::bind(&CGVisitableOPH::treeSelected,this,heroID,res,resval,val,_1));
} }
@ -2672,13 +2685,10 @@ void CGVisitableOPH::onNAHeroVisit(int heroID, bool alreadyVisited) const
case Obj::LIBRARY_OF_ENLIGHTENMENT: case Obj::LIBRARY_OF_ENLIGHTENMENT:
{ {
const CGHeroInstance *h = cb->getHero(heroID); const CGHeroInstance *h = cb->getHero(heroID);
int txt_id = 66;
if(h->level < 10 - 2*h->getSecSkillLevel(CGHeroInstance::DIPLOMACY)) //not enough level if(h->level < 10 - 2*h->getSecSkillLevel(CGHeroInstance::DIPLOMACY)) //not enough level
{ {
InfoWindow iw; txt_id += 2;
iw.soundID = sound;
iw.player = cb->getOwner(heroID);
iw.text << std::pair<ui8,ui32>(11,68);
cb->showInfoDialog(&iw);
} }
else else
{ {
@ -2687,12 +2697,8 @@ void CGVisitableOPH::onNAHeroVisit(int heroID, bool alreadyVisited) const
cb->changePrimSkill(heroID,1,2); cb->changePrimSkill(heroID,1,2);
cb->changePrimSkill(heroID,2,2); cb->changePrimSkill(heroID,2,2);
cb->changePrimSkill(heroID,3,2); cb->changePrimSkill(heroID,3,2);
InfoWindow iw;
iw.soundID = sound;
iw.player = cb->getOwner(heroID);
iw.text << std::pair<ui8,ui32>(11,66);
cb->showInfoDialog(&iw);
} }
showInfoDialog(h,txt_id,sound);
break; break;
} }
case Obj::SCHOOL_OF_MAGIC: case Obj::SCHOOL_OF_MAGIC:
@ -2701,18 +2707,14 @@ void CGVisitableOPH::onNAHeroVisit(int heroID, bool alreadyVisited) const
int skill = (ID==Obj::SCHOOL_OF_MAGIC ? 2 : 0); int skill = (ID==Obj::SCHOOL_OF_MAGIC ? 2 : 0);
if(cb->getResource(cb->getOwner(heroID),6) < 1000) //not enough resources if(cb->getResource(cb->getOwner(heroID),6) < 1000) //not enough resources
{ {
InfoWindow iw; showInfoDialog(heroID,ot+2,sound);
iw.soundID = sound;
iw.player = cb->getOwner(heroID);
iw.text << std::pair<ui8,ui32>(MetaString::ADVOB_TXT,ot+2);
cb->showInfoDialog(&iw);
} }
else else
{ {
BlockingDialog sd(true,true); BlockingDialog sd(true,true);
sd.soundID = sound; sd.soundID = sound;
sd.player = cb->getOwner(heroID); sd.player = cb->getOwner(heroID);
sd.text << std::pair<ui8,ui32>(11,ot); sd.text.addTxt(MetaString::ADVOB_TXT,ot);
sd.components.push_back(Component(Component::PRIM_SKILL, skill, +1, 0)); sd.components.push_back(Component(Component::PRIM_SKILL, skill, +1, 0));
sd.components.push_back(Component(Component::PRIM_SKILL, skill+1, +1, 0)); sd.components.push_back(Component(Component::PRIM_SKILL, skill+1, +1, 0));
cb->showBlockingDialog(&sd,boost::bind(&CGVisitableOPH::schoolSelected,this,heroID,_1)); cb->showBlockingDialog(&sd,boost::bind(&CGVisitableOPH::schoolSelected,this,heroID,_1));
@ -2724,11 +2726,7 @@ void CGVisitableOPH::onNAHeroVisit(int heroID, bool alreadyVisited) const
else else
{ {
ot++; ot++;
InfoWindow iw; showInfoDialog(heroID,ot,sound);
iw.soundID = sound;
iw.player = cb->getOwner(heroID);
iw.text << std::pair<ui8,ui32>(11,ot);
cb->showInfoDialog(&iw);
} }
} }
@ -2816,7 +2814,7 @@ void COPWBonus::setProperty(ui8 what, ui32 val)
{ {
switch (what) switch (what)
{ {
case 4: case ObjProperty::VISITORS:
visitors.insert(val); visitors.insert(val);
break; break;
case 12: case 12:
@ -2900,7 +2898,7 @@ void CTownBonus::onHeroVisit (const CGHeroInstance * h) const
break; break;
case ETownType::DUNGEON://academy of battle scholars case ETownType::DUNGEON://academy of battle scholars
what = 4; what = 4;
val = 1000*(100+h->getSecSkillLevel(CGHeroInstance::LEARNING)*5)/100.0; val = h->calculateXp(1000);
mid = 583; mid = 583;
iw.components.push_back (Component(Component::EXPERIENCE, 0, val, 0)); iw.components.push_back (Component(Component::EXPERIENCE, 0, val, 0));
break; break;
@ -2934,7 +2932,9 @@ const std::string & CGCreature::getHoverText() const
MetaString ms; MetaString ms;
int pom = stacks.begin()->second->getQuantityID(); int pom = stacks.begin()->second->getQuantityID();
pom = 172 + 3*pom; pom = 172 + 3*pom;
ms << std::pair<ui8,ui32>(6,pom) << " " << std::pair<ui8,ui32>(7,subID); ms.addTxt(MetaString::ARRAY_TXT,pom);
ms << " " ;
ms.addTxt(MetaString::CRE_PL_NAMES,subID);
ms.toString(hoverName); ms.toString(hoverName);
if(const CGHeroInstance *selHero = cb->getSelectedHero(cb->getCurrentPlayer())) if(const CGHeroInstance *selHero = cb->getSelectedHero(cb->getCurrentPlayer()))
@ -2977,7 +2977,7 @@ void CGCreature::onHeroVisit( const CGHeroInstance * h ) const
{ {
BlockingDialog ynd(true,false); BlockingDialog ynd(true,false);
ynd.player = h->tempOwner; ynd.player = h->tempOwner;
ynd.text << std::pair<ui8,ui32>(MetaString::ADVOB_TXT, 86); ynd.text.addTxt(MetaString::ADVOB_TXT, 86);
ynd.text.addReplacement(MetaString::CRE_PL_NAMES, subID); ynd.text.addReplacement(MetaString::CRE_PL_NAMES, subID);
cb->showBlockingDialog(&ynd,boost::bind(&CGCreature::joinDecision,this,h,0,_1)); cb->showBlockingDialog(&ynd,boost::bind(&CGCreature::joinDecision,this,h,0,_1));
break; break;
@ -3210,10 +3210,7 @@ void CGCreature::joinDecision(const CGHeroInstance *h, int cost, ui32 accept) co
} }
else //they fight else //they fight
{ {
InfoWindow iw; showInfoDialog(h,87,0);//Insulted by your refusal of their offer, the monsters attack!
iw.player = h->tempOwner;
iw.text << std::pair<ui8,ui32>(11,87); //Insulted by your refusal of their offer, the monsters attack!
cb->showInfoDialog(&iw);
fight(h); fight(h);
} }
} }
@ -3313,7 +3310,7 @@ void CGCreature::flee( const CGHeroInstance * h ) const
{ {
BlockingDialog ynd(true,false); BlockingDialog ynd(true,false);
ynd.player = h->tempOwner; ynd.player = h->tempOwner;
ynd.text << std::pair<ui8,ui32>(11,91); ynd.text.addTxt(MetaString::ADVOB_TXT,91);
ynd.text.addReplacement(MetaString::CRE_PL_NAMES, subID); ynd.text.addReplacement(MetaString::CRE_PL_NAMES, subID);
cb->showBlockingDialog(&ynd,boost::bind(&CGCreature::fleeDecision,this,h,_1)); cb->showBlockingDialog(&ynd,boost::bind(&CGCreature::fleeDecision,this,h,_1));
} }
@ -3334,7 +3331,7 @@ void CGMine::onHeroVisit( const CGHeroInstance * h ) const
{ {
BlockingDialog ynd(true,false); BlockingDialog ynd(true,false);
ynd.player = h->tempOwner; ynd.player = h->tempOwner;
ynd.text << std::pair<ui8,ui32>(MetaString::ADVOB_TXT, subID == 7 ? 84 : 187); ynd.text.addTxt(MetaString::ADVOB_TXT, subID == 7 ? 84 : 187);
cb->showBlockingDialog(&ynd,boost::bind(&CGMine::fight, this, _1, h)); cb->showBlockingDialog(&ynd,boost::bind(&CGMine::fight, this, _1, h));
return; return;
} }
@ -3401,11 +3398,7 @@ void CGMine::endBattle(BattleResult *result, ui8 attackingPlayer) const
{ {
if(subID == 7) if(subID == 7)
{ {
InfoWindow iw; showInfoDialog(attackingPlayer,85,0);
iw.player = attackingPlayer;
iw.text.addTxt(MetaString::ADVOB_TXT, 85);
cb->showInfoDialog(&iw);
} }
flagMine(attackingPlayer); flagMine(attackingPlayer);
} }
@ -3437,7 +3430,7 @@ ui32 CGMine::defaultResProduction()
{ {
switch(producedResource) switch(producedResource)
{ {
case Res::WOOD: case Res::WOOD:
case Res::ORE: case Res::ORE:
return 2; return 2;
case Res::GOLD: case Res::GOLD:
@ -3504,7 +3497,7 @@ void CGResource::collectRes( int player ) const
ShowInInfobox sii; ShowInInfobox sii;
sii.player = player; sii.player = player;
sii.c = Component(Component::RESOURCE,subID,amount,0); sii.c = Component(Component::RESOURCE,subID,amount,0);
sii.text << std::pair<ui8,ui32>(11,113); sii.text.addTxt(MetaString::ADVOB_TXT,113);
sii.text.addReplacement(MetaString::RES_NAMES, subID); sii.text.addReplacement(MetaString::RES_NAMES, subID);
cb->showCompInfo(&sii); cb->showCompInfo(&sii);
cb->removeObject(id); cb->removeObject(id);
@ -3563,12 +3556,7 @@ void CGVisitableOPW::onHeroVisit( const CGHeroInstance * h ) const
mid++; mid++;
else else
mid--; mid--;
showInfoDialog(h,mid,sound);
InfoWindow iw;
iw.soundID = sound;
iw.player = h->tempOwner;
iw.text << std::pair<ui8,ui32>(11,mid);
cb->showInfoDialog(&iw);
} }
else else
{ {
@ -3607,7 +3595,7 @@ void CGVisitableOPW::onHeroVisit( const CGHeroInstance * h ) const
iw.soundID = sound; iw.soundID = sound;
iw.player = h->tempOwner; iw.player = h->tempOwner;
iw.components.push_back(Component(type,sub,val,0)); iw.components.push_back(Component(type,sub,val,0));
iw.text << std::pair<ui8,ui32>(11,mid); iw.text.addTxt(MetaString::ADVOB_TXT,mid);
cb->showInfoDialog(&iw); cb->showInfoDialog(&iw);
cb->setObjProperty(id, ObjProperty::VISITED, true); cb->setObjProperty(id, ObjProperty::VISITED, true);
MetaString ms; //set text to "visited" MetaString ms; //set text to "visited"
@ -3675,10 +3663,7 @@ void CGTeleport::onHeroVisit( const CGHeroInstance * h ) const
destinationid = getMatchingGate(id); destinationid = getMatchingGate(id);
if(destinationid < 0) //no exit if(destinationid < 0) //no exit
{ {
InfoWindow iw; showInfoDialog(h,153,0);//Just inside the entrance you find a large pile of rubble blocking the tunnel. You leave discouraged.
iw.player = h->tempOwner;
iw.text.addTxt(MetaString::ADVOB_TXT, 153);//Just inside the entrance you find a large pile of rubble blocking the tunnel. You leave discouraged.
cb->sendAndApply(&iw);
} }
break; break;
} }
@ -3960,7 +3945,7 @@ void CGPickable::onHeroVisit( const CGHeroInstance * h ) const
iw.player = h->tempOwner; iw.player = h->tempOwner;
iw.components.push_back(Component(Component::RESOURCE,Res::GOLD,val1,0)); iw.components.push_back(Component(Component::RESOURCE,Res::GOLD,val1,0));
iw.components.push_back(Component(Component::RESOURCE,type,val2,0)); iw.components.push_back(Component(Component::RESOURCE,type,val2,0));
iw.text << std::pair<ui8,ui32>(11,23); iw.text.addTxt(MetaString::ADVOB_TXT,23);
cb->showInfoDialog(&iw); cb->showInfoDialog(&iw);
break; break;
} }
@ -4030,7 +4015,7 @@ void CGPickable::onHeroVisit( const CGHeroInstance * h ) const
iw.soundID = soundBase::treasure; iw.soundID = soundBase::treasure;
iw.player = h->tempOwner; iw.player = h->tempOwner;
iw.components.push_back(Component(Component::ARTIFACT,val1,1,0)); iw.components.push_back(Component(Component::ARTIFACT,val1,1,0));
iw.text << std::pair<ui8,ui32>(11,145); iw.text.addTxt(MetaString::ADVOB_TXT,145);
iw.text.addReplacement(MetaString::ART_NAMES, val1); iw.text.addReplacement(MetaString::ART_NAMES, val1);
cb->showInfoDialog(&iw); cb->showInfoDialog(&iw);
break; break;
@ -4039,7 +4024,7 @@ void CGPickable::onHeroVisit( const CGHeroInstance * h ) const
{ {
BlockingDialog sd(false,true); BlockingDialog sd(false,true);
sd.player = h->tempOwner; sd.player = h->tempOwner;
sd.text << std::pair<ui8,ui32>(11,146); sd.text.addTxt(MetaString::ADVOB_TXT,146);
sd.components.push_back(Component(Component::RESOURCE,Res::GOLD,val1,0)); sd.components.push_back(Component(Component::RESOURCE,Res::GOLD,val1,0));
TExpType expVal = h->calculateXp(val2); TExpType expVal = h->calculateXp(val2);
sd.components.push_back(Component(Component::EXPERIENCE,0,expVal, 0)); sd.components.push_back(Component(Component::EXPERIENCE,0,expVal, 0));
@ -4771,18 +4756,18 @@ void CGWitchHut::onHeroVisit( const CGHeroInstance * h ) const
if(h->getSecSkillLevel(static_cast<CGHeroInstance::SecondarySkill>(ability))) //you alredy know this skill if(h->getSecSkillLevel(static_cast<CGHeroInstance::SecondarySkill>(ability))) //you alredy know this skill
{ {
iw.text << std::pair<ui8,ui32>(11,172); iw.text.addTxt(MetaString::ADVOB_TXT,172);
iw.text.addReplacement(MetaString::SEC_SKILL_NAME, ability); iw.text.addReplacement(MetaString::SEC_SKILL_NAME, ability);
} }
else if(!h->canLearnSkill()) //already all skills slots used else if(!h->canLearnSkill()) //already all skills slots used
{ {
iw.text << std::pair<ui8,ui32>(11,173); iw.text.addTxt(MetaString::ADVOB_TXT,173);
iw.text.addReplacement(MetaString::SEC_SKILL_NAME, ability); iw.text.addReplacement(MetaString::SEC_SKILL_NAME, ability);
} }
else //give sec skill else //give sec skill
{ {
iw.components.push_back(Component(Component::SEC_SKILL, ability, 1, 0)); iw.components.push_back(Component(Component::SEC_SKILL, ability, 1, 0));
iw.text << std::pair<ui8,ui32>(11,171); iw.text.addTxt(MetaString::ADVOB_TXT,171);
iw.text.addReplacement(MetaString::SEC_SKILL_NAME, ability); iw.text.addReplacement(MetaString::SEC_SKILL_NAME, ability);
cb->changeSecSkill(h->id,ability,1,true); cb->changeSecSkill(h->id,ability,1,true);
} }
@ -4990,7 +4975,7 @@ void CGBonusingObject::onHeroVisit( const CGHeroInstance * h ) const
} }
} }
iw.soundID = sound; iw.soundID = sound;
iw.text << std::pair<ui8,ui32>(11,messageID); iw.text.addTxt(MetaString::ADVOB_TXT,messageID);
cb->showInfoDialog(&iw); cb->showInfoDialog(&iw);
} }
@ -5019,9 +5004,7 @@ void CGBonusingObject::initObj()
void CGMagicSpring::onHeroVisit(const CGHeroInstance * h) const void CGMagicSpring::onHeroVisit(const CGHeroInstance * h) const
{ {
int messageID; int messageID;
InfoWindow iw;
iw.player = h->tempOwner;
iw.soundID = soundBase::GENIE;
if (!visited) if (!visited)
{ {
if (h->mana > h->manaLimit()) if (h->mana > h->manaLimit())
@ -5035,8 +5018,7 @@ void CGMagicSpring::onHeroVisit(const CGHeroInstance * h) const
} }
else else
messageID = 75; messageID = 75;
iw.text << std::pair<ui8,ui32>(11,messageID); showInfoDialog(h,messageID,soundBase::GENIE);
cb->showInfoDialog(&iw);
} }
const std::string & CGMagicSpring::getHoverText() const const std::string & CGMagicSpring::getHoverText() const
@ -5052,12 +5034,10 @@ const std::string & CGMagicSpring::getHoverText() const
void CGMagicWell::onHeroVisit( const CGHeroInstance * h ) const void CGMagicWell::onHeroVisit( const CGHeroInstance * h ) const
{ {
int message; int message;
InfoWindow iw;
iw.soundID = soundBase::faerie;
iw.player = h->tempOwner;
if(h->hasBonusFrom(Bonus::OBJECT,ID)) //has already visited Well today if(h->hasBonusFrom(Bonus::OBJECT,ID)) //has already visited Well today
{ {
message = 78; message = 78;//"A second drink at the well in one day will not help you."
} }
else if(h->mana < h->manaLimit()) else if(h->mana < h->manaLimit())
{ {
@ -5069,8 +5049,7 @@ void CGMagicWell::onHeroVisit( const CGHeroInstance * h ) const
{ {
message = 79; message = 79;
} }
iw.text << std::pair<ui8,ui32>(11,message); //"A second drink at the well in one day will not help you." showInfoDialog(h,message,soundBase::faerie);
cb->showInfoDialog(&iw);
} }
const std::string & CGMagicWell::getHoverText() const const std::string & CGMagicWell::getHoverText() const
@ -5099,10 +5078,7 @@ void CGPandoraBox::open( const CGHeroInstance * h, ui32 accept ) const
{ {
if (stacksCount() > 0) //if pandora's box is protected by army if (stacksCount() > 0) //if pandora's box is protected by army
{ {
InfoWindow iw; showInfoDialog(h,16,0);
iw.player = h->tempOwner;
iw.text.addTxt(MetaString::ADVOB_TXT, 16);
cb->showInfoDialog(&iw);
cb->startBattleI(h, this, boost::bind(&CGPandoraBox::endBattle, this, h, _1)); //grants things after battle cb->startBattleI(h, this, boost::bind(&CGPandoraBox::endBattle, this, h, _1)); //grants things after battle
} }
else if (message.size() == 0 && resources.size() == 0 else if (message.size() == 0 && resources.size() == 0
@ -5111,11 +5087,8 @@ void CGPandoraBox::open( const CGHeroInstance * h, ui32 accept ) const
&& spells.size() == 0 && creatures.Slots().size() > 0 && spells.size() == 0 && creatures.Slots().size() > 0
&& gainedExp == 0 && manaDiff == 0 && moraleDiff == 0 && luckDiff == 0) //if it gives nothing without battle && gainedExp == 0 && manaDiff == 0 && moraleDiff == 0 && luckDiff == 0) //if it gives nothing without battle
{ {
InfoWindow iw; showInfoDialog(h,15,0);
iw.player = h->tempOwner; cb->removeObject(id);
iw.text.addTxt(MetaString::ADVOB_TXT, 15);
cb->showInfoDialog(&iw);
} }
else //if it gives something without battle else //if it gives something without battle
{ {
@ -6309,17 +6282,15 @@ bool CGKeymasterTent::wasVisited (ui8 player) const
void CGKeymasterTent::onHeroVisit( const CGHeroInstance * h ) const void CGKeymasterTent::onHeroVisit( const CGHeroInstance * h ) const
{ {
InfoWindow iw; int txt_id;
iw.soundID = soundBase::CAVEHEAD;
iw.player = h->getOwner();
if (!wasMyColorVisited (h->getOwner()) ) if (!wasMyColorVisited (h->getOwner()) )
{ {
cb->setObjProperty(id, h->tempOwner+101, subID); cb->setObjProperty(id, h->tempOwner+101, subID);
iw.text << std::pair<ui8,ui32>(11,19); txt_id=19;
} }
else else
iw.text << std::pair<ui8,ui32>(11,20); txt_id=20;
cb->showInfoDialog(&iw); showInfoDialog(h,txt_id,soundBase::CAVEHEAD);
} }
void CGBorderGuard::initObj() void CGBorderGuard::initObj()
@ -6366,11 +6337,7 @@ void CGBorderGuard::onHeroVisit( const CGHeroInstance * h ) const
} }
else else
{ {
InfoWindow iw; showInfoDialog(h,18,soundBase::CAVEHEAD);
iw.player = h->getOwner();
iw.soundID = soundBase::CAVEHEAD;
iw.text << std::pair<ui8,ui32>(11,18);
cb->showInfoDialog (&iw);
AddQuest aq; AddQuest aq;
aq.quest = QuestInfo (quest, this, visitablePos()); aq.quest = QuestInfo (quest, this, visitablePos());
@ -6390,10 +6357,7 @@ void CGBorderGate::onHeroVisit( const CGHeroInstance * h ) const //TODO: passabi
{ {
if (!wasMyColorVisited (h->getOwner()) ) if (!wasMyColorVisited (h->getOwner()) )
{ {
InfoWindow iw; showInfoDialog(h,18,0);
iw.player = h->getOwner();
iw.text << std::pair<ui8,ui32>(11,18);
cb->showInfoDialog(&iw);
AddQuest aq; AddQuest aq;
aq.quest = QuestInfo (quest, this, visitablePos()); aq.quest = QuestInfo (quest, this, visitablePos());
@ -6422,15 +6386,11 @@ void CGMagi::onHeroVisit(const CGHeroInstance * h) const
{ {
if (ID == Obj::HUT_OF_MAGI) if (ID == Obj::HUT_OF_MAGI)
{ {
InfoWindow iw;
CenterView cv; CenterView cv;
FoWChange fw; FoWChange fw;
cv.player = iw.player = fw.player = h->tempOwner; cv.player = fw.player = h->tempOwner;
iw.soundID = soundBase::LIGHTHOUSE; showInfoDialog(h,61,soundBase::LIGHTHOUSE);
iw.player = h->tempOwner;
iw.text.addTxt (MetaString::ADVOB_TXT, 61);
cb->showInfoDialog(&iw);
fw.mode = 1; fw.mode = 1;
std::vector<si32>::iterator it; std::vector<si32>::iterator it;
@ -6449,10 +6409,7 @@ void CGMagi::onHeroVisit(const CGHeroInstance * h) const
} }
else if (ID == Obj::EYE_OF_MAGI) else if (ID == Obj::EYE_OF_MAGI)
{ {
InfoWindow iw; showInfoDialog(h,48,soundBase::invalid);
iw.player = h->tempOwner;
iw.text.addTxt (MetaString::ADVOB_TXT, 48);
cb->showInfoDialog(&iw);
} }
} }
@ -6479,7 +6436,7 @@ void CGSirens::onHeroVisit( const CGHeroInstance * h ) const
iw.player = h->tempOwner; iw.player = h->tempOwner;
if(h->hasBonusFrom(Bonus::OBJECT,ID)) //has already visited Sirens if(h->hasBonusFrom(Bonus::OBJECT,ID)) //has already visited Sirens
{ {
iw.text.addTxt(11,133); iw.text.addTxt(MetaString::ADVOB_TXT,133);
} }
else else
{ {
@ -6499,13 +6456,13 @@ void CGSirens::onHeroVisit( const CGHeroInstance * h ) const
if(xp) if(xp)
{ {
xp = h->calculateXp(xp); xp = h->calculateXp(xp);
iw.text.addTxt(11,132); iw.text.addTxt(MetaString::ADVOB_TXT,132);
iw.text.addReplacement(xp); iw.text.addReplacement(xp);
cb->changePrimSkill(h->id, 4, xp, false); cb->changePrimSkill(h->id, 4, xp, false);
} }
else else
{ {
iw.text.addTxt(11,134); iw.text.addTxt(MetaString::ADVOB_TXT,134);
} }
} }
cb->showInfoDialog(&iw); cb->showInfoDialog(&iw);
@ -6655,11 +6612,7 @@ void CGShipyard::onHeroVisit( const CGHeroInstance * h ) const
} }
else else
{ {
OpenWindow ow; openWindow(OpenWindow::SHIPYARD_WINDOW,id,h->id);
ow.id1 = id;
ow.id2 = h->id;
ow.window = OpenWindow::SHIPYARD_WINDOW;
cb->sendAndApply(&ow);
} }
} }
@ -6694,20 +6647,12 @@ void CCartographer::onHeroVisit( const CGHeroInstance * h ) const
} }
else //if he cannot afford else //if he cannot afford
{ {
InfoWindow iw; showInfoDialog(h,28,soundBase::CAVEHEAD);
iw.player = h->getOwner();
iw.soundID = soundBase::CAVEHEAD;
iw.text << std::pair<ui8,ui32>(11,28);
cb->showInfoDialog (&iw);
} }
} }
else //if he already visited carographer else //if he already visited carographer
{ {
InfoWindow iw; showInfoDialog(h,24,soundBase::CAVEHEAD);
iw.player = h->getOwner();
iw.soundID = soundBase::CAVEHEAD;
iw.text << std::pair<ui8,ui32>(11,24);
cb->showInfoDialog (&iw);
} }
} }
@ -6748,10 +6693,7 @@ void CGObelisk::onHeroVisit( const CGHeroInstance * h ) const
cb->setObjProperty(id,20,team); //increment general visited obelisks counter cb->setObjProperty(id,20,team); //increment general visited obelisks counter
OpenWindow ow; openWindow(OpenWindow::PUZZLE_MAP,h->tempOwner);
ow.id1 = h->tempOwner;
ow.window = OpenWindow::PUZZLE_MAP;
cb->sendAndApply(&ow);
cb->setObjProperty(id,10,team); //mark that particular obelisk as visited cb->setObjProperty(id,10,team); //mark that particular obelisk as visited
} }
@ -6803,14 +6745,7 @@ void CGLighthouse::onHeroVisit( const CGHeroInstance * h ) const
{ {
ui8 oldOwner = tempOwner; ui8 oldOwner = tempOwner;
cb->setOwner(id,h->tempOwner); //not ours? flag it! cb->setOwner(id,h->tempOwner); //not ours? flag it!
showInfoDialog(h,69,soundBase::LIGHTHOUSE);
InfoWindow iw;
iw.player = h->tempOwner;
iw.text.addTxt(MetaString::ADVOB_TXT, 69);
iw.soundID = soundBase::LIGHTHOUSE;
cb->sendAndApply(&iw);
giveBonusTo(h->tempOwner); giveBonusTo(h->tempOwner);
if(oldOwner < GameConstants::PLAYER_LIMIT) //remove bonus from old owner if(oldOwner < GameConstants::PLAYER_LIMIT) //remove bonus from old owner
@ -7141,11 +7076,7 @@ std::vector<EMarketMode::EMarketMode> IMarket::availableModes() const
void CGMarket::onHeroVisit(const CGHeroInstance * h) const void CGMarket::onHeroVisit(const CGHeroInstance * h) const
{ {
OpenWindow ow; openWindow(OpenWindow::MARKET_WINDOW,id,h->id);
ow.id1 = id;
ow.id2 = h->id;
ow.window = OpenWindow::MARKET_WINDOW;
cb->sendAndApply(&ow);
} }
int CGMarket::getMarketEfficiency() const int CGMarket::getMarketEfficiency() const
@ -7270,11 +7201,7 @@ std::vector<int> CGUniversity::availableItemsIds(EMarketMode::EMarketMode mode)
void CGUniversity::onHeroVisit(const CGHeroInstance * h) const void CGUniversity::onHeroVisit(const CGHeroInstance * h) const
{ {
OpenWindow ow; openWindow(OpenWindow::UNIVERSITY_WINDOW,id,h->id);
ow.id1 = id;
ow.id2 = h->id;
ow.window = OpenWindow::UNIVERSITY_WINDOW;
cb->sendAndApply(&ow);
} }
GrowthInfo::Entry::Entry(const std::string &format, int _count) GrowthInfo::Entry::Entry(const std::string &format, int _count)

88
lib/CObjectHandler.h
View File

@ -68,7 +68,7 @@ public:
//following field are used only for kill creature/hero missions, the original objects became inaccessible after their removal, so we need to store info needed for messages / hover text //following field are used only for kill creature/hero missions, the original objects became inaccessible after their removal, so we need to store info needed for messages / hover text
ui8 textOption; ui8 textOption;
CStackBasicDescriptor stackToKill; CStackBasicDescriptor stackToKill;
ui8 stackDirection; ui8 stackDirection;
std::string heroName; //backup of hero name std::string heroName; //backup of hero name
si32 heroPortrait; si32 heroPortrait;
@ -131,7 +131,7 @@ public:
enum EGeneratorState {GOOD, BOAT_ALREADY_BUILT, TILE_BLOCKED, NO_WATER}; enum EGeneratorState {GOOD, BOAT_ALREADY_BUILT, TILE_BLOCKED, NO_WATER};
EGeneratorState state() const; //0 - can buid, 1 - there is already a boat at dest tile, 2 - dest tile is blocked, 3 - no water EGeneratorState state() const; //0 - can buid, 1 - there is already a boat at dest tile, 2 - dest tile is blocked, 3 - no water
void getProblemText(MetaString &out, const CGHeroInstance *visitor = NULL) const; void getProblemText(MetaString &out, const CGHeroInstance *visitor = NULL) const;
}; };
class DLL_LINKAGE IShipyard : public IBoatGenerator class DLL_LINKAGE IShipyard : public IBoatGenerator
@ -155,7 +155,7 @@ public:
virtual int availableUnits(EMarketMode::EMarketMode mode, int marketItemSerial) const; //-1 if unlimited virtual int availableUnits(EMarketMode::EMarketMode mode, int marketItemSerial) const; //-1 if unlimited
virtual std::vector<int> availableItemsIds(EMarketMode::EMarketMode mode) const; virtual std::vector<int> availableItemsIds(EMarketMode::EMarketMode mode) const;
bool getOffer(int id1, int id2, int &val1, int &val2, EMarketMode::EMarketMode mode) const; //val1 - how many units of id1 player has to give to receive val2 units bool getOffer(int id1, int id2, int &val1, int &val2, EMarketMode::EMarketMode mode) const; //val1 - how many units of id1 player has to give to receive val2 units
std::vector<EMarketMode::EMarketMode> availableModes() const; std::vector<EMarketMode::EMarketMode> availableModes() const;
static const IMarket *castFrom(const CGObjectInstance *obj, bool verbose = true); static const IMarket *castFrom(const CGObjectInstance *obj, bool verbose = true);
@ -170,7 +170,7 @@ public:
mutable std::string hoverName; mutable std::string hoverName;
int3 pos; //h3m pos int3 pos; //h3m pos
si32 ID, subID; //normal ID (this one from OH3 maps ;]) - eg. town=98; hero=34 si32 ID, subID; //normal ID (this one from OH3 maps ;]) - eg. town=98; hero=34
si32 id;//number of object in CObjectHandler's vector si32 id;//number of object in CObjectHandler's vector
CGDefInfo * defInfo; CGDefInfo * defInfo;
ui8 animPhaseShift; ui8 animPhaseShift;
@ -303,11 +303,11 @@ public:
std::vector<std::pair<ui8,ui8> > secSkills; //first - ID of skill, second - level of skill (1 - basic, 2 - adv., 3 - expert); if hero has ability (-1, -1) it meansthat it should have default secondary abilities std::vector<std::pair<ui8,ui8> > secSkills; //first - ID of skill, second - level of skill (1 - basic, 2 - adv., 3 - expert); if hero has ability (-1, -1) it meansthat it should have default secondary abilities
ui32 movement; //remaining movement points ui32 movement; //remaining movement points
ui8 sex; ui8 sex;
ui8 inTownGarrison; // if hero is in town garrison ui8 inTownGarrison; // if hero is in town garrison
ConstTransitivePtr<CGTownInstance> visitedTown; //set if hero is visiting town or in the town garrison ConstTransitivePtr<CGTownInstance> visitedTown; //set if hero is visiting town or in the town garrison
ConstTransitivePtr<CCommanderInstance> commander; ConstTransitivePtr<CCommanderInstance> commander;
const CGBoat *boat; //set to CGBoat when sailing const CGBoat *boat; //set to CGBoat when sailing
//std::vector<const CArtifact*> artifacts; //hero's artifacts from bag //std::vector<const CArtifact*> artifacts; //hero's artifacts from bag
//std::map<ui16, const CArtifact*> artifWorn; //map<position,artifact_id>; positions: 0 - head; 1 - shoulders; 2 - neck; 3 - right hand; 4 - left hand; 5 - torso; 6 - right ring; 7 - left ring; 8 - feet; 9 - misc1; 10 - misc2; 11 - misc3; 12 - misc4; 13 - mach1; 14 - mach2; 15 - mach3; 16 - mach4; 17 - spellbook; 18 - misc5 //std::map<ui16, const CArtifact*> artifWorn; //map<position,artifact_id>; positions: 0 - head; 1 - shoulders; 2 - neck; 3 - right hand; 4 - left hand; 5 - torso; 6 - right ring; 7 - left ring; 8 - feet; 9 - misc1; 10 - misc2; 11 - misc3; 12 - misc4; 13 - mach1; 14 - mach2; 15 - mach3; 16 - mach4; 17 - spellbook; 18 - misc5
@ -362,7 +362,7 @@ public:
void getOutOffsets(std::vector<int3> &offsets) const; //offsets to obj pos when we boat can be placed void getOutOffsets(std::vector<int3> &offsets) const; //offsets to obj pos when we boat can be placed
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
bool hasSpellbook() const; bool hasSpellbook() const;
EAlignment::EAlignment getAlignment() const; EAlignment::EAlignment getAlignment() const;
const std::string &getBiography() const; const std::string &getBiography() const;
@ -378,9 +378,9 @@ public:
ui8 getSecSkillLevel(SecondarySkill skill) const; //0 - no skill ui8 getSecSkillLevel(SecondarySkill skill) const; //0 - no skill
void setSecSkillLevel(SecondarySkill which, int val, bool abs);// abs == 0 - changes by value; 1 - sets to value void setSecSkillLevel(SecondarySkill which, int val, bool abs);// abs == 0 - changes by value; 1 - sets to value
bool canLearnSkill() const; ///true if hero has free secondary skill slot bool canLearnSkill() const; ///true if hero has free secondary skill slot
int maxMovePoints(bool onLand) const; int maxMovePoints(bool onLand) const;
int movementPointsAfterEmbark(int MPsBefore, int basicCost, bool disembark = false) const; int movementPointsAfterEmbark(int MPsBefore, int basicCost, bool disembark = false) const;
// const CArtifact* getArtAtPos(ui16 pos) const; //NULL - no artifact // const CArtifact* getArtAtPos(ui16 pos) const; //NULL - no artifact
// const CArtifact * getArt(int pos) const; // const CArtifact * getArt(int pos) const;
@ -396,12 +396,12 @@ public:
bool canCastThisSpell(const CSpell * spell) const; //determines if this hero can cast given spell; takes into account existing spell in spellbook, existing spellbook and artifact bonuses bool canCastThisSpell(const CSpell * spell) const; //determines if this hero can cast given spell; takes into account existing spell in spellbook, existing spellbook and artifact bonuses
CStackBasicDescriptor calculateNecromancy (const BattleResult &battleResult) const; CStackBasicDescriptor calculateNecromancy (const BattleResult &battleResult) const;
void showNecromancyDialog(const CStackBasicDescriptor &raisedStack) const; void showNecromancyDialog(const CStackBasicDescriptor &raisedStack) const;
ECanDig diggingStatus() const; //0 - can dig; 1 - lack of movement; 2 - ECanDig diggingStatus() const; //0 - can dig; 1 - lack of movement; 2 -
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
void initHero(); void initHero();
void initHero(int SUBID); void initHero(int SUBID);
void putArtifact(ui16 pos, CArtifactInstance *art); void putArtifact(ui16 pos, CArtifactInstance *art);
void putInBackpack(CArtifactInstance *art); void putInBackpack(CArtifactInstance *art);
@ -706,7 +706,7 @@ public:
h & static_cast<CGPandoraBox &>(*this); h & static_cast<CGPandoraBox &>(*this);
h & removeAfterVisit & availableFor & computerActivate & humanActivate; h & removeAfterVisit & availableFor & computerActivate & humanActivate;
} }
void onHeroVisit(const CGHeroInstance * h) const; void onHeroVisit(const CGHeroInstance * h) const;
void activated(const CGHeroInstance * h) const; void activated(const CGHeroInstance * h) const;
@ -751,7 +751,7 @@ public:
h & static_cast<CArmedInstance&>(*this); h & static_cast<CArmedInstance&>(*this);
h & identifier & character & message & resources & gainedArtifact & neverFlees & notGrowingTeam & temppower & restore; h & identifier & character & message & resources & gainedArtifact & neverFlees & notGrowingTeam & temppower & restore;
} }
}; };
class DLL_LINKAGE CGSignBottle : public CGObjectInstance //signs and ocean bottles class DLL_LINKAGE CGSignBottle : public CGObjectInstance //signs and ocean bottles
@ -821,7 +821,7 @@ public:
CGQuestGuard() : CGSeerHut(){}; CGQuestGuard() : CGSeerHut(){};
void initObj(); void initObj();
void completeQuest (const CGHeroInstance * h) const; void completeQuest (const CGHeroInstance * h) const;
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
h & static_cast<CGSeerHut&>(*this); h & static_cast<CGSeerHut&>(*this);
@ -851,7 +851,7 @@ public:
ui8 bonusType; //255 - random, 0 - primary skill, 1 - secondary skill, 2 - spell ui8 bonusType; //255 - random, 0 - primary skill, 1 - secondary skill, 2 - spell
ui16 bonusID; //ID of skill/spell ui16 bonusID; //ID of skill/spell
void giveAnyBonus(const CGHeroInstance * h) const; void giveAnyBonus(const CGHeroInstance * h) const; //FIXME: unused?
void onHeroVisit(const CGHeroInstance * h) const; void onHeroVisit(const CGHeroInstance * h) const;
void initObj(); void initObj();
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
@ -887,7 +887,7 @@ public:
void fightForArt(ui32 agreed, const CGHeroInstance *h) const; void fightForArt(ui32 agreed, const CGHeroInstance *h) const;
void endBattle(BattleResult *result, const CGHeroInstance *h) const; void endBattle(BattleResult *result, const CGHeroInstance *h) const;
void pick( const CGHeroInstance * h ) const; void pick( const CGHeroInstance * h ) const;
void initObj(); void initObj();
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
@ -948,19 +948,19 @@ public:
class DLL_LINKAGE CGMine : public CArmedInstance class DLL_LINKAGE CGMine : public CArmedInstance
{ {
public: public:
ui8 producedResource; ui8 producedResource;
ui32 producedQuantity; ui32 producedQuantity;
void offerLeavingGuards(const CGHeroInstance *h) const; void offerLeavingGuards(const CGHeroInstance *h) const;
void endBattle(BattleResult *result, ui8 attackingPlayer) const; void endBattle(BattleResult *result, ui8 attackingPlayer) const;
void fight(ui32 agreed, const CGHeroInstance *h) const; void fight(ui32 agreed, const CGHeroInstance *h) const;
void onHeroVisit(const CGHeroInstance * h) const; void onHeroVisit(const CGHeroInstance * h) const;
void flagMine(ui8 player) const; void flagMine(ui8 player) const;
void newTurn() const; void newTurn() const;
void initObj(); void initObj();
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
h & static_cast<CArmedInstance&>(*this); h & static_cast<CArmedInstance&>(*this);
@ -992,7 +992,7 @@ public:
static std::map<int,std::map<int, std::vector<int> > > objs; //teleports: map[ID][subID] => vector of ids static std::map<int,std::map<int, std::vector<int> > > objs; //teleports: map[ID][subID] => vector of ids
static std::vector<std::pair<int, int> > gates; //subterranean gates: pairs of ids static std::vector<std::pair<int, int> > gates; //subterranean gates: pairs of ids
void onHeroVisit(const CGHeroInstance * h) const; void onHeroVisit(const CGHeroInstance * h) const;
void initObj(); void initObj();
static void postInit(); static void postInit();
static int getMatchingGate(int id); //receives id of one subterranean gate and returns id of the paired one, -1 if none static int getMatchingGate(int id); //receives id of one subterranean gate and returns id of the paired one, -1 if none
@ -1008,7 +1008,7 @@ public:
bool wasVisited (const CGHeroInstance * h) const; bool wasVisited (const CGHeroInstance * h) const;
void onHeroVisit(const CGHeroInstance * h) const; void onHeroVisit(const CGHeroInstance * h) const;
const std::string & getHoverText() const; const std::string & getHoverText() const;
void initObj(); void initObj();
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
@ -1016,18 +1016,18 @@ public:
} }
}; };
class DLL_LINKAGE CGMagicSpring : public CGVisitableOPW class DLL_LINKAGE CGMagicSpring : public CGVisitableOPW
{///unfortunatelly, this one is quite different than others {///unfortunatelly, this one is quite different than others
public: public:
void onHeroVisit(const CGHeroInstance * h) const; void onHeroVisit(const CGHeroInstance * h) const;
const std::string & getHoverText() const; const std::string & getHoverText() const;
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
h & static_cast<CGObjectInstance&>(*this); h & static_cast<CGObjectInstance&>(*this);
h & visited; h & visited;
} }
}; };
class DLL_LINKAGE CGMagicWell : public CGObjectInstance //objects giving bonuses to luck/morale/movement class DLL_LINKAGE CGMagicWell : public CGObjectInstance //objects giving bonuses to luck/morale/movement
{ {
@ -1046,7 +1046,7 @@ class DLL_LINKAGE CGSirens : public CGObjectInstance
public: public:
void onHeroVisit(const CGHeroInstance * h) const; void onHeroVisit(const CGHeroInstance * h) const;
const std::string & getHoverText() const; const std::string & getHoverText() const;
void initObj(); void initObj();
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
@ -1067,7 +1067,7 @@ public:
class DLL_LINKAGE CGKeys : public CGObjectInstance //Base class for Keymaster and guards class DLL_LINKAGE CGKeys : public CGObjectInstance //Base class for Keymaster and guards
{ {
public: public:
static std::map <ui8, std::set <ui8> > playerKeyMap; //[players][keysowned] static std::map <ui8, std::set <ui8> > playerKeyMap; //[players][keysowned]
//SubID 0 - lightblue, 1 - green, 2 - red, 3 - darkblue, 4 - brown, 5 - purple, 6 - white, 7 - black //SubID 0 - lightblue, 1 - green, 2 - red, 3 - darkblue, 4 - brown, 5 - purple, 6 - white, 7 - black
@ -1127,13 +1127,13 @@ public:
} }
}; };
class DLL_LINKAGE CGBoat : public CGObjectInstance class DLL_LINKAGE CGBoat : public CGObjectInstance
{ {
public: public:
ui8 direction; ui8 direction;
const CGHeroInstance *hero; //hero on board const CGHeroInstance *hero; //hero on board
void initObj(); void initObj();
CGBoat() CGBoat()
{ {
@ -1156,7 +1156,7 @@ public:
void onHeroVisit(const CGHeroInstance * h) const; void onHeroVisit(const CGHeroInstance * h) const;
const std::string & getHoverText() const; const std::string & getHoverText() const;
void initObj(); void initObj();
void searchTomb(const CGHeroInstance *h, ui32 accept) const; void searchTomb(const CGHeroInstance *h, ui32 accept) const;
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
@ -1236,7 +1236,7 @@ public:
class DLL_LINKAGE CCartographer : public CPlayersVisited class DLL_LINKAGE CCartographer : public CPlayersVisited
{ {
///behaviour varies depending on surface and floor ///behaviour varies depending on surface and floor
public: public:
void onHeroVisit( const CGHeroInstance * h ) const; void onHeroVisit( const CGHeroInstance * h ) const;
void buyMap (const CGHeroInstance *h, ui32 accept) const; void buyMap (const CGHeroInstance *h, ui32 accept) const;
@ -1288,12 +1288,12 @@ class DLL_LINKAGE CGMarket : public CGObjectInstance, public IMarket
public: public:
CGMarket(); CGMarket();
void onHeroVisit(const CGHeroInstance * h) const; //open trading window void onHeroVisit(const CGHeroInstance * h) const; //open trading window
int getMarketEfficiency() const; int getMarketEfficiency() const;
bool allowsTrade(EMarketMode::EMarketMode mode) const; bool allowsTrade(EMarketMode::EMarketMode mode) const;
int availableUnits(EMarketMode::EMarketMode mode, int marketItemSerial) const; //-1 if unlimited int availableUnits(EMarketMode::EMarketMode mode, int marketItemSerial) const; //-1 if unlimited
std::vector<int> availableItemsIds(EMarketMode::EMarketMode mode) const; std::vector<int> availableItemsIds(EMarketMode::EMarketMode mode) const;
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
h & static_cast<CGObjectInstance&>(*this); h & static_cast<CGObjectInstance&>(*this);
@ -1307,7 +1307,7 @@ public:
void newTurn() const; //reset artifacts for black market every month void newTurn() const; //reset artifacts for black market every month
std::vector<int> availableItemsIds(EMarketMode::EMarketMode mode) const; std::vector<int> availableItemsIds(EMarketMode::EMarketMode mode) const;
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
h & static_cast<CGMarket&>(*this); h & static_cast<CGMarket&>(*this);
@ -1319,11 +1319,11 @@ class DLL_LINKAGE CGUniversity : public CGMarket
{ {
public: public:
std::vector<int> skills; //available skills std::vector<int> skills; //available skills
std::vector<int> availableItemsIds(EMarketMode::EMarketMode mode) const; std::vector<int> availableItemsIds(EMarketMode::EMarketMode mode) const;
void initObj();//set skills for trade void initObj();//set skills for trade
void onHeroVisit(const CGHeroInstance * h) const; //open window void onHeroVisit(const CGHeroInstance * h) const; //open window
template <typename Handler> void serialize(Handler &h, const int version) template <typename Handler> void serialize(Handler &h, const int version)
{ {
h & static_cast<CGMarket&>(*this); h & static_cast<CGMarket&>(*this);

4
server/CVCMIServer.cpp
View File

@ -1,5 +1,9 @@
#include "StdInc.h" #include "StdInc.h"
#include <boost/asio.hpp>
#include <boost/interprocess/mapped_region.hpp>
#include <boost/interprocess/shared_memory_object.hpp>
#include "../lib/Filesystem/CResourceLoader.h" #include "../lib/Filesystem/CResourceLoader.h"
#include "../lib/Mapping/CCampaignHandler.h" #include "../lib/Mapping/CCampaignHandler.h"
#include "../lib/CThreadHelper.h" #include "../lib/CThreadHelper.h"

6
server/StdInc.h
View File

@ -4,11 +4,11 @@
#include <boost/crc.hpp> #include <boost/crc.hpp>
#include <boost/date_time/posix_time/posix_time_types.hpp> //no i/o just types #include <boost/date_time/posix_time/posix_time_types.hpp> //no i/o just types
#include <boost/interprocess/mapped_region.hpp> //#include <boost/interprocess/mapped_region.hpp>
#include <boost/interprocess/shared_memory_object.hpp> //#include <boost/interprocess/shared_memory_object.hpp>
#include <boost/random/linear_congruential.hpp> #include <boost/random/linear_congruential.hpp>
#include <boost/random/mersenne_twister.hpp> #include <boost/random/mersenne_twister.hpp>
#include <boost/random/poisson_distribution.hpp> #include <boost/random/poisson_distribution.hpp>
#include <boost/random/variate_generator.hpp> #include <boost/random/variate_generator.hpp>
#include <boost/system/system_error.hpp> #include <boost/system/system_error.hpp>
#include <boost/asio.hpp> //#include <boost/asio.hpp>