[cinvoke-svn] r123 - in trunk/skorpion: . server/game server/universe

[will]

Author: p
Date: 2006-11-16 11:13:23 -0500 (Thu, 16 Nov 2006)
New Revision: 123

Modified:
   trunk/skorpion/Form1.cs
   trunk/skorpion/server/game/Server.cs
   trunk/skorpion/server/universe/Universe.cs
   trunk/skorpion/skorpion.nsi
Log:
- change physics
- make installer register url handler and dont doubly install managed directx
- change to exe directory at startup



Modified: trunk/skorpion/Form1.cs
===================================================================
--- trunk/skorpion/Form1.cs     2006-11-15 02:13:22 UTC (rev 122)
+++ trunk/skorpion/Form1.cs     2006-11-16 16:13:23 UTC (rev 123)
@@ -114,6 +114,7 @@
                        }
 
                        GlobalState.Form = this;
+                       Environment.CurrentDirectory = 
System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
                        // skorpion expects ./assets
                        string dirname = 
Path.GetFileName(Directory.GetCurrentDirectory());

Modified: trunk/skorpion/server/game/Server.cs
===================================================================
--- trunk/skorpion/server/game/Server.cs        2006-11-15 02:13:22 UTC (rev 
122)
+++ trunk/skorpion/server/game/Server.cs        2006-11-16 16:13:23 UTC (rev 
123)
@@ -126,6 +126,7 @@
                                s.Orientation.Normalize();
                                s.UpDirection.Normalize();
                                s.Velocity.Normalize();
+                               s.Velocity *= 1.35f;
 
                                if (m.Burst != 0)
                                        s.Burst = m.Burst;

Modified: trunk/skorpion/server/universe/Universe.cs
===================================================================
--- trunk/skorpion/server/universe/Universe.cs  2006-11-15 02:13:22 UTC (rev 
122)
+++ trunk/skorpion/server/universe/Universe.cs  2006-11-16 16:13:23 UTC (rev 
123)
@@ -399,7 +399,7 @@
                                                        r2.time -= CE.gameTime;
 
                                                        Bounce(e2, 
s.Orientation, s.Velocity);
-                                                       e2.Velocity *= 1.3f;
+                                                       e2.Velocity *= 1.5f;
                                                        b.LastTouched = s.ID;
 
                                                        alreadyCollided[r1] = 
true;
@@ -414,7 +414,7 @@
                        {
                                if (r.e.Type == Ball.TYPE)
                                {
-                                       r.e.Velocity *= 0.96f;
+                                       r.e.Velocity *= 0.92f;
                                }
 
                                r.e.Position += r.e.Velocity * r.time;
@@ -511,27 +511,27 @@
                                {
                                        case 0:
                                                if(e1.Velocity.Z > 0)
-                                                       e1.Velocity.Z *= -1;
+                                                       e1.Velocity.Z *= -0.9f;
                                                break;
                                        case 1:
                                                if(e1.Velocity.X < 0)
-                                                       e1.Velocity.X *= -1;
+                                                       e1.Velocity.X *= -0.9f;
                                                break;
                                        case 2:
                                                if(e1.Velocity.Y > 0)
-                                                       e1.Velocity.Y *= -1;
+                                                       e1.Velocity.Y *= -0.9f;
                                                break;
                                        case 3:
                                                if(e1.Velocity.X > 0)
-                                                       e1.Velocity.X *= -1;
+                                                       e1.Velocity.X *= -0.9f;
                                                break;
                                        case 4:
                                                if(e1.Velocity.Y < 0)
-                                                       e1.Velocity.Y *= -1;
+                                                       e1.Velocity.Y *= -0.9f;
                                                break;
                                        case 5:
                                                if(e1.Velocity.Z < 0)
-                                                       e1.Velocity.Z *= -1;
+                                                       e1.Velocity.Z *= -0.9f;
                                                break;
                                }
                        }

Modified: trunk/skorpion/skorpion.nsi
===================================================================
--- trunk/skorpion/skorpion.nsi 2006-11-15 02:13:22 UTC (rev 122)
+++ trunk/skorpion/skorpion.nsi 2006-11-16 16:13:23 UTC (rev 123)
@@ -1,16 +1,20 @@
 Name "skorpion"
 OutFile "skorpinst.exe"
-InstallDir $DESKTOP\skorpion
+InstallDir $PROGRAMFILES\skorpion
 
 Page directory
 Page instfiles
 
 Section "";
 
+IfFileExists "$WINDIR\Microsoft.NET\DirectX for Managed 
Code\1.0.2902.0\Microsoft.DirectX.Direct3DX.dll" MainInstall
+
 SetOutPath "$WINDIR\Temp"
 File "mdxredist_2902.msi"
 ExecWait '"msiexec" /i $\"$WINDIR\Temp\mdxredist_2902.msi$\"'
 
+MainInstall:
+
 SetOutPath $INSTDIR
 File bin\Release\skorpion.exe
 File bin\Release\server.dll
@@ -27,6 +31,11 @@
 File assets\skorpion\default.jpg
 File assets\skorpion\skorpion.obj
 
+WriteRegStr HKCR "ssb6006" "" "URL:SSB6006 Protocol"
+WriteRegStr HKCR "ssb6006" "URL Protocol" ""
+WriteRegStr HKCR "ssb6006\DefaultIcon" "" "skorpion.exe"
+WriteRegStr HKCR "ssb6006\shell\open\command" "" "$INSTDIR\skorpion.exe 
$\"%1$\""
+
 SectionEnd