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

- moved Sprites and Data directory to vcmi "mod'

Browse Source 
- some bugfixing:
- - teleporting animation fixed #1087, partially - #818
- - gui adjustments for #1093 and #1090
This commit is contained in:
Ivan Savenko 2012-09-29 08:35:31 +00:00
parent 2ba0427432
commit b0f669a764
7 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Data/s/std.verm → Mods/vcmi/Data/s/std.verm
View File

0
Data/s/testy.erm → Mods/vcmi/Data/s/testy.erm
View File

0
Sprites/PortraitsLarge.json → Mods/vcmi/Sprites/PortraitsLarge.json
View File

0
Sprites/PortraitsSmall.json → Mods/vcmi/Sprites/PortraitsSmall.json
View File

6
client/AdventureMapClasses.cpp
View File

@ -794,12 +794,12 @@ void CInfoBar::CVisibleInfo::loadComponent(const Component & compToDisplay, std:
OBJ_CONSTRUCTION_CAPTURING_ALL;
new CPicture("ADSTATOT");
new CPicture("ADSTATOT", 1);
auto comp = new CComponent(compToDisplay);
comp->moveTo(Point(pos.x+52, pos.y+54));
comp->moveTo(Point(pos.x+47, pos.y+50));
new CTextBox(message, Rect(8, 8, 164, 50), 0, FONT_SMALL, CENTER, Colors::Cornsilk);
new CTextBox(message, Rect(10, 4, 160, 50), 0, FONT_SMALL, CENTER, Colors::Cornsilk);
}
void CInfoBar::CVisibleInfo::updateEnemyTurn(double progress)

20
client/BattleInterface/CBattleAnimations.cpp
View File

@ -390,24 +390,27 @@ if( !isEarliest(false) )
//a few useful variables
steps = static_cast<int>(myAnim()->framesInGroup(CCreatureAnim::MOVING) * owner->getAnimSpeedMultiplier() - 1);
if(steps == 0) //this creature seems to have no move animation so we can end it immediately
{
endAnim();
return false;
}
whichStep = 0;
int hexWbase = 44, hexHbase = 42;
const CStack * movedStack = stack;
if(!movedStack || myAnim()->getType() == 5)
{
endAnim();
return false;
}
//bool twoTiles = movedStack->doubleWide();
Point begPosition = CClickableHex::getXYUnitAnim(curStackPos, movedStack->attackerOwned, movedStack, owner);
Point endPosition = CClickableHex::getXYUnitAnim(nextHex, movedStack->attackerOwned, movedStack, owner);
if(steps < 0) //this creature seems to have no move animation so we can end it immediately
{
endAnim();
return false;
}
whichStep = 0;
int hexWbase = 44, hexHbase = 42;
//bool twoTiles = movedStack->doubleWide();
int mutPos = BattleHex::mutualPosition(curStackPos, nextHex);
//reverse unit if necessary
@ -528,6 +531,7 @@ void CMovementAnimation::endAnim()
{
const CStack * movedStack = stack;
myAnim()->pos = CClickableHex::getXYUnitAnim(nextHex, movedStack->attackerOwned, movedStack, owner);
CBattleAnimation::endAnim();
if(movedStack)

2
client/GUIClasses.cpp
View File

@ -4937,7 +4937,7 @@ CExchangeWindow::CExchangeWindow(si32 hero1, si32 hero2):
}
//buttons
quit = new CAdventureMapButton(CGI->generaltexth->tcommands[8], "", boost::bind(&CExchangeWindow::close, this), 732, 567, "IOKAY.DEF", SDLK_RETURN);
quit = new CAdventureMapButton(CGI->generaltexth->zelp[600], 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");