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

Cleanup

Browse Source
This commit is contained in:
Regalis
2017-01-01 23:21:29 +02:00
parent e358ea9917
commit 9c07038fef
4 changed files with 7 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Subsurface/Source/Events/ArtifactEvent.cs
View File

@@ -62,21 +62,16 @@ namespace Barotrauma
switch (state)
{
case 0:
state = 1;
break;
case 1:
//item.body.LinearVelocity = Vector2.Zero;
if (item.ParentInventory!=null) item.body.FarseerBody.IsKinematic = false;
if (item.CurrentHull == null) return;
state = 2;
state = 1;
break;
case 2:
case 1:
if (!Submarine.MainSub.AtEndPosition && !Submarine.MainSub.AtStartPosition) return;
Finished();
state = 3;
state = 2;
break;
}
}

4
Subsurface/Source/Events/ScriptedEvent.cs
View File

@@ -151,7 +151,6 @@ namespace Barotrauma
isFinished = false;
}
public virtual void Update(float deltaTime)
{
}
@@ -159,9 +158,6 @@ namespace Barotrauma
public virtual void Finished()
{
isFinished = true;
//EventManager.EventFinished(this);
}
}
}

1
Subsurface/Source/Events/Task.cs
View File

@@ -58,7 +58,6 @@ namespace Barotrauma
protected virtual void Finished()
{
taskManager.TaskFinished(this);
isFinished = true;
}
}

47
Subsurface/Source/Events/TaskManager.cs
View File

@@ -10,8 +10,6 @@ namespace Barotrauma
private List<Task> tasks;
//private GUIListBox taskListBox;
public List<Task> Tasks
{
get { return tasks; }
@@ -27,11 +25,7 @@ namespace Barotrauma
public TaskManager(GameSession session)
{
tasks = new List<Task>();
//taskListBox = new GUIListBox(new Rectangle(Game1.GraphicsWidth - 250, 50, 250, 500), Color.Transparent);
//taskListBox.ScrollBarEnabled = false;
//taskListBox.Padding = GUI.style.smallPadding;
tasks = new List<Task>();
}
public void AddTask(Task newTask)
@@ -44,14 +38,11 @@ namespace Barotrauma
public void StartShift(Level level)
{
CreateScriptedEvents(level);
//taskListBox.ClearChildren();
}
public void EndShift()
{
//taskListBox.ClearChildren();
tasks.Clear();
}
@@ -79,47 +70,17 @@ namespace Barotrauma
}
public void TaskFinished(Task task)
{
}
public void Update(float deltaTime)
{
Task removeTask = null;
foreach (Task task in tasks)
{
if (task.IsFinished)
{
//foreach (GUIComponent comp in taskListBox.children)
//{
// if (comp.UserData as Task != task) continue;
// comp.Rect = new Rectangle(comp.Rect.X, comp.Rect.Y, comp.Rect.Width, comp.Rect.Height - 1);
// comp.children[0].ClearChildren();
// if (comp.Rect.Height < 1)
// {
// removeComponent = comp;
removeTask = task;
// }
// break;
//}
}
else
{
if (!task.IsFinished)
{
task.Update(deltaTime);
}
}
if (removeTask!= null)
{
//taskListBox.RemoveChild(removeComponent);
tasks.Remove(removeTask);
}
//endShiftButton.Enabled = finished || Game1.server!=null;
tasks.RemoveAll(t => t.IsFinished);
}
}