diff --git a/MUDCompiler/bin/Debug/..svnbridge/.svnbridge b/MUDCompiler/bin/Debug/..svnbridge/.svnbridge
index 5b3e6d1..a742dbc 100644
--- a/MUDCompiler/bin/Debug/..svnbridge/.svnbridge
+++ b/MUDCompiler/bin/Debug/..svnbridge/.svnbridge
@@ -6,4 +6,5 @@ MudEngine.dll
MudEngine.pdb
startup.dat
temp
+Scripts.dll
\ No newline at end of file
diff --git a/MUDCompiler/bin/Debug/Scripts/..svnbridge/.svnbridge b/MUDCompiler/bin/Debug/Scripts/..svnbridge/.svnbridge
new file mode 100644
index 0000000..e8a0715
--- /dev/null
+++ b/MUDCompiler/bin/Debug/Scripts/..svnbridge/.svnbridge
@@ -0,0 +1,2 @@
+svn:ignoreCommandChat.mud
+
\ No newline at end of file
diff --git a/MudEngine/GameObjects/Characters/BaseCharacter.cs b/MudEngine/GameObjects/Characters/BaseCharacter.cs
index 70ada62..d400a13 100644
--- a/MudEngine/GameObjects/Characters/BaseCharacter.cs
+++ b/MudEngine/GameObjects/Characters/BaseCharacter.cs
@@ -110,9 +110,6 @@ namespace MudEngine.GameObjects.Characters
System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
str = enc.GetString(data);
- if (Game.IsDebug)
- Log.Write("Client entered command: " + str);
-
// execute, and get result
str = ExecuteCommand(str);
diff --git a/MudEngine/Networking/Server.cs b/MudEngine/Networking/Server.cs
index bdb8e33..f0e0b83 100644
--- a/MudEngine/Networking/Server.cs
+++ b/MudEngine/Networking/Server.cs
@@ -7,6 +7,7 @@ using System.Net.Sockets;
using System.Threading;
using MudEngine.GameObjects.Characters;
+using MudEngine.GameManagement;
/* Usage:
* Server MUDServer = new Server();
@@ -84,6 +85,7 @@ namespace MudEngine.Networking
} while (sub < 0);
players[sub].client = server.Accept();
players[sub].Initialize();
+ Log.Write("New Player Connected.");
//ParameterizedThreadStart start = new ParameterizedThreadStart(ReceiveThread);
clientThreads[sub] = new Thread(ReceiveThread);
clientThreads[sub].Start((object)sub);
@@ -92,7 +94,6 @@ namespace MudEngine.Networking
private void ReceiveThread(object obj)
{
int sub = (int)obj;
- MudEngine.GameManagement.Log.Write("Receiving client data...");
while (stage == 2 && players[sub].IsActive)
{
try
diff --git a/MudServer/Program.cs b/MudServer/Program.cs
index 6ba31b0..d7cd410 100644
--- a/MudServer/Program.cs
+++ b/MudServer/Program.cs
@@ -6,6 +6,7 @@ using System.Text;
using MudEngine.FileSystem;
using MudEngine.GameManagement;
+using MudEngine.GameObjects.Characters;
using MUDGame; //Pulling this from the example game, no sense re-writing what already exists.
namespace MudServer
@@ -16,9 +17,11 @@ namespace MudServer
{
Game game = new Game();
Zeroth realm = new Zeroth(game);
-
+
realm.BuildZeroth();
+ BaseCharacter serverAdmin = new BaseCharacter(game);
+
//Setup the game
game.AutoSave = true;
game.BaseCurrencyName = "Copper";
@@ -40,12 +43,23 @@ namespace MudServer
Game.IsDebug = true;
game.Start();
+ string command = "";
while (game.IsRunning)
{
- Console.Write(Log.GetMessages());
- Log.FlushMessages();
- System.Threading.Thread.Sleep(1);
+ if (!Console.KeyAvailable)
+ {
+ Console.Write(Log.GetMessages());
+ Log.FlushMessages();
+ System.Threading.Thread.Sleep(1);
+ }
+ //TODO: Fix Me D:
+ else if (Console.ReadKey().Key == ConsoleKey.Enter)
+ CommandEngine.ExecuteCommand(command, serverAdmin);
+ else if (Console.ReadKey().Key == ConsoleKey.Backspace)
+ Log.Write("Backspace is not currently supported :(");
+ else
+ command += Console.ReadKey().KeyChar;
}
}
}
diff --git a/MudServer/bin/Debug/..svnbridge/.svnbridge b/MudServer/bin/Debug/..svnbridge/.svnbridge
new file mode 100644
index 0000000..760e94f
--- /dev/null
+++ b/MudServer/bin/Debug/..svnbridge/.svnbridge
@@ -0,0 +1,9 @@
+svn:ignoreLog.txt
+MudEngine.dll
+MudEngine.pdb
+MudServer.exe
+MudServer.pdb
+MudServer.vshost.exe
+MudServer.vshost.exe.manifest
+startup.dat
+
\ No newline at end of file