games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Fixed CID 1197516

Browse Source
This commit is contained in:
AlexVinS
2016-11-27 19:13:40 +03:00
parent 6196ae7fca
commit abe4beebc6
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/CPlayerInterface.cpp
View File

@@ -87,7 +87,7 @@ CPlayerInterface * LOCPLINT;
CBattleInterface * CPlayerInterface::battleInt;
enum EMoveState {STOP_MOVE, WAITING_MOVE, CONTINUE_MOVE, DURING_MOVE};
CondSh<EMoveState> stillMoveHero; //used during hero movement
CondSh<EMoveState> stillMoveHero(STOP_MOVE); //used during hero movement
int CPlayerInterface::howManyPeople = 0;

2
client/battle/CBattleInterface.cpp
View File

@@ -46,7 +46,7 @@
*
*/
CondSh<bool> CBattleInterface::animsAreDisplayed;
CondSh<bool> CBattleInterface::animsAreDisplayed(false);
static void onAnimationFinished(const CStack *stack, CCreatureAnimation *anim)
{

2
client/gui/CGuiHandler.cpp
View File

@@ -16,7 +16,7 @@
extern std::queue<SDL_Event> events;
extern boost::mutex eventsM;
CondSh<bool> CGuiHandler::terminate_cond;
CondSh<bool> CGuiHandler::terminate_cond(false);
boost::thread_specific_ptr<bool> inGuiThread;
SObjectConstruction::SObjectConstruction(CIntObject *obj)

7
lib/CondSh.h
View File

@@ -17,15 +17,14 @@ template <typename T> struct CondSh
boost::condition_variable cond;
boost::mutex mx;
CondSh() {}
CondSh(T t) : data(t) {}
// set data
void set(T t)
{
boost::unique_lock<boost::mutex> lock(mx);
boost::unique_lock<boost::mutex> lock(mx);
data = t;
}
}
// set data and notify
void setn(T t)
@@ -37,7 +36,7 @@ template <typename T> struct CondSh
// get stored value
T get()
{
boost::unique_lock<boost::mutex> lock(mx);
boost::unique_lock<boost::mutex> lock(mx);
return data;
}

2
server/CGameHandler.cpp
View File

@@ -75,7 +75,7 @@ private:
mutable CGameHandler * gh;
};
CondSh<bool> battleMadeAction;
CondSh<bool> battleMadeAction(false);
CondSh<BattleResult *> battleResult(nullptr);
template <typename T> class CApplyOnGH;