vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor code style nitpicking :)

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-12-05 19:05:21 +02:00
parent 1e8c1f7f04
commit 6e78e945a7
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/DebugConsole.cs
+2 -2
View File
@@ -107,9 +107,9 @@ namespace Barotrauma
if (GameMain.Server == null) return; if (GameMain.Server == null) return;
TraitorManager traitorManager = GameMain.Server.TraitorManager; TraitorManager traitorManager = GameMain.Server.TraitorManager;
if (traitorManager == null) return; if (traitorManager == null) return;
foreach (Traitor T in traitorManager.TraitorList) foreach (Traitor t in traitorManager.TraitorList)
{ {
NewMessage("- Traitor " + T.Character.Name + "'s target is " + T.TargetCharacter.Name + ".", Color.Cyan); NewMessage("- Traitor " + t.Character.Name + "'s target is " + t.TargetCharacter.Name + ".", Color.Cyan);
} }
NewMessage("The code words are: " + traitorManager.codeWords + ", response: " + traitorManager.codeResponse + ".", Color.Cyan); NewMessage("The code words are: " + traitorManager.codeWords + ", response: " + traitorManager.codeResponse + ".", Color.Cyan);
})); }));
Barotrauma/BarotraumaShared/Source/GameSession/GameModes/TraitorManager.cs
+7 -7
View File
@@ -6,7 +6,7 @@ namespace Barotrauma
{ {
partial class Traitor partial class Traitor
{ {
public Character Character; public readonly Character Character;
public Character TargetCharacter; //TODO: make a modular objective system (similar to crew missions) that allows for things OTHER than assasinations. public Character TargetCharacter; //TODO: make a modular objective system (similar to crew missions) that allows for things OTHER than assasinations.
public Traitor(Character character) public Traitor(Character character)
@@ -73,17 +73,17 @@ namespace Barotrauma
public string codeWords, codeResponse; public string codeWords, codeResponse;
public TraitorManager(GameServer server, int TraitorCount) public TraitorManager(GameServer server, int traitorCount)
{ {
if(TraitorCount < 1) //what why how if (traitorCount < 1) //what why how
{ {
TraitorCount = 1; traitorCount = 1;
DebugConsole.ThrowError("Traitor Manager: TraitorCount somehow ended up less than 1, setting it to 1."); DebugConsole.ThrowError("Traitor Manager: TraitorCount somehow ended up less than 1, setting it to 1.");
} }
Start(server, TraitorCount); Start(server, traitorCount);
} }
private void Start(GameServer server, int TraitorCount) private void Start(GameServer server, int traitorCount)
{ {
if (server == null) return; if (server == null) return;
@@ -112,7 +112,7 @@ namespace Barotrauma
codeWords = ToolBox.GetRandomLine(wordsTxt) + ", " + ToolBox.GetRandomLine(wordsTxt); codeWords = ToolBox.GetRandomLine(wordsTxt) + ", " + ToolBox.GetRandomLine(wordsTxt);
codeResponse = ToolBox.GetRandomLine(wordsTxt) + ", " + ToolBox.GetRandomLine(wordsTxt); codeResponse = ToolBox.GetRandomLine(wordsTxt) + ", " + ToolBox.GetRandomLine(wordsTxt);
while (TraitorCount-- >= 0) while (traitorCount-- >= 0)
{ {
if (traitorCandidates.Count <= 0) if (traitorCandidates.Count <= 0)
break; break;