瀏覽代碼

Fixed timer countdown sound playback

Ivan Savenko 1 年之前
父節點
當前提交
5d7901cd8c
共有 2 個文件被更改,包括 7 次插入6 次删除
  1. 6 5
      client/adventureMap/TurnTimerWidget.cpp
  2. 1 1
      client/adventureMap/TurnTimerWidget.h

+ 6 - 5
client/adventureMap/TurnTimerWidget.cpp

@@ -104,13 +104,14 @@ void TurnTimerWidget::show(Canvas & to)
 
 void TurnTimerWidget::updateNotifications(PlayerColor player, int timeMs)
 {
+	if(player != LOCPLINT->playerID)
+		return;
+
 	int newTimeSeconds = timeMs / 1000;
-	if(player == LOCPLINT->playerID
-	   && newTimeSeconds != lastSoundCheckSeconds
-	   && notificationThresholds.count(newTimeSeconds))
-	{
+
+	if (newTimeSeconds != lastSoundCheckSeconds && notificationThresholds.count(newTimeSeconds))
 		CCS->soundh->playSound(AudioPath::builtin("WE5"));
-	}
+
 	lastSoundCheckSeconds = newTimeSeconds;
 }
 

+ 1 - 1
client/adventureMap/TurnTimerWidget.h

@@ -28,7 +28,7 @@ class TurnTimerWidget : public CIntObject
 	int lastSoundCheckSeconds;
 	bool isBattleMode;
 
-	const std::set<int> notificationThresholds = {0, 1, 2, 3, 4, 5, 10, 20, 30};
+	const std::set<int> notificationThresholds = {1, 2, 3, 4, 5, 10, 20, 30};
 
 	std::map<PlayerColor, std::shared_ptr<CLabel>> playerLabelsMain;
 	std::map<PlayerColor, std::shared_ptr<CLabel>> playerLabelsBattle;