From 6aef70eca1c97a77403889c390de08172cb1b81c Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Tue, 23 Sep 2014 17:30:36 +0300 Subject: [PATCH 1/2] Fixed animation order in lucky attacks. May fix 1891. --- client/CPlayerInterface.cpp | 1 + client/battle/CBattleAnimations.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/CPlayerInterface.cpp b/client/CPlayerInterface.cpp index dc934b148..5b85bc01d 100644 --- a/client/CPlayerInterface.cpp +++ b/client/CPlayerInterface.cpp @@ -945,6 +945,7 @@ void CPlayerInterface::battleAttack(const BattleAttack *ba) CCS->soundh->playSound(soundBase::deathBlow); } + battleInt->waitForAnims(); const CStack * attacker = cb->battleGetStackByID(ba->stackAttacking); diff --git a/client/battle/CBattleAnimations.cpp b/client/battle/CBattleAnimations.cpp index e2e4745f6..3845ba43d 100644 --- a/client/battle/CBattleAnimations.cpp +++ b/client/battle/CBattleAnimations.cpp @@ -867,11 +867,15 @@ void CShootingAnimation::endAnim() CSpellEffectAnimation::CSpellEffectAnimation(CBattleInterface * _owner, ui32 _effect, BattleHex _destTile, int _dx, int _dy, bool _Vflip, bool _areaEffect) :CBattleAnimation(_owner), effect(_effect), destTile(_destTile), customAnim(""), x(0), y(0), dx(_dx), dy(_dy), Vflip(_Vflip) , areaEffect(_areaEffect) -{} +{ + logAnim->debugStream() << "Created spell anim for effect #" << effect; +} CSpellEffectAnimation::CSpellEffectAnimation(CBattleInterface * _owner, std::string _customAnim, int _x, int _y, int _dx, int _dy, bool _Vflip, bool _areaEffect) :CBattleAnimation(_owner), effect(-1), destTile(0), customAnim(_customAnim), x(_x), y(_y), dx(_dx), dy(_dy), Vflip(_Vflip), areaEffect(_areaEffect) -{} +{ + logAnim->debugStream() << "Created spell anim for " << customAnim; +} bool CSpellEffectAnimation::init() { From 6768237aae82ab31a6846a6fbe16cf7ea260dd61 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Tue, 23 Sep 2014 18:50:37 +0300 Subject: [PATCH 2/2] Disabled build configuration that fail too often Should be re-enabled once we will fix that huge memory usage. --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a2159be3..e9a0a6daa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,16 +42,16 @@ matrix: exclude: - env: ignore=this include: - - compiler: clang - env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PACKAGE=clang-3.2 SUPPORT=g++-4.8 + #- compiler: clang # fails all the time - missing packages? + # env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PACKAGE=clang-3.2 SUPPORT=g++-4.8 - compiler: clang env: REAL_CC=clang-3.3 REAL_CXX=clang++-3.3 PACKAGE=clang-3.3 SUPPORT=g++-4.8 - compiler: clang env: REAL_CC=clang-3.4 REAL_CXX=clang++-3.4 PACKAGE=clang-3.4 SUPPORT=g++-4.8 - - compiler: gcc - env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 PACKAGE=g++-4.7 SUPPORT= - - compiler: gcc - env: REAL_CC=gcc-4.8 REAL_CXX=g++-4.8 PACKAGE=g++-4.8 SUPPORT= + #- compiler: gcc # fails due to running out of memory - vcmi need too much of it for successfull compilation + # env: REAL_CC=gcc-4.7 REAL_CXX=g++-4.7 PACKAGE=g++-4.7 SUPPORT= + #- compiler: gcc # same as 4.7 + # env: REAL_CC=gcc-4.8 REAL_CXX=g++-4.8 PACKAGE=g++-4.8 SUPPORT= notifications: email: