From 723632178adc0b7208e658839ff755bae179967c Mon Sep 17 00:00:00 2001 From: Lev Date: Thu, 17 Aug 2023 17:48:40 +0300 Subject: [PATCH] kskclzzzfer --- DangerousD/GameCore/Managers/AppManager.cs | 24 ++++------------------ 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs index bda0c27..bb1ab3a 100644 --- a/DangerousD/GameCore/Managers/AppManager.cs +++ b/DangerousD/GameCore/Managers/AppManager.cs @@ -178,7 +178,7 @@ namespace DangerousD.GameCore { foreach (NetworkTask networkTask in networkTasks) { -<<<<<<< HEAD + switch (networkTask.operation) { case NetworkTaskOperationEnum.TakeDamage: @@ -199,25 +199,9 @@ namespace DangerousD.GameCore default: break; } -======= - case NetworkTaskOperationEnum.TakeDamage: - break; - case NetworkTaskOperationEnum.SendSound: - // SoundManager.StartSound(networkTask.name, networkTask.position, GameManager.GetPlayer1.Pos); - break; - case NetworkTaskOperationEnum.CreateEntity: - break; - case NetworkTaskOperationEnum.SendPosition: - break; - case NetworkTaskOperationEnum.ChangeState: - break; - case NetworkTaskOperationEnum.ConnectToHost: - break; - case NetworkTaskOperationEnum.GetClientPlayerId: - break; - default: - break; ->>>>>>> livingEntitiesVlad + + + } }