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 #20 from 0.7b bug thread

Browse Source
This commit is contained in:
mateuszb 2009-02-28 16:44:56 +00:00
parent f835ea9033
commit dc73072ba4
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CBattleInterface.cpp
View File

@ -1212,7 +1212,7 @@ void CBattleInterface::stacksAreAttacked(std::vector<CBattleInterface::SStackAtt
bool isAnotherOne = false; //if true, there is a stack whose hit/death anim must be continued
for(size_t g=0; g<attackedInfos.size(); ++g)
{
if(increments[attackedInfos[g].ID] < animLengths[attackedInfos[g].ID]-1)
if(increments[attackedInfos[g].ID] < animLengths[attackedInfos[g].ID] - 1)
{
isAnotherOne = true;
break;
@ -2245,9 +2245,12 @@ void CBattleHero::show(SDL_Surface *to)
{
SDL_Rect posb = pos;
CSDL_Ext::blit8bppAlphaTo24bpp(dh->ourImages[i].bitmap, NULL, to, &posb);
if(phase != 4 || image != 4)
if(phase != 4 || nextPhase != -1 || image < 4)
{
++image;
if(flagAnimCount%2==0)
{
++image;
}
if(dh->ourImages[(i+1)%dh->ourImages.size()].groupNumber!=phase) //back to appropriate frame
{
image = 0;
@ -2256,6 +2259,7 @@ void CBattleHero::show(SDL_Surface *to)
if(phase == 4 && nextPhase != -1 && image == 7)
{
phase = nextPhase;
nextPhase = -1;
image = 0;
}
break;
@ -2281,14 +2285,13 @@ void CBattleHero::setPhase(int newPhase)
}
else
{
++image;
nextPhase = newPhase;
}
}
void CBattleHero::clickLeft(boost::logic::tribool down)
{
if(!down && myHero && myHero->getArt(17))
if(!down && myHero) if(myHero->getArt(17)) //if both conditions are satisfied; for certain reason myHero->getArt(17) has been checked once even though myHero was NULL
{
for(int it=0; it<BFIELD_SIZE; ++it) //do nothing when any hex is hovered - hero's animation overlaps battlefield
{

4
client/CCreatureAnimation.cpp
View File

@ -265,8 +265,8 @@ inline void CCreatureAnimation::putPixel(
const int & ftcp,
const BMPPalette & color,
const unsigned char & palc,
const bool & yellowBorder,
const bool & blueBorder,
const bool & yellowBorder,
const bool & blueBorder,
const unsigned char & animCount
) const
{

2
client/CCreatureAnimation.h
View File

@ -36,8 +36,8 @@ private:
unsigned char * FDef; //animation raw data
int curFrame, internalFrame; //number of currently displayed frame
unsigned int frames; //number of frames
std::map<int, std::vector<int> > frameGroups; //groups of frames; [groupID] -> vector of frame IDs in group
public:
std::map<int, std::vector<int> > frameGroups; //groups of frames; [groupID] -> vector of frame IDs in group
int type; //type of animation being displayed (-1 - whole animation, >0 - specified part [default: -1])
int fullWidth, fullHeight; //read-only, please!
CCreatureAnimation(std::string name); //c-tor