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

[will]

Author: p
Date: 2006-11-12 02:17:13 -0500 (Sun, 12 Nov 2006)
New Revision: 118

Modified:
   trunk/skorpion/Client.cs
   trunk/skorpion/server/game/Server.cs
Log:
add rcon ball to reset ball in response 2 hax



Modified: trunk/skorpion/Client.cs
===================================================================
--- trunk/skorpion/Client.cs    2006-11-12 05:47:56 UTC (rev 117)
+++ trunk/skorpion/Client.cs    2006-11-12 07:17:13 UTC (rev 118)
@@ -209,6 +209,8 @@
                                {
                                        RconAck m = (RconAck)msg[i];
                                        Net.ACKQueue.ACK(m.ACK);
+                                       if (m.Response.Length > 0)
+                                               
GlobalState.Console.Print(m.Response);
                                }
                                else if (DisplayReq.TYPE == 
((GameMsg)msg[i]).Type)
                                {

Modified: trunk/skorpion/server/game/Server.cs
===================================================================
--- trunk/skorpion/server/game/Server.cs        2006-11-12 05:47:56 UTC (rev 
117)
+++ trunk/skorpion/server/game/Server.cs        2006-11-12 07:17:13 UTC (rev 
118)
@@ -90,7 +90,6 @@
                        ushort id = (ushort)Conns[conn];
                        Ship   s  = (Ship)Universe.Entities[id];
 
-
                        if (JoinReq.TYPE == GameMsg.Type)
                        {
                                JoinReq m = (JoinReq)GameMsg;
@@ -152,6 +151,7 @@
                                
                                RconAck r = new RconAck();
                                r.ACK = m.Seq;
+                               r.Response = "";
 
                                if (cmd == "auth")
                                {
@@ -173,19 +173,41 @@
                                        else
                                                r.Response = "Not 
Authenticated";                                               
                                }
+                               else if (cmd == "ball")
+                               {
+                                       if (player.Authd)
+                                       {
+                                               foreach(Entity e in 
Universe.Entities.Values) 
+                                               {
+                                                       if (e.Type == 
Ball.TYPE) 
+                                                       {
+                                                               e.Position = 
new Vector3(0,0,0);
+                                                               e.Velocity = 
new Vector3(0,0,0);
+                                                       }
+                                               }
+       
+                                               DisplayReq displayReq = new 
DisplayReq();
+                                               displayReq.Message = "*** " + 
player.Name + " reset ball";
+
+                                               
ServerState.NetServer.broadcastViaACKQueue(displayReq);
+                                       }
+                                       else
+                                       {
+                                               r.Response = "Not 
Authenticated";
+                                       }
+                               }
                                else if (cmd == "reset")
                                {
                                        Universe.Score1 = 0;
                                        Universe.Score2 = 0;
-                                       r.Response = "*** " + player.Name + " 
reset score";
+
                                        DisplayReq displayReq = new 
DisplayReq();
-                                       displayReq.Message = r.Response;
+                                       displayReq.Message = "*** " + 
player.Name + " reset score";
 
                                        
ServerState.NetServer.broadcastViaACKQueue(displayReq);
                                }
                                else if (cmd == "say")
                                {
-                                       r.Response = "Message Sent: " + args;
                                        DisplayReq displayReq = new 
DisplayReq();
                                        displayReq.Message = "<" + player.Name 
+ "> " + args;
 
@@ -193,20 +215,18 @@
                                }
                                else if (cmd == "name")
                                {
-                                       r.Response = "*** " + player.Name + " 
changed name to " + args;
                                        player.Name = args;
                                        s.Name = player.Name;
 
                                        DisplayReq displayReq = new 
DisplayReq();
-                                       displayReq.Message = r.Response;
+                                       displayReq.Message = "*** " + 
player.Name + " changed name to " + args;
 
                                        
ServerState.NetServer.broadcastViaACKQueue(displayReq);
                                }
                                else if (cmd == "snapin")
                                {
-                                       r.Response = "*** " + player.Name + " 
snapped in";
                                        DisplayReq displayReq = new 
DisplayReq();
-                                       displayReq.Message = r.Response;
+                                       displayReq.Message = "*** " + 
player.Name + " snapped in";
                                        
ServerState.NetServer.broadcastViaACKQueue(displayReq);
                                        s.Snapped = true;
                                        s.Position = new Vector3(0,-92,0);
@@ -215,9 +235,8 @@
                                }
                                else if (cmd == "snapout")
                                {
-                                       r.Response = "*** " + player.Name + " 
snapped out";
                                        DisplayReq displayReq = new 
DisplayReq();
-                                       displayReq.Message = r.Response;
+                                       displayReq.Message = "*** " + 
player.Name + " snapped out";
                                        
ServerState.NetServer.broadcastViaACKQueue(displayReq);
                                        s.Snapped = false;
                                        s.Position = new Vector3(0,1000,0);