diff options
Diffstat (limited to 'CastleManager.cpp')
| -rw-r--r-- | CastleManager.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/CastleManager.cpp b/CastleManager.cpp index 373d6e5..6b85e36 100644 --- a/CastleManager.cpp +++ b/CastleManager.cpp @@ -11,6 +11,7 @@ bool warningEnabled = true; int notification = 0; +ThreadSafeQueue<std::string> localMessages; ThreadSafeQueue<std::string> teamMessages; ThreadSafeQueue<std::string> allMessages; @@ -39,13 +40,13 @@ void CastleManager::OnUnitCreated(Unit* unit) { return; } - Player* owningPlayer = unit->pOwner; - if (!owningPlayer || owningPlayer == Engine::Get()->GetLocalPlayer()) + Player* owningPlayer = unit->GetOwner(); + if (!owningPlayer /*|| owningPlayer == Engine::Get()->GetLocalPlayer()*/) { return; } - if (strcmp("CSTL", unit->pUnitData->name) == 0) + if (strcmp("CSTL", unit->GetUnitData()->GetName()) == 0) { std::string message = std::string(owningPlayer->name) + " is building a castle!"; const char* charMessage = message.c_str(); @@ -53,7 +54,7 @@ void CastleManager::OnUnitCreated(Unit* unit) switch (notification) { case 0: - Engine::Get()->PrintNotification(charMessage); + localMessages.push(message); break; case 1: teamMessages.push(message); @@ -69,6 +70,13 @@ void CastleManager::OnUnitCreated(Unit* unit) void CastleManager::OnMenuMainWindow() { + if (!localMessages.isEmpty()) + { + std::string message; + localMessages.pop(message); + Engine::Get()->PrintNotification(message.c_str()); + } + if (!teamMessages.isEmpty()) { std::string message; |