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

Merge pull request #1676 from rilian-la-te/fix-week-animation

Browse Source 
vcmi: fix week animation
This commit is contained in:
Ivan Savenko 2023-03-13 12:48:59 +02:00 committed by GitHub
commit fdfba83186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/adventureMap/CInfoBar.cpp
View File

@ -64,6 +64,7 @@ CInfoBar::VisibleDateInfo::VisibleDateInfo()
OBJECT_CONSTRUCTION_CAPTURING(255-DISPOSE);
animation = std::make_shared<CShowableAnim>(1, 0, getNewDayName(), CShowableAnim::PLAY_ONCE, 180);// H3 uses around 175-180 ms per frame
animation->setDuration(1500);
std::string labelText;
if(LOCPLINT->cb->getDate(Date::DAY_OF_WEEK) == 1 && LOCPLINT->cb->getDate(Date::DAY) != 1) // monday of any week but first - show new week info
@ -81,7 +82,7 @@ std::string CInfoBar::VisibleDateInfo::getNewDayName()
if(LOCPLINT->cb->getDate(Date::DAY) == 1)
return "NEWDAY";
if(LOCPLINT->cb->getDate(Date::DAY) != 1)
if(LOCPLINT->cb->getDate(Date::DAY_OF_WEEK) != 1)
return "NEWDAY";
switch(LOCPLINT->cb->getDate(Date::WEEK))

5
client/widgets/Images.cpp
View File

@ -392,6 +392,11 @@ void CShowableAnim::rotate(bool on, bool vertical)
flags &= ~flag;
}
void CShowableAnim::setDuration(int durationMs)
{
frameTimeTotal = durationMs/(last - first);
}
CCreatureAnim::CCreatureAnim(int x, int y, std::string name, ui8 flags, ECreatureAnimType type):
CShowableAnim(x, y, name, flags, 100, size_t(type)) // H3 uses 100 ms per frame, irregardless of battle speed settings
{

3
client/widgets/Images.h
View File

@ -169,6 +169,9 @@ public:
//set frame to first, call callback
virtual void reset();
//set animation duration
void setDuration(int durationMs);
//show current frame and increase counter
void show(SDL_Surface * to) override;
void showAll(SDL_Surface * to) override;