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

This commit is contained in:
2014-04-10 18:15:15 +02:00

View File

@@ -213,7 +213,7 @@ namespace WorldOfPeacecraft
//TODO -> Samed //TODO -> Samed
int id = challengeBlock.GetIntValue("id"); int id = challengeBlock.GetIntValue("id");
String type; String type;
switch (challengeBlock.GetType().ToString()) switch (challengeBlock.GetStringValue())
{ {
case "DRAGON": case "DRAGON":
type = "Dragon"; type = "Dragon";
@@ -226,6 +226,7 @@ namespace WorldOfPeacecraft
break; break;
} }
bool accepted = challengeBlock.GetBoolValue("accepted"); 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" //CHALLENGE: "begin:challenge","id:",INT,"type:",("DRAGON"|"STAGHUNT"|"SKIRMISH"),"accepted:",BOOLEAN,"end:challenge"
} }
@@ -277,6 +278,7 @@ namespace WorldOfPeacecraft
string desc = dragonBlock.GetStringValue("desc"); string desc = dragonBlock.GetStringValue("desc");
int x = dragonBlock.GetIntValue("x"); int x = dragonBlock.GetIntValue("x");
int y = dragonBlock.GetIntValue("y"); int y = dragonBlock.GetIntValue("y");
//Dragon d p = new Dragon(id, busy, desc, x, y);
//DRAGON: "begin:dragon", "id:",INT,"type:Dragon","busy:"BOOLEAN,"desc:"STRING,"x:",INT,"y:",INT,"end:dragon" //DRAGON: "begin:dragon", "id:",INT,"type:Dragon","busy:"BOOLEAN,"desc:"STRING,"x:",INT,"y:",INT,"end:dragon"
} }