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

Some null checks, clients log initial lobby update, minor lighting optimization

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-07-04 22:32:14 +03:00
parent 59997b94ab
commit e431cc775f
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Characters/AI/EnemyAIController.cs
+1 -8
View File
@@ -19,7 +19,7 @@ namespace Barotrauma
Vector2 pos = Character.WorldPosition; Vector2 pos = Character.WorldPosition;
pos.Y = -pos.Y; pos.Y = -pos.Y;
if (selectedAiTarget != null) if (selectedAiTarget?.Entity != null)
{ {
GUI.DrawLine(spriteBatch, pos, new Vector2(selectedAiTarget.WorldPosition.X, -selectedAiTarget.WorldPosition.Y), Color.Red); GUI.DrawLine(spriteBatch, pos, new Vector2(selectedAiTarget.WorldPosition.X, -selectedAiTarget.WorldPosition.Y), Color.Red);
@@ -31,13 +31,6 @@ namespace Barotrauma
GUI.Font.DrawString(spriteBatch, targetValue.ToString(), pos - Vector2.UnitY * 20.0f, Color.Red); GUI.Font.DrawString(spriteBatch, targetValue.ToString(), pos - Vector2.UnitY * 20.0f, Color.Red);
} }
if (selectedAiTarget != null)
{
GUI.DrawLine(spriteBatch,
new Vector2(Character.DrawPosition.X, -Character.DrawPosition.Y),
new Vector2(selectedAiTarget.WorldPosition.X, -selectedAiTarget.WorldPosition.Y), Color.Red);
}
GUI.Font.DrawString(spriteBatch, targetValue.ToString(), pos - Vector2.UnitY * 80.0f, Color.Red); GUI.Font.DrawString(spriteBatch, targetValue.ToString(), pos - Vector2.UnitY * 80.0f, Color.Red);
GUI.Font.DrawString(spriteBatch, "updatetargets: " + updateTargetsTimer, pos - Vector2.UnitY * 100.0f, Color.Red); GUI.Font.DrawString(spriteBatch, "updatetargets: " + updateTargetsTimer, pos - Vector2.UnitY * 100.0f, Color.Red);
Barotrauma/BarotraumaClient/Source/Map/Lights/LightSource.cs
+1 -1
View File
@@ -413,7 +413,7 @@ namespace Barotrauma.Lights
if (intersection != null) if (intersection != null)
{ {
float dist = Vector2.Distance((Vector2)intersection, rayStart); float dist = Vector2.DistanceSquared((Vector2)intersection, rayStart);
if (closestIntersection == null || dist < closestDist) if (closestIntersection == null || dist < closestDist)
{ {
closestDist = dist; closestDist = dist;
Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
+5 -1
View File
@@ -818,7 +818,11 @@ namespace Barotrauma.Networking
if (inc.ReadBoolean()) if (inc.ReadBoolean())
{ {
ReadInitialUpdate(inc, !NetIdUtils.IdMoreRecent(updateID,GameMain.NetLobbyScreen.LastUpdateID)); if (GameSettings.VerboseLogging)
{
DebugConsole.NewMessage("Received initial lobby update, ID: " + updateID + ", last ID: " + GameMain.NetLobbyScreen.LastUpdateID, Color.Gray);
}
ReadInitialUpdate(inc, !NetIdUtils.IdMoreRecent(updateID, GameMain.NetLobbyScreen.LastUpdateID));
} }
string selectSubName = inc.ReadString(); string selectSubName = inc.ReadString();
Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs
+1 -1
View File
@@ -213,7 +213,7 @@ namespace Barotrauma
return; return;
} }
if (attachToWalls && Character.Submarine == null) if (attachToWalls && Character.Submarine == null && Level.Loaded != null)
{ {
raycastTimer -= deltaTime; raycastTimer -= deltaTime;
//check if there are any walls nearby the character could attach to //check if there are any walls nearby the character could attach to