Merge branch 'master' of manuel-voegele.de:inf3

overnight merge, hatte vergessen zu commiten als ich fertig war gestern :D
This commit is contained in:
Wafa Sadri
2014-04-11 08:47:39 +02:00
2 changed files with 57 additions and 7 deletions

View File

@@ -42,6 +42,16 @@ namespace Frontend
Players.Remove (player.GetId ());
}
public void clearPlayers ()
{
Players.Clear ();
}
public void clearDragons ()
{
Dragons.Clear ();
}
public Player getPlayer (int playerId)
{
return Players[playerId];

View File

@@ -214,9 +214,26 @@ namespace WorldOfPeacecraft
//OK das ist hier so'n bissle der gleiche scheiß wie "Answer" wie soll das gehn, ohne Block!?
}
private void ProcessChallenge (Block block)
private void ProcessChallenge (Block challengeBlock)
{
//TODO -> Samed
int id = challengeBlock.GetIntValue("id");
String type;
switch (challengeBlock.GetStringValue())
{
case "DRAGON":
type = "Dragon";
break;
case "STAGHUNT":
type = "Staghunt";
break;
case "SKIRMISCH":
type = "Skirmisch";
break;
}
bool accepted = challengeBlock.GetBoolValue("accepted");
//Challenge c = new Challenge(id, type, accepted);
//CHALLENGE: "begin:challenge","id:",INT,"type:",("DRAGON"|"STAGHUNT"|"SKIRMISH"),"accepted:",BOOLEAN,"end:challenge"
}
private void ProcessPlayer (Block playerBlock)
@@ -230,6 +247,11 @@ namespace WorldOfPeacecraft
//Player p = new Player(points, id, busy, desc, x, y,);
}
private void ProcessMapcell (Block mapcellBlock)
{
backend.getMapObject().SetTile(MapMapcell(mapcellBlock));
}
private void ProcessYourid (Block yourIdBlock)
{
LinkedList <string> unnamedValues = yourIdBlock.GetUnnamedValues ();
@@ -250,18 +272,36 @@ namespace WorldOfPeacecraft
//TODO -> Wafa
}
private void ProcessEntities (Block block)
private void ProcessEntities (Block entitiesBlock)
{
// TODO -> Manu
backend.clearDragons ();
backend.clearPlayers ();
foreach (Block entityBlock in entitiesBlock.GetBlocks ()) {
switch (entityBlock.GetName()) {
case MessPlayer:
backend.SetPlayer(MapPlayer(entityBlock));
break;
case MessDragon:
backend.SetDragon(MapDragon(entityBlock));
break;
default:
ThrowUnknownBlockException(entitiesBlock, entityBlock);
break;
}
}
}
private void ProcessPlayers (Block block)
private void ProcessPlayers (Block playersBlock)
{
// TODO -> Manu
backend.clearPlayers ();
foreach (Block playerBlock in playersBlock.GetBlocks ()) {
backend.SetPlayer(MapPlayer(playerBlock));
}
}
private void ProcessDragon (Block block)
private void ProcessDragon (Block dragonBlock)
{
backend.SetDragon(MapDragon(dragonBlock));
}
private Dragon MapDragon (Block dragonBlock)