|
@@ -46,17 +46,17 @@ Richtung getRichtungFromString( Text str )
|
|
|
|
|
|
bool operator==( VariableTyp a, VariableTyp b )
|
|
bool operator==( VariableTyp a, VariableTyp b )
|
|
{
|
|
{
|
|
- if( a == GAME_OBJEKT || b == GAME_OBJEKT )
|
|
|
|
|
|
+ if( a == (int)ALLE || b == (int)ALLE )
|
|
|
|
+ return 1;
|
|
|
|
+ if( a == (int)GAME_OBJEKT || b == (int)GAME_OBJEKT )
|
|
{
|
|
{
|
|
- return ( a == BARIERE || a == BASE || a == DROP || a == GEGENSTAND || a == GESCHOSS ||
|
|
|
|
- a == SCHALTER || a == SCHIENE || a == SPIELER || a == TIMER ||
|
|
|
|
- a == TUNNEL || a == UMLENKUNG || a == GAME_OBJEKT || a == ALLE ) &&
|
|
|
|
- ( b == BARIERE || b == BASE || b == DROP || b == GEGENSTAND || b == GESCHOSS ||
|
|
|
|
- b == SCHALTER || b == SCHIENE || b == SPIELER || b == TIMER || b == TUNNEL ||
|
|
|
|
- b == UMLENKUNG || b == GAME_OBJEKT || b == ALLE );
|
|
|
|
|
|
+ return ( a == (int)BARIERE || a == (int)BASE || a == (int)DROP || a == (int)GEGENSTAND || a == (int)GESCHOSS ||
|
|
|
|
+ a == (int)SCHALTER || a == (int)SCHIENE || a == (int)SPIELER || a == (int)TIMER ||
|
|
|
|
+ a == (int)TUNNEL || a == (int)UMLENKUNG || a == (int)GAME_OBJEKT || a == (int)ALLE ) &&
|
|
|
|
+ ( b == (int)BARIERE || b == (int)BASE || b == (int)DROP || b == (int)GEGENSTAND || b == (int)GESCHOSS ||
|
|
|
|
+ b == (int)SCHALTER || b == (int)SCHIENE || b == (int)SPIELER || b == (int)TIMER || b == (int)TUNNEL ||
|
|
|
|
+ b == (int)UMLENKUNG || b == (int)GAME_OBJEKT || b == (int)ALLE );
|
|
}
|
|
}
|
|
- if( a == ALLE || b == ALLE )
|
|
|
|
- return 1;
|
|
|
|
return (int)a == (int)b;
|
|
return (int)a == (int)b;
|
|
}
|
|
}
|
|
|
|
|