Changeset 115


Ignore:
Timestamp:
Aug 13, 2014, 4:52:22 PM (4 years ago)
Author:
alloc
Message:

Fixes: Changed to a single solution for both patcher + fixes

Location:
binary-improvements
Files:
11 added
2 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

    r114 r115  
    1414    <DebugType>full</DebugType>
    1515    <Optimize>false</Optimize>
    16     <OutputPath>bin\Debug</OutputPath>
     16    <OutputPath>..\bin\Debug</OutputPath>
    1717    <DefineConstants>DEBUG;</DefineConstants>
    1818    <ErrorReport>prompt</ErrorReport>
     
    2323    <DebugType>none</DebugType>
    2424    <Optimize>true</Optimize>
    25     <OutputPath>bin\Release</OutputPath>
     25    <OutputPath>..\bin\Release</OutputPath>
    2626    <ErrorReport>prompt</ErrorReport>
    2727    <WarningLevel>4</WarningLevel>
     
    3030  <ItemGroup>
    3131    <Reference Include="System" />
    32     <Reference Include="Assembly-CSharp">
    33       <HintPath>..\assembly-patcher\bin\Release\Assembly-CSharp.dll</HintPath>
    34     </Reference>
    3532    <Reference Include="UnityEngine">
    36       <HintPath>..\assembly-patcher\bin\Release\UnityEngine.dll</HintPath>
     33      <HintPath>..\7dtd-binaries\UnityEngine.dll</HintPath>
    3734    </Reference>
    3835    <Reference Include="SteamworksManaged">
    39       <HintPath>bin\Release\SteamworksManaged.dll</HintPath>
     36      <HintPath>..\7dtd-binaries\SteamworksManaged.dll</HintPath>
     37    </Reference>
     38    <Reference Include="Assembly-CSharp">
     39      <HintPath>..\7dtd-binaries\Assembly-CSharp.deobf.dll</HintPath>
    4040    </Reference>
    4141  </ItemGroup>
  • binary-improvements/7dtd-server-fixes/7dtd-server-fixes.userprefs

    r107 r115  
    11<Properties>
    22  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
    3   <MonoDevelop.Ide.Workbench ActiveDocument="src/AdminToolsStuff.cs">
     3  <MonoDevelop.Ide.Workbench ActiveDocument="src/AllocsLogFunctions.cs">
    44    <Files>
    5       <File FileName="src/AssemblyInfo.cs" Line="20" Column="40" />
    6       <File FileName="src/AllocsNetTelnetServer.cs" Line="155" Column="65" />
    7       <File FileName="src/AllocsTelnetConnection.cs" Line="50" Column="3" />
    8       <File FileName="src/AllocsLogFunctions.cs" Line="27" Column="43" />
    9       <File FileName="src/AdminToolsStuff.cs" Line="33" Column="1" />
    10       <File FileName="src/PlayerDataStuff.cs" Line="59" Column="40" />
    11       <File FileName="src/TelnetCommands/SayToPlayer.cs" Line="23" Column="49" />
    12       <File FileName="src/CommonMappingFunctions.cs" Line="149" Column="1" />
    13       <File FileName="src/CommandExtensions.cs" Line="34" Column="28" />
     5      <File FileName="src/AllocsNetTelnetServer.cs" Line="166" Column="29" />
     6      <File FileName="src/AllocsTelnetConnection.cs" Line="5" Column="36" />
     7      <File FileName="src/AllocsLogFunctions.cs" Line="29" Column="3" />
     8      <File FileName="src/CommonMappingFunctions.cs" Line="121" Column="5" />
     9      <File FileName="src/CommandExtensions.cs" Line="20" Column="26" />
     10      <File FileName="src/TelnetCommands/PrivateMassageConnections.cs" Line="15" Column="26" />
     11      <File FileName="src/ConsoleOutputSeparator.cs" Line="52" Column="47" />
    1412    </Files>
    1513  </MonoDevelop.Ide.Workbench>
  • binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs

    r107 r115  
    153153                        }
    154154                } catch (Exception e) {
    155                         Log.Out ("Error in AllocsTelnetServer.RemvoeClosedConnections: " + e);
     155                        Log.Out ("Error in AllocsTelnetServer.RemoveClosedConnections: " + e);
    156156                }
    157157        }
     
    169169        }
    170170
    171         public static void WriteToClient (string line, AllocsTelnetConnection client)
     171        public static void WriteToClient_Single (string line, AllocsTelnetConnection client)
    172172        {
    173173                if (line == null) {
  • binary-improvements/7dtd-server-fixes/src/ConsoleOutputSeparator.cs

    r107 r115  
    5050                } else {
    5151                        if (console.telnetServer != null && issuerOfCurrentTelnetCommand != null)
    52                                 AllocsNetTelnetServer.WriteToClient (_line, issuerOfCurrentTelnetCommand);
     52                                AllocsNetTelnetServer.WriteToClient_Single (_line, issuerOfCurrentTelnetCommand);
    5353                        else if (ControlPanel.IsStarted ())
    5454                                ControlPanel.AddTextToOutputBuffer (_line);
  • binary-improvements/assembly-patcher/Assembly-Patcher.csproj

    r73 r115  
    1515    <DebugType>full</DebugType>
    1616    <Optimize>false</Optimize>
    17     <OutputPath>bin\Debug</OutputPath>
     17    <OutputPath>..\bin\Debug</OutputPath>
    1818    <DefineConstants>DEBUG;</DefineConstants>
    1919    <ErrorReport>prompt</ErrorReport>
    2020    <WarningLevel>4</WarningLevel>
    2121    <PlatformTarget>x86</PlatformTarget>
    22     <Externalconsole>true</Externalconsole>
     22    <ConsolePause>false</ConsolePause>
    2323  </PropertyGroup>
    2424  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    2525    <DebugType>none</DebugType>
    2626    <Optimize>true</Optimize>
    27     <OutputPath>bin\Release</OutputPath>
     27    <OutputPath>..\bin\Release</OutputPath>
    2828    <ErrorReport>prompt</ErrorReport>
    2929    <WarningLevel>4</WarningLevel>
     
    3333  <ItemGroup>
    3434    <Reference Include="System" />
    35     <Reference Include="Mono.Cecil, Version=0.9.5.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
    36       <Private>False</Private>
    37       <Package>monodevelop</Package>
    38     </Reference>
    39     <Reference Include="7dtd-server-fixes">
    40       <HintPath>..\7dtd-server-fixes\bin\Release\7dtd-server-fixes.dll</HintPath>
    41       <Private>False</Private>
     35    <Reference Include="Mono.Cecil">
     36      <HintPath>..\Mono.Cecil.dll</HintPath>
    4237    </Reference>
    4338  </ItemGroup>
     
    4742  </ItemGroup>
    4843  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
     44  <ItemGroup>
     45    <ProjectReference Include="..\7dtd-server-fixes\7dtd-server-fixes.csproj">
     46      <Project>{81DA7F87-1A66-4920-AADA-6EAF1971F8D0}</Project>
     47      <Name>7dtd-server-fixes</Name>
     48      <Private>False</Private>
     49    </ProjectReference>
     50  </ItemGroup>
    4951</Project>
  • binary-improvements/assembly-patcher/Assembly-Patcher.userprefs

    r104 r115  
    33  <MonoDevelop.Ide.Workbench ActiveDocument="Main.cs">
    44    <Files>
    5       <File FileName="Main.cs" Line="20" Column="4" />
     5      <File FileName="Main.cs" Line="74" Column="71" />
    66      <File FileName="AssemblyInfo.cs" Line="21" Column="1" />
    77    </Files>
     
    1010        <State expanded="True">
    1111          <Node name="Assembly-Patcher" expanded="True">
    12             <Node name="References" expanded="True">
    13               <Node name="/home/ci/Schreibtisch/7dtd-svn/binary-improvements/7dtd-server-fixes/bin/Release/7dtd-server-fixes.dll" selected="True" />
    14             </Node>
     12            <Node name="References" expanded="True" selected="True" />
    1513          </Node>
    1614        </State>
  • binary-improvements/assembly-patcher/Main.cs

    r107 r115  
    2626                        playerDataPatch (module);
    2727
    28                         module.Write ("Assembly-CSharp.dll");
     28                        module.Write ("Assembly-CSharp.patched.dll");
    2929                        Console.WriteLine ("Done");
    3030
     
    3737                        addHook (type, "Run", true, 0, true, typeof(ConsoleOutputSeparator).GetMethod ("C_Run"));
    3838                        replaceMethod (type, "SendResult", true, 1, typeof(ConsoleOutputSeparator).GetMethod ("C_SendResult"));
    39 
    4039                }
    4140
Note: See TracChangeset for help on using the changeset viewer.