Skip to content
Snippets Groups Projects
Commit c8b6ac62 authored by Sillinger Péter's avatar Sillinger Péter
Browse files

Fixed communication bug.

parent eea597ac
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,7 @@ namespace zsirozas
/// </summary>
/// <param name="s">a message that will be written to the network stream</param>
void SendMessage(string s);
void ParseNextMessage(Stream s, object param);
void ParseNextMessage(StreamReader sr);
bool ValidateConnection(object connInfo);
}
......
......@@ -16,8 +16,8 @@ namespace zsirozas
public void NotifyPlayers(GameEvent @event)
{
string prefix = ServerEvent.GameEvent + "\n";
string message = prefix + @event;
//string prefix = ServerEvent.GameEvent + "\n";
string message = "";//prefix + @event;
switch (@event)
{
case GameEvent.CardAction:
......@@ -48,7 +48,8 @@ namespace zsirozas
}
for (int i = 0; i < playersByOrder.Length; i++)
{
gameServer.UsersByID[playersByOrder[i]].client.SendMessage(message);
//gameServer.UsersByID[playersByOrder[i]].client.SendMessage(message);
gameServer.UsersByID[playersByOrder[i]].client.InGameNotify(GameEvent.GameOver, message);
}
}
......
......@@ -121,17 +121,22 @@ namespace zsirozas
void ListenForServer()
{
try
using (var sr = new StreamReader(messageStream))
{
while (true)
{
ParseNextMessage(messageStream, null);
}
try
{
ParseNextMessage(sr);
}
catch (Exception ex)
{
//TODO: rossz debug módszer....
handleServerError(this, ex.Message);
return;
}
}
}
//using (var sr = new StreamReader(messageStream))
//{
// string line = "";
......@@ -217,9 +222,9 @@ namespace zsirozas
throw new NotImplementedException();
}
public void ParseNextMessage(Stream s, object param)
public void ParseNextMessage(StreamReader sr)
{
using (var sr = new StreamReader(s))
//using (var sr = new StreamReader(s))
{
try
{
......@@ -231,7 +236,7 @@ namespace zsirozas
var @event = (ServerEvent)Enum.Parse(typeof(ServerEvent), line);
if (@event == ServerEvent.GameEvent)
{
ParseGameMessage(sr, param);
ParseGameMessage(sr);
}
else
{
......@@ -253,14 +258,15 @@ namespace zsirozas
}
}
}
private void ParseGameMessage(StreamReader sr, object param)
private void ParseGameMessage(StreamReader sr)
{
//TODO: validálni
string line = sr.ReadLine();
GameEvent gameEvent;
Enum.TryParse(line, out gameEvent);
if (Enum.TryParse(line, out GameEvent gameEvent))
{
InGameNotify(gameEvent, sr.ReadLine());
}
}
public void InGameNotify(GameEvent @event, string param0)
{
......
......@@ -68,7 +68,7 @@ namespace zsirozas
return false;
}
public void ParseNextMessage(Stream s, object param)
public void ParseNextMessage(StreamReader sr)
{
throw new NotSupportedException("This is a proxy to the real app client. You shouldn't want to feed it message streams.");
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment