This commit is contained in:
adelikat 2013-10-28 13:48:17 +00:00
parent bc5a563d3f
commit 8b173a26f4
4 changed files with 36 additions and 30 deletions

View File

@ -38,6 +38,10 @@
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="LuaInterface, Version=2.0.0.16708, Culture=neutral, processorArchitecture=x86" Condition=" '$(OS)' == 'Windows_NT' ">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\LuaInterface.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\Newtonsoft.Json.dll</HintPath>
</Reference>
@ -97,6 +101,7 @@
<Compile Include="Global.cs" />
<Compile Include="helpers\InputValidate.cs" />
<Compile Include="KeyTurbo.cs" />
<Compile Include="lua\LuaFile.cs" />
<Compile Include="movie\InputAdapters.cs" />
<Compile Include="movie\Movie.cs" />
<Compile Include="movie\MovieHeader.cs" />

View File

@ -1,33 +1,28 @@
using System.IO;
using System;
using System.IO;
namespace BizHawk.MultiClient
namespace BizHawk.Client.Common
{
class LuaFile
public class LuaFile
{
public string Name;
public string Path;
public bool Enabled;
public bool Paused;
public bool IsSeparator;
public LuaInterface.Lua Thread;
public bool FrameWaiting;
public string CurrentDirectory;
public string Name { get; set; }
public string Path { get; set; }
public bool Enabled { get; set; }
public bool Paused { get; set; }
public bool IsSeparator { get; set; }
public LuaInterface.Lua Thread { get; set; }
public bool FrameWaiting { get; set; }
public string CurrentDirectory { get; set; }
public LuaFile(string path)
{
Name = "";
Name = String.Empty;
Path = path;
Enabled = true;
Paused = false;
FrameWaiting = false;
}
public void Stop()
{
Enabled = false;
Thread = null;
}
public LuaFile(string name, string path)
{
Name = name;
@ -42,26 +37,34 @@ namespace BizHawk.MultiClient
public LuaFile(bool isSeparator)
{
IsSeparator = isSeparator;
Name = "";
Path = "";
Name = String.Empty;
Path = String.Empty;
Enabled = false;
}
public LuaFile(LuaFile l)
public LuaFile(LuaFile file)
{
Name = l.Name;
Path = l.Path;
Enabled = l.Enabled;
Paused = l.Paused;
IsSeparator = l.IsSeparator;
CurrentDirectory = l.CurrentDirectory;
Name = file.Name;
Path = file.Path;
Enabled = file.Enabled;
Paused = file.Paused;
IsSeparator = file.IsSeparator;
CurrentDirectory = file.CurrentDirectory;
}
public void Stop()
{
Enabled = false;
Thread = null;
}
public void Toggle()
{
Enabled ^= true;
if (Enabled)
{
Paused = false;
}
}
public void TogglePause()

View File

@ -71,7 +71,7 @@
</Reference>
<Reference Include="LuaInterface, Version=2.0.0.16708, Culture=neutral, processorArchitecture=x86" Condition=" '$(OS)' == 'Windows_NT' ">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\LuaInterface.dll</HintPath>
<HintPath>..\LuaInterface.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" Condition=" '$(OS)' == 'Windows_NT' " />
<Reference Include="Newtonsoft.Json, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
@ -453,7 +453,6 @@
<DependentUpon>LuaConsole.cs</DependentUpon>
</Compile>
<Compile Include="tools\Lua\LuaDocumentation.cs" />
<Compile Include="tools\Lua\LuaFiles.cs" />
<Compile Include="tools\Lua\LuaFunctionList.cs">
<SubType>Form</SubType>
</Compile>
@ -467,7 +466,6 @@
<Compile Include="tools\Lua\LuaRegisteredFunctionsList.Designer.cs">
<DependentUpon>LuaRegisteredFunctionsList.cs</DependentUpon>
</Compile>
<Compile Include="tools\Lua\LuaText.cs" />
<Compile Include="tools\Lua\LuaTextBox.cs">
<SubType>Component</SubType>
</Compile>