games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge branch 'vcmi/master' into 'vcmi/develop'

Browse Source
This commit is contained in:
Ivan Savenko
2024-05-31 09:34:21 +00:00
parent adc3441bda 9121fcdc97
commit df83fa33a1
166 changed files with 2893 additions and 1363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/CPlayerInterface.h
View File

@@ -25,7 +25,7 @@ struct CGPath;
class CCreatureSet;
class CGObjectInstance;
struct UpgradeInfo;
template <typename T> struct CondSh;
class ConditionalWait;
struct CPathsInfo;
VCMI_LIB_NAMESPACE_END
@@ -72,7 +72,7 @@ public: // TODO: make private
std::unique_ptr<PlayerLocalState> localState;
//minor interfaces
CondSh<bool> *showingDialog; //indicates if dialog box is displayed
ConditionalWait * showingDialog; //indicates if dialog box is displayed
bool makingTurn; //if player is already making his turn
@@ -198,6 +198,7 @@ public: // public interface for use by client via LOCPLINT access
void proposeLoadingGame();
void performAutosave();
void gamePause(bool pause);
void endNetwork();
///returns true if all events are processed internally
bool capturedAllEvents();