From c8a81ffce4755b0a11e732dea4f4ff3ed6e7249b Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@993157c7-ee19-0410-b2c4-bb4e9862e678> Date: Mon, 23 Jul 2007 10:52:07 +0000 Subject: [PATCH] git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1327 993157c7-ee19-0410-b2c4-bb4e9862e678 --- OpenRa.Game/Game.cs | 3 ++ OpenRa.Game/MainWindow.cs | 1 - OpenRa.Game/Network/Network.cs | 10 +++++ OpenRa.Game/OpenRa.Game.csproj | 1 + OpenRa.Network/Connection.cs | 18 --------- OpenRa.Network/OpenRa.Network.csproj | 47 ----------------------- OpenRa.Network/Properties/AssemblyInfo.cs | 35 ----------------- OpenRa.sln | 12 ------ 8 files changed, 14 insertions(+), 113 deletions(-) create mode 100644 OpenRa.Game/Network/Network.cs delete mode 100644 OpenRa.Network/Connection.cs delete mode 100644 OpenRa.Network/OpenRa.Network.csproj delete mode 100644 OpenRa.Network/Properties/AssemblyInfo.cs diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs index 77c0173ca3..fe54b56969 100644 --- a/OpenRa.Game/Game.cs +++ b/OpenRa.Game/Game.cs @@ -14,6 +14,7 @@ namespace OpenRa.Game public readonly TerrainRenderer terrain; public readonly Viewport viewport; public readonly PathFinder pathFinder; + public readonly Network network; public Game( string mapName, Renderer renderer, int2 clientSize ) { @@ -31,6 +32,8 @@ namespace OpenRa.Game world.Add( new Tree( treeReference, treeCache, map ) ); pathFinder = new PathFinder( map, terrain.tileSet ); + + network = new Network(); } } } diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs index ba8f3a6973..dac26706e1 100644 --- a/OpenRa.Game/MainWindow.cs +++ b/OpenRa.Game/MainWindow.cs @@ -13,7 +13,6 @@ namespace OpenRa.Game class MainWindow : Form { readonly Renderer renderer; - //readonly Map map; Game game; public readonly Sidebar sidebar; diff --git a/OpenRa.Game/Network/Network.cs b/OpenRa.Game/Network/Network.cs new file mode 100644 index 0000000000..b4743cb3e4 --- /dev/null +++ b/OpenRa.Game/Network/Network.cs @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace OpenRa.Game +{ + class Network + { + } +} diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj index bab7df9e86..58c67e3232 100644 --- a/OpenRa.Game/OpenRa.Game.csproj +++ b/OpenRa.Game/OpenRa.Game.csproj @@ -46,6 +46,7 @@ + diff --git a/OpenRa.Network/Connection.cs b/OpenRa.Network/Connection.cs deleted file mode 100644 index a97a13e88b..0000000000 --- a/OpenRa.Network/Connection.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Net; -using System.Net.Sockets; - -namespace OpenRa.Network -{ - public class Connection - { - public Connection( IPEndPoint ip ) - { - throw new NotImplementedException(); - } - - - } -} diff --git a/OpenRa.Network/OpenRa.Network.csproj b/OpenRa.Network/OpenRa.Network.csproj deleted file mode 100644 index 8a27460f4f..0000000000 --- a/OpenRa.Network/OpenRa.Network.csproj +++ /dev/null @@ -1,47 +0,0 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {1F87E186-E380-4F3C-893B-3F1F7A147821} - Library - Properties - OpenRa.Network - OpenRa.Network - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - \ No newline at end of file diff --git a/OpenRa.Network/Properties/AssemblyInfo.cs b/OpenRa.Network/Properties/AssemblyInfo.cs deleted file mode 100644 index 5371bd5a45..0000000000 --- a/OpenRa.Network/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle( "OpenRa.Network" )] -[assembly: AssemblyDescription( "" )] -[assembly: AssemblyConfiguration( "" )] -[assembly: AssemblyCompany( "" )] -[assembly: AssemblyProduct( "OpenRa.Network" )] -[assembly: AssemblyCopyright( "Copyright © 2007" )] -[assembly: AssemblyTrademark( "" )] -[assembly: AssemblyCulture( "" )] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible( false )] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid( "ac3f68cd-38ff-42ae-9bc1-86dc1b0dbbb9" )] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion( "1.0.0.0" )] -[assembly: AssemblyFileVersion( "1.0.0.0" )] diff --git a/OpenRa.sln b/OpenRa.sln index d37d347571..3afa9061a9 100644 --- a/OpenRa.sln +++ b/OpenRa.sln @@ -23,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.DataStructures", "Op EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PaletteUsage", "PaletteUsage\PaletteUsage.csproj", "{54577061-E2D2-4336-90A2-A9A7106A30CD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.Network", "OpenRa.Network\OpenRa.Network.csproj", "{1F87E186-E380-4F3C-893B-3F1F7A147821}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -115,16 +113,6 @@ Global {54577061-E2D2-4336-90A2-A9A7106A30CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {54577061-E2D2-4336-90A2-A9A7106A30CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU {54577061-E2D2-4336-90A2-A9A7106A30CD}.Release|Win32.ActiveCfg = Release|Any CPU - {1F87E186-E380-4F3C-893B-3F1F7A147821}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F87E186-E380-4F3C-893B-3F1F7A147821}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F87E186-E380-4F3C-893B-3F1F7A147821}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1F87E186-E380-4F3C-893B-3F1F7A147821}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1F87E186-E380-4F3C-893B-3F1F7A147821}.Debug|Win32.ActiveCfg = Debug|Any CPU - {1F87E186-E380-4F3C-893B-3F1F7A147821}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F87E186-E380-4F3C-893B-3F1F7A147821}.Release|Any CPU.Build.0 = Release|Any CPU - {1F87E186-E380-4F3C-893B-3F1F7A147821}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1F87E186-E380-4F3C-893B-3F1F7A147821}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1F87E186-E380-4F3C-893B-3F1F7A147821}.Release|Win32.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE