games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

- fixed #793 and #865

Browse Source 
- fixed #866 but may result in performance decrease
- (deb) removed vcmi-doc package
This commit is contained in:
Ivan Savenko 2012-02-21 14:08:42 +00:00
parent 324b11b09c
commit 354b9e7fb3
9 changed files with 68 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/BattleInterface/CBattleInterface.cpp
View File

@ -1756,7 +1756,7 @@ void CBattleInterface::hexLclicked(int whichOne)
{
//checking destination
bool allowCasting = true;
bool onlyAlive = vstd::contains(CGI->spellh->risingSpells, spellToCast->additionalInfo); //when casting resurrection or animate dead we should be allow to select dead stack
//bool onlyAlive = vstd::contains(CGI->spellh->risingSpells, spellToCast->additionalInfo); //when casting resurrection or animate dead we should be allow to select dead stack
//TODO: more general handling of dead targets
switch(spellSelMode)
{
@ -3089,6 +3089,8 @@ CBattleInterface::SpellSelectionType CBattleInterface::selectionTypeByPositivene
case CSpell::POSITIVE:
return FRIENDLY_CREATURE;
}
assert(0);
return NO_LOCATION; //should never happen
}
std::string CBattleInterface::SiegeHelper::townTypeInfixes[GameConstants::F_NUMBER] = {"CS", "RM", "TW", "IN", "NC", "DN", "ST", "FR", "EL"};

7
client/BattleInterface/CBattleInterfaceClasses.cpp
View File

@ -74,9 +74,10 @@ bool CBattleConsole::addText(const std::string & text)
void CBattleConsole::alterText(const std::string &text)
{
char buf[500];
sprintf(buf, text.c_str());
alterTxt = buf;
//char buf[500];
//sprintf(buf, text.c_str());
//alterTxt = buf;
alterTxt = text;
}
void CBattleConsole::eraseText(ui32 pos)

14
client/CCastleInterface.cpp
View File

@ -940,7 +940,6 @@ CCastleInterface::CCastleInterface(const CGTownInstance * Town, int listPos):
split = new CAdventureMapButton(CGI->generaltexth->tcommands[3], "", boost::bind(&CGarrisonInt::splitClick,garr), 744, 382, "TSBTNS.DEF");
split->callback += boost::bind(&HeroSlots::splitClicked, heroes);
removeChild(split);
garr->addSplitBtn(split);
Rect barRect(9, 182, 732, 18);
@ -1411,7 +1410,7 @@ void CBuildWindow::close()
void CBuildWindow::clickRight(tribool down, bool previousState)
{
if((!down || indeterminate(down)) && mode)
if((!down || indeterminate(down)))
close();
}
@ -1448,7 +1447,6 @@ CBuildWindow::CBuildWindow(const CGTownInstance *Town, const CBuilding * Buildin
:town(Town), building(Building), state(State), mode(Mode)
{
OBJ_CONSTRUCTION_CAPTURING_ALL;
used |= RCLICK;
background = new CPicture("TPUBUILD");
pos = background->center();
background->colorize(LOCPLINT->playerID);
@ -1501,8 +1499,12 @@ CBuildWindow::CBuildWindow(const CGTownInstance *Town, const CBuilding * Buildin
posY +=75;
}
if(!mode)
{
if(mode)
{ //popup
used |= RCLICK;
}
else
{ //normal window
buy = new CAdventureMapButton(boost::str(boost::format(CGI->generaltexth->allTexts[595]) % building->Name()),
"", boost::bind(&CBuildWindow::buyFunc,this), 45, 446,"IBUY30", SDLK_RETURN);
buy->borderColor = Colors::MetallicGold;
@ -1512,7 +1514,7 @@ CBuildWindow::CBuildWindow(const CGTownInstance *Town, const CBuilding * Buildin
"", boost::bind(&CBuildWindow::close,this), 290, 445, "ICANCEL", SDLK_ESCAPE);
cancel->borderColor = Colors::MetallicGold;
cancel->borderEnabled = true;
buy->block(state!=7);
buy->block(state!=7 || LOCPLINT->playerID != town->tempOwner);
}
}

9
client/CHeroWindow.cpp
View File

@ -198,11 +198,10 @@ void CHeroWindow::update(const CGHeroInstance * hero, bool redrawNeeded /*= fals
if(!garr)
{
garr = new CGarrisonInt(15, 485, 8, Point(), background->bg, Point(15,485), curHero);
{
BLOCK_CAPTURING;
split = new CAdventureMapButton(CGI->generaltexth->allTexts[256], CGI->generaltexth->heroscrn[32], boost::bind(&CGarrisonInt::splitClick,garr), pos.x + 539, pos.y + 519, "hsbtns9.def", false, NULL, false); //deleted by garrison destructor
boost::algorithm::replace_first(split->hoverTexts[0],"%s",CGI->generaltexth->allTexts[43]);
}
split = new CAdventureMapButton(CGI->generaltexth->allTexts[256], CGI->generaltexth->heroscrn[32],
boost::bind(&CGarrisonInt::splitClick,garr), 539, 519, "hsbtns9.def", false, NULL, false); //deleted by garrison destructor
boost::algorithm::replace_first(split->hoverTexts[0],"%s",CGI->generaltexth->allTexts[43]);
garr->addSplitBtn(split);
}
if(!artSets.size())

69
client/GUIClasses.cpp
View File

@ -375,7 +375,10 @@ CGarrisonInt::~CGarrisonInt()
void CGarrisonInt::addSplitBtn(CAdventureMapButton * button)
{
addChild(button);
if (button->parent)
GH.moveChild(button, button->parent, this);
else
addChild(button);
button->recActions = defActions;
splitButtons.push_back(button);
}
@ -5196,8 +5199,6 @@ void CExchangeWindow::close()
void CExchangeWindow::showAll(SDL_Surface * to)
{
blitAt(bg, pos, to);
CIntObject::showAll(to);
//printing border around window
@ -5212,14 +5213,9 @@ void CExchangeWindow::questlog(int whichHero)
void CExchangeWindow::prepareBackground()
{
if(bg)
SDL_FreeSurface(bg);
SDL_Surface * bgtemp; //loaded as 8bpp surface
bgtemp = BitmapHandler::loadBitmap("TRADE2.BMP");
graphics->blueToPlayersAdv(bgtemp, heroInst[0]->tempOwner);
bg = SDL_ConvertSurface(bgtemp, screen->format, screen->flags); //to 24 bpp
SDL_FreeSurface(bgtemp);
background = new CPicture("TRADE2");
background->colorizeAndConvert(LOCPLINT->playerID);
SDL_Surface *bg = *background;
//printing heroes' names and levels
std::ostringstream os, os2;
@ -5281,7 +5277,7 @@ void CExchangeWindow::prepareBackground()
delete skilldef;
}
CExchangeWindow::CExchangeWindow(si32 hero1, si32 hero2) : bg(NULL)
CExchangeWindow::CExchangeWindow(si32 hero1, si32 hero2)
{
OBJ_CONSTRUCTION_CAPTURING_ALL;
char bufor[400];
@ -5289,17 +5285,13 @@ CExchangeWindow::CExchangeWindow(si32 hero1, si32 hero2) : bg(NULL)
heroInst[1] = LOCPLINT->cb->getHero(hero2);
prepareBackground();
pos.x = screen->w/2 - bg->w/2;
pos.y = screen->h/2 - bg->h/2;
pos.w = screen->w;
pos.h = screen->h;
pos = background->center();
artifs[0] = new CArtifactsOfHero(Point(pos.x + -334, pos.y + 150));
artifs[0] = new CArtifactsOfHero(Point(-334, 150));
artifs[0]->commonInfo = new CArtifactsOfHero::SCommonPart;
artifs[0]->commonInfo->participants.insert(artifs[0]);
artifs[0]->setHero(heroInst[0]);
artifs[1] = new CArtifactsOfHero(Point(pos.x + 96, pos.y + 150));
artifs[1] = new CArtifactsOfHero(Point(96, 150));
artifs[1]->commonInfo = artifs[0]->commonInfo;
artifs[1]->commonInfo->participants.insert(artifs[1]);
artifs[1]->setHero(heroInst[1]);
@ -5312,7 +5304,7 @@ CExchangeWindow::CExchangeWindow(si32 hero1, si32 hero2) : bg(NULL)
{
//primary skill's clickable areas
primSkillAreas.push_back(new LRClickableAreaWTextComp());
primSkillAreas[g]->pos = genRect(32, 140, pos.x+329, pos.y + 19 + 36 * g);
primSkillAreas[g]->pos = genRect(32, 140, 329, 19 + 36 * g);
primSkillAreas[g]->text = CGI->generaltexth->arraytxt[2+g];
primSkillAreas[g]->type = g;
primSkillAreas[g]->bonusValue = -1;
@ -5330,7 +5322,7 @@ CExchangeWindow::CExchangeWindow(si32 hero1, si32 hero2) : bg(NULL)
int skill = heroInst[b]->secSkills[g].first,
level = heroInst[b]->secSkills[g].second; // <1, 3>
secSkillAreas[b].push_back(new LRClickableAreaWTextComp());
secSkillAreas[b][g]->pos = genRect(32, 32, pos.x + 32 + g*36 + b*454 , pos.y + 88);
secSkillAreas[b][g]->pos = genRect(32, 32, 32 + g*36 + b*454 , 88);
secSkillAreas[b][g]->baseType = 1;
secSkillAreas[b][g]->type = skill;
@ -5341,15 +5333,15 @@ CExchangeWindow::CExchangeWindow(si32 hero1, si32 hero2) : bg(NULL)
secSkillAreas[b][g]->hoverText = std::string(bufor);
}
portrait[b] = new CHeroArea(pos.x + 257 + 228*b, pos.y + 13, heroInst[b]);
portrait[b] = new CHeroArea(257 + 228*b, 13, heroInst[b]);
speciality[b] = new LRClickableAreaWText();
speciality[b]->pos = genRect(32, 32, pos.x + 69 + 490*b, pos.y + 45);
speciality[b]->pos = genRect(32, 32, 69 + 490*b, 45);
speciality[b]->hoverText = CGI->generaltexth->heroscrn[27];
speciality[b]->text = CGI->generaltexth->hTxts[heroInst[b]->subID].longBonus;
experience[b] = new LRClickableAreaWText();
experience[b]->pos = genRect(32, 32, pos.x + 105 + 490*b, pos.y + 45);
experience[b]->pos = genRect(32, 32, 105 + 490*b, 45);
experience[b]->hoverText = CGI->generaltexth->heroscrn[9];
experience[b]->text = CGI->generaltexth->allTexts[2].c_str();
boost::replace_first(experience[b]->text, "%d", boost::lexical_cast<std::string>(heroInst[b]->level));
@ -5357,42 +5349,35 @@ CExchangeWindow::CExchangeWindow(si32 hero1, si32 hero2) : bg(NULL)
boost::replace_first(experience[b]->text, "%d", boost::lexical_cast<std::string>(heroInst[b]->exp));
spellPoints[b] = new LRClickableAreaWText();
spellPoints[b]->pos = genRect(32, 32, pos.x + 141 + 490*b, pos.y + 45);
spellPoints[b]->pos = genRect(32, 32, 141 + 490*b, 45);
spellPoints[b]->hoverText = CGI->generaltexth->heroscrn[22];
sprintf(bufor, CGI->generaltexth->allTexts[205].c_str(), heroInst[b]->name.c_str(), heroInst[b]->mana, heroInst[b]->manaLimit());
spellPoints[b]->text = std::string(bufor);
//setting morale
morale[b] = new MoraleLuckBox(true, genRect(32, 32, pos.x + 177 + 490*b, pos.y + 45));
morale[b] = new MoraleLuckBox(true, genRect(32, 32, 176 + 490*b, 39), true);
morale[b]->set(heroInst[b]);
//setting luck
luck[b] = new MoraleLuckBox(false, genRect(32, 32, pos.x + 213 + 490*b, pos.y + 45));
luck[b] = new MoraleLuckBox(false, genRect(32, 32, 212 + 490*b, 39), true);
luck[b]->set(heroInst[b]);
}
//buttons
quit = new CAdventureMapButton(CGI->generaltexth->tcommands[8], "", boost::bind(&CExchangeWindow::close, this), pos.x+732, pos.y+567, "IOKAY.DEF", SDLK_RETURN);
questlogButton[0] = new CAdventureMapButton(CGI->generaltexth->heroscrn[0], std::string(), boost::bind(&CExchangeWindow::questlog,this, 0), pos.x+10, pos.y+44, "hsbtns4.def");
questlogButton[1] = new CAdventureMapButton(CGI->generaltexth->heroscrn[0], std::string(), boost::bind(&CExchangeWindow::questlog,this, 1), pos.x+740, pos.y+44, "hsbtns4.def");
quit = new CAdventureMapButton(CGI->generaltexth->tcommands[8], "", boost::bind(&CExchangeWindow::close, this), 732, 567, "IOKAY.DEF", SDLK_RETURN);
questlogButton[0] = new CAdventureMapButton(CGI->generaltexth->heroscrn[0], "", boost::bind(&CExchangeWindow::questlog,this, 0), 10, 44, "hsbtns4.def");
questlogButton[1] = new CAdventureMapButton(CGI->generaltexth->heroscrn[0], "", boost::bind(&CExchangeWindow::questlog,this, 1), 740, 44, "hsbtns4.def");
//statusbar
//FIXME - this image is a bit bigger than required - part of background should be used instead
ourBar = new CGStatusBar(pos.x + 3, pos.y + 577, "KSTATBAR");
Rect barRect(5, 578, 725, 18);
ourBar = new CGStatusBar(new CPicture(*background, barRect, 5, 578, false));
//garrison interface
garr = new CGarrisonInt(pos.x + 69, pos.y + 131, 4, Point(418,0), bg, Point(69,131), heroInst[0],heroInst[1], true, true);
{
BLOCK_CAPTURING;
garr->addSplitBtn(new CAdventureMapButton(CGI->generaltexth->tcommands[3],"",boost::bind(&CGarrisonInt::splitClick,garr),pos.x+10,pos.y+132,"TSBTNS.DEF"));
garr->addSplitBtn(new CAdventureMapButton(CGI->generaltexth->tcommands[3],"",boost::bind(&CGarrisonInt::splitClick,garr),pos.x+740,pos.y+132,"TSBTNS.DEF"));
}
garr = new CGarrisonInt(69, 131, 4, Point(418,0), *background, Point(69,131), heroInst[0],heroInst[1], true, true);
garr->addSplitBtn(new CAdventureMapButton(CGI->generaltexth->tcommands[3], "", boost::bind(&CGarrisonInt::splitClick, garr), 10, 132, "TSBTNS.DEF"));
garr->addSplitBtn(new CAdventureMapButton(CGI->generaltexth->tcommands[3], "", boost::bind(&CGarrisonInt::splitClick, garr), 740, 132, "TSBTNS.DEF"));
}
CExchangeWindow::~CExchangeWindow() //d-tor
{
SDL_FreeSurface(bg);
delete artifs[0]->commonInfo;
artifs[0]->commonInfo = NULL;
artifs[1]->commonInfo = NULL;

2
client/GUIClasses.h
View File

@ -939,9 +939,9 @@ public:
class CExchangeWindow : public CWindowWithGarrison, public CWindowWithArtifacts
{
CPicture *background;
CGStatusBar * ourBar; //internal statusbar
SDL_Surface *bg; //background
CAdventureMapButton * quit, * questlogButton[2];
std::vector<LRClickableAreaWTextComp *> secSkillAreas[2], primSkillAreas;

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
vcmi (0.87-1) unstable; urgency=low
* New upstream release
* Removed vcmi-doc package
-- Ivan Savenko <saven.ivan@gmail.com> Sun, 19 Feb 2012 16:20:50 +0200
vcmi (0.80-1) unstable; urgency=low
* New upstream release

13
debian/control vendored
View File

@ -17,16 +17,3 @@ Description: A rewrite the Heroes of Might and Magic 3 engine
.
In its current state it already supports maps of any sizes, higher
resolutions and extended engine limits.
Package: vcmi-doc
Architecture: all
Section: doc
Description: documentation for vcmi
The purpose of VCMI project is to rewrite entire HOMM 3: WoG engine from
scratch, giving it new and extended possibilities. It will help to support
mods and new towns already made by fans but abandoned because of game code
limitations.
.
In its current state it already supports maps of any sizes, higher
resolutions and extended engine limits.

13
lib/CObjectHandler.cpp
View File

@ -34,6 +34,11 @@ using namespace boost::assign;
*
*/
// 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)
#define USE_COVERAGE_MAP 0
std::map<int,std::map<int, std::vector<int> > > CGTeleport::objs;
std::vector<std::pair<int, int> > CGTeleport::gates;
IGameCallback * IObjectInterface::cb = NULL;
@ -256,10 +261,14 @@ bool CGObjectInstance::blockingAt(int x, int y) const
bool CGObjectInstance::coveringAt(int x, int y) const
{
#if USE_COVERAGE_MAP
return x < 8 && y < 6;// ignore unreliable msk\msg
#else
if((defInfo->coverageMap[y] >> (7-(x) )) & 1
|| (defInfo->shadowCoverage[y] >> (7-(x) )) & 1)
return true;
return false;
#endif
}
std::set<int3> CGObjectInstance::getBlockedPos() const
@ -445,9 +454,13 @@ ui8 CGObjectInstance::getPassableness() const
bool CGObjectInstance::hasShadowAt( int x, int y ) const
{
#if USE_COVERAGE_MAP
return coveringAt(x,y);// ignore unreliable shadowCoverage map
#else
if( (defInfo->shadowCoverage[y] >> (7-(x) )) & 1 )
return true;
return false;
#endif
}
int3 CGObjectInstance::visitablePos() const