diff --git a/Samples/XNA sample/XnaGameClient.sln b/Samples/XNA sample/XnaGameClient.sln
index bfbfeeb..38d694f 100644
--- a/Samples/XNA sample/XnaGameClient.sln
+++ b/Samples/XNA sample/XnaGameClient.sln
@@ -1,11 +1,13 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C# Express 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XnaGameClient", "XnaGameClient\XnaGameClient.csproj", "{D084E1C2-CE6B-42A5-918E-37EC7D2B5132}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XnaGameServer", "XnaGameServer\XnaGameServer.csproj", "{2A16EEC3-99B7-45D8-B185-6E1101225540}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "..\..\Lidgren.Network\Lidgren.Network.csproj", "{FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "..\..\Lidgren.Network\Lidgren.Network.csproj", "{AE483C29-042E-4226-BA52-D247CE7676DA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XnaGameClientContent", "XnaGameClient\Content\XnaGameClientContent.contentproj", "{416F5A82-22D8-4A94-BC19-4C6A24F34A73}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,16 +39,16 @@ Global
{2A16EEC3-99B7-45D8-B185-6E1101225540}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2A16EEC3-99B7-45D8-B185-6E1101225540}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2A16EEC3-99B7-45D8-B185-6E1101225540}.Release|x86.ActiveCfg = Release|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Release|Any CPU.Build.0 = Release|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}.Release|x86.ActiveCfg = Release|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {AE483C29-042E-4226-BA52-D247CE7676DA}.Release|x86.ActiveCfg = Release|Any CPU
{416F5A82-22D8-4A94-BC19-4C6A24F34A73}.Debug|Any CPU.ActiveCfg = Debug|x86
{416F5A82-22D8-4A94-BC19-4C6A24F34A73}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{416F5A82-22D8-4A94-BC19-4C6A24F34A73}.Debug|x86.ActiveCfg = Debug|x86
diff --git a/Samples/XNA sample/XnaGameClient/Content/obj/x86/Debug/ContentPipeline.xml b/Samples/XNA sample/XnaGameClient/Content/obj/x86/Debug/ContentPipeline.xml
index eee5fcc..802dd9b 100644
--- a/Samples/XNA sample/XnaGameClient/Content/obj/x86/Debug/ContentPipeline.xml
+++ b/Samples/XNA sample/XnaGameClient/Content/obj/x86/Debug/ContentPipeline.xml
@@ -7,8 +7,8 @@
TextureImporter
TextureProcessor
None
-
-
+
+
-
c2.png
@@ -16,8 +16,8 @@
TextureImporter
TextureProcessor
None
-
-
+
+
-
c3.png
@@ -25,8 +25,8 @@
TextureImporter
TextureProcessor
None
-
-
+
+
-
c4.png
@@ -34,8 +34,8 @@
TextureImporter
TextureProcessor
None
-
-
+
+
-
c5.png
@@ -43,47 +43,48 @@
TextureImporter
TextureProcessor
None
-
-
+
+
true
Windows
+ HiDef
Debug
false
- D:\dev\GoogleCode\lidgren-network\Generation3\Samples\XNA sample\XnaGameClient\Content\
- D:\dev\GoogleCode\lidgren-network\Generation3\Samples\XNA sample\XnaGameClient\
- D:\dev\GoogleCode\lidgren-network\Generation3\Samples\XNA sample\XnaGameClient\Content\obj\x86\Debug\
- D:\dev\GoogleCode\lidgren-network\Generation3\Samples\XNA sample\XnaGameClient\bin\x86\Debug\Content\
+ F:\dev\GoogleCode\lidgren-network-gen3\Samples\XNA sample\XnaGameClient\Content\
+ F:\dev\GoogleCode\lidgren-network-gen3\Samples\XNA sample\XnaGameClient\
+ F:\dev\GoogleCode\lidgren-network-gen3\Samples\XNA sample\XnaGameClient\Content\obj\x86\Debug\
+ F:\dev\GoogleCode\lidgren-network-gen3\Samples\XNA sample\XnaGameClient\bin\x86\Debug\Content\
- C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll
- 2009-05-28T01:16:14+02:00
+ C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll
+ 2010-08-23T12:41:18+02:00
- C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll
- 2009-05-28T01:16:06+02:00
+ C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll
+ 2010-08-23T12:41:18+02:00
- C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll
- 2009-05-28T01:16:16+02:00
+ C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll
+ 2010-08-23T12:41:18+02:00
- C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll
- 2009-05-28T01:16:26+02:00
+ C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll
+ 2010-08-23T12:41:18+02:00
- C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll
- 2009-05-28T01:16:12+02:00
+ C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll
+ 2010-08-23T12:41:18+02:00
- C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v3.1\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll
- 2009-05-28T01:16:06+02:00
+ C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll
+ 2010-08-23T12:41:18+02:00
- C:\Windows\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\3.1.0.0__6d5c3888ef60e27d\Microsoft.Xna.Framework.Content.Pipeline.dll
- 2010-01-22T07:58:48.0196058+01:00
+ C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll
+ 2010-10-29T20:35:38.8804757+02:00
diff --git a/Samples/XNA sample/XnaGameClient/Content/obj/x86/Debug/ResolveAssemblyReference.cache b/Samples/XNA sample/XnaGameClient/Content/obj/x86/Debug/ResolveAssemblyReference.cache
index 0824e13..9f2b931 100644
Binary files a/Samples/XNA sample/XnaGameClient/Content/obj/x86/Debug/ResolveAssemblyReference.cache and b/Samples/XNA sample/XnaGameClient/Content/obj/x86/Debug/ResolveAssemblyReference.cache differ
diff --git a/Samples/XNA sample/XnaGameClient/Game1.cs b/Samples/XNA sample/XnaGameClient/Game1.cs
index 6700946..f81c4af 100644
--- a/Samples/XNA sample/XnaGameClient/Game1.cs
+++ b/Samples/XNA sample/XnaGameClient/Game1.cs
@@ -108,16 +108,16 @@ namespace XnaGameClient
{
GraphicsDevice.Clear(Color.CornflowerBlue);
- spriteBatch.Begin(SpriteBlendMode.AlphaBlend);
+ spriteBatch.Begin(SpriteSortMode.Texture, BlendState.AlphaBlend);
// draw all players
- foreach (long who in positions.Keys)
+ foreach (var kvp in positions)
{
// use player unique identifier to choose an image
- int num = (int)Math.Abs(who) % 5;
+ int num = ((int)Math.Abs(kvp.Key)) % textures.Length;
// draw player
- spriteBatch.Draw(textures[num], positions[who], Color.White);
+ spriteBatch.Draw(textures[num], kvp.Value, Color.White);
}
spriteBatch.End();
diff --git a/Samples/XNA sample/XnaGameClient/XnaGameClient.csproj b/Samples/XNA sample/XnaGameClient/XnaGameClient.csproj
index 4ab28d6..cd681fc 100644
--- a/Samples/XNA sample/XnaGameClient/XnaGameClient.csproj
+++ b/Samples/XNA sample/XnaGameClient/XnaGameClient.csproj
@@ -1,4 +1,5 @@
-
+
+
{D084E1C2-CE6B-42A5-918E-37EC7D2B5132}
{6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
@@ -8,12 +9,23 @@
Properties
XnaGameClient
XnaGameClient
- v3.5
- v3.1
+ v4.0
+ v4.0
Windows
e7198d36-15ad-4289-ac23-fa03d866c3e5
Game.ico
GameThumbnail.png
+ false
+
+
+ Game
+ HiDef
+ Client
+
+
+
+
+ 3.5
publish\
true
Disk
@@ -26,7 +38,6 @@
true
0
1.0.0.%2a
- false
false
true
@@ -53,16 +64,38 @@
true
false
x86
- true
+ True
-
+
False
- True
-
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
False
- True
False
@@ -74,7 +107,9 @@
False
- 3.5
+ False
+
+
False
@@ -94,6 +129,11 @@
+
+ False
+ .NET Framework 3.5 SP1 Client Profile
+ false
+
False
.NET Framework 2.0 %28x86%29
@@ -109,6 +149,11 @@
.NET Framework 3.5
true
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
False
Windows Installer 3.1
@@ -119,12 +164,22 @@
Microsoft XNA Framework Redistributable 3.1
true
+
+ False
+ Microsoft XNA Framework Redistributable 4.0
+ true
+
{FA245447-5F23-4AA1-BD5F-8D2DDF33CFBD}
Lidgren.Network
+
+ {416F5A82-22D8-4A94-BC19-4C6A24F34A73}
+ XnaGameClientContent %28Content%29
+ Content
+
diff --git a/Samples/XNA sample/XnaGameClient/XnaGameClient.csproj.user b/Samples/XNA sample/XnaGameClient/XnaGameClient.csproj.user
index 86ec92b..35ff511 100644
--- a/Samples/XNA sample/XnaGameClient/XnaGameClient.csproj.user
+++ b/Samples/XNA sample/XnaGameClient/XnaGameClient.csproj.user
@@ -1,4 +1,5 @@
-
+
+
@@ -12,5 +13,6 @@
en-US
false
+
\ No newline at end of file
diff --git a/Samples/XNA sample/XnaGameServer/XnaGameServer.csproj b/Samples/XNA sample/XnaGameServer/XnaGameServer.csproj
index beade4f..747ece2 100644
--- a/Samples/XNA sample/XnaGameServer/XnaGameServer.csproj
+++ b/Samples/XNA sample/XnaGameServer/XnaGameServer.csproj
@@ -1,5 +1,5 @@
-
+
Debug
AnyCPU
@@ -10,8 +10,13 @@
Properties
XnaGameServer
XnaGameServer
- v3.5
+ v4.0
512
+
+
+
+
+ 3.5
true