[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cinvoke-svn] r122 - in trunk/skorpion: . server/game
|
From: |
will |
|
Subject: |
[cinvoke-svn] r122 - in trunk/skorpion: . server/game |
|
Date: |
14 Nov 2006 21:13:23 -0500 |
Author: p
Date: 2006-11-14 21:13:22 -0500 (Tue, 14 Nov 2006)
New Revision: 122
Added:
trunk/skorpion/TestDX.cs
trunk/skorpion/mdxredist_2902.msi
trunk/skorpion/skorpion.nsi
Modified:
trunk/skorpion/Form1.cs
trunk/skorpion/PlayerList.cs
trunk/skorpion/server/game/Server.cs
trunk/skorpion/skorpion.cs
trunk/skorpion/skorpion.csproj
Log:
fuk u microsloth!!!!!!!!
Modified: trunk/skorpion/Form1.cs
===================================================================
--- trunk/skorpion/Form1.cs 2006-11-13 07:00:51 UTC (rev 121)
+++ trunk/skorpion/Form1.cs 2006-11-15 02:13:22 UTC (rev 122)
@@ -105,27 +105,14 @@
Application.Exit();
}
- bool TestDX()
+ void go()
{
- bool ret = true;
- try
- {
- Microsoft.DirectX.Vector3 TEST_DX = new
Microsoft.DirectX.Vector3(0,0,0);
- TEST_DX.Normalize();
- }
- catch(Exception e)
- {
- ret = false;
+ try { TestDX.Test(); }
+ catch(Exception e) {
System.Windows.Forms.MessageBox.Show("DX
runtime not found: " + e.ToString());
+ return;
}
- return ret;
- }
- void go()
- {
- if (!TestDX())
- return;
-
GlobalState.Form = this;
// skorpion expects ./assets
Modified: trunk/skorpion/PlayerList.cs
===================================================================
--- trunk/skorpion/PlayerList.cs 2006-11-13 07:00:51 UTC (rev 121)
+++ trunk/skorpion/PlayerList.cs 2006-11-15 02:13:22 UTC (rev 122)
@@ -128,9 +128,9 @@
if (playerLine.Length > 16)
playerLine = playerLine.Substring(0,16);
int len = playerLine.Length;
while (playerLine.Length < 20)
playerLine += " ";
+ playerLine += ship.Score;
+ while (playerLine.Length < 31)
playerLine += " ";
playerLine += ship.Ping;
- while (playerLine.Length < 31)
playerLine += " ";
- playerLine += ship.Score;
_font.DrawText(null,
playerLine, new System.Drawing.Point(_leftMargin+10, line), black);
line += this.LineHeight;
}
Added: trunk/skorpion/TestDX.cs
===================================================================
--- trunk/skorpion/TestDX.cs (rev 0)
+++ trunk/skorpion/TestDX.cs 2006-11-15 02:13:22 UTC (rev 122)
@@ -0,0 +1,17 @@
+using System;
+using Microsoft.DirectX;
+using Microsoft.DirectX.Direct3D;
+using Microsoft.DirectX.DirectInput;
+
+namespace skorpion
+{
+ public class TestDX
+ {
+ public static void Test()
+ {
+ // this will go for Direct3DX.dll which is the most
likely not to
+ Microsoft.DirectX.Direct3D.Font font = null;
+ if (font != null) {}
+ }
+ }
+}
\ No newline at end of file
Added: trunk/skorpion/mdxredist_2902.msi
===================================================================
(Binary files differ)
Property changes on: trunk/skorpion/mdxredist_2902.msi
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skorpion/server/game/Server.cs
===================================================================
--- trunk/skorpion/server/game/Server.cs 2006-11-13 07:00:51 UTC (rev
121)
+++ trunk/skorpion/server/game/Server.cs 2006-11-15 02:13:22 UTC (rev
122)
@@ -215,13 +215,11 @@
}
else if (cmd == "name")
{
- player.Name = args;
- s.Name = player.Name;
-
DisplayReq displayReq = new
DisplayReq();
displayReq.Message = "*** " +
player.Name + " changed name to " + args;
-
ServerState.NetServer.broadcastViaACKQueue(displayReq);
+ player.Name = args;
+ s.Name = player.Name;
}
else if (cmd == "snapin")
{
Modified: trunk/skorpion/skorpion.cs
===================================================================
--- trunk/skorpion/skorpion.cs 2006-11-13 07:00:51 UTC (rev 121)
+++ trunk/skorpion/skorpion.cs 2006-11-15 02:13:22 UTC (rev 122)
@@ -40,6 +40,7 @@
public static CreateFlags DevFlags =
CreateFlags.HardwareVertexProcessing;
public static ushort Team = 1;
+ public static bool Thrusters = false;
public static bool ClientStart = true;
public static string ClientConnect = "pleep.com";
@@ -553,18 +554,22 @@
if (e2.Type == Ship.TYPE)
{
iDevice.Transform.World =
Matrix.Translation(e2.Position.X, e2.Position.Y, e2.Position.Z);
- iThrusterParticleSystem.Update(.03F,
-
g_clrColor[(int)iThrusterParticleColor],
-
g_clrColorFade[(int)iThrusterParticleColor],
- new Vector3(0f, 0f, 0f), new
Vector3(0f, 0f, .1f));
- iDevice.RenderState.ZBufferWriteEnable
= false;
- iDevice.RenderState.AlphaBlendEnable =
true;
- iDevice.RenderState.SourceBlend =
Blend.One;
- iDevice.RenderState.DestinationBlend =
Blend.One;
- iDevice.SetTexture(0,
iThrusterParticleTexture);
- iThrusterParticleSystem.Render(iDevice);
- iDevice.RenderState.ZBufferWriteEnable
= true;
- iDevice.RenderState.AlphaBlendEnable =
false;
+
+ if (ClientConfig.Thrusters)
+ {
+
iThrusterParticleSystem.Update(.03F,
+
g_clrColor[(int)iThrusterParticleColor],
+
g_clrColorFade[(int)iThrusterParticleColor],
+ new Vector3(0f, 0f,
0f), new Vector3(0f, 0f, .1f));
+
iDevice.RenderState.ZBufferWriteEnable = false;
+
iDevice.RenderState.AlphaBlendEnable = true;
+ iDevice.RenderState.SourceBlend
= Blend.One;
+
iDevice.RenderState.DestinationBlend = Blend.One;
+ iDevice.SetTexture(0,
iThrusterParticleTexture);
+
iThrusterParticleSystem.Render(iDevice);
+
iDevice.RenderState.ZBufferWriteEnable = true;
+
iDevice.RenderState.AlphaBlendEnable = false;
+ }
}
}
Modified: trunk/skorpion/skorpion.csproj
===================================================================
--- trunk/skorpion/skorpion.csproj 2006-11-13 07:00:51 UTC (rev 121)
+++ trunk/skorpion/skorpion.csproj 2006-11-15 02:13:22 UTC (rev 122)
@@ -177,6 +177,11 @@
SubType = "Code"
BuildAction = "Compile"
/>
+ <File
+ RelPath = "TestDX.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
</Include>
</Files>
</CSHARP>
Added: trunk/skorpion/skorpion.nsi
===================================================================
--- trunk/skorpion/skorpion.nsi (rev 0)
+++ trunk/skorpion/skorpion.nsi 2006-11-15 02:13:22 UTC (rev 122)
@@ -0,0 +1,33 @@
+Name "skorpion"
+OutFile "skorpinst.exe"
+InstallDir $DESKTOP\skorpion
+
+Page directory
+Page instfiles
+
+Section "";
+
+SetOutPath "$WINDIR\Temp"
+File "mdxredist_2902.msi"
+ExecWait '"msiexec" /i $\"$WINDIR\Temp\mdxredist_2902.msi$\"'
+
+SetOutPath $INSTDIR
+File bin\Release\skorpion.exe
+File bin\Release\server.dll
+
+SetOutPath "$INSTDIR\assets"
+File assets\Particle.bmp
+File assets\starmap.dds
+
+SetOutPath "$INSTDIR\assets\a1a"
+File assets\a1a\a1a.obj
+File assets\a1a\default.png
+
+SetOutPath "$INSTDIR\assets\skorpion"
+File assets\skorpion\default.jpg
+File assets\skorpion\skorpion.obj
+
+SectionEnd
+
+
+
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cinvoke-svn] r122 - in trunk/skorpion: . server/game,
will <=