Skip to content
Snippets Groups Projects
Commit 337db5aa authored by Huber-Saffer, Lasse's avatar Huber-Saffer, Lasse :desktop:
Browse files

Merge branch 'dev' into 'bba4495-dev-patch-52153'

# Conflicts:
#   Turtle.java
parents 8b2e3f0c 95e443e7
No related branches found
No related tags found
2 merge requests!3Remove redundant colors and method to get colors,!1Fixed undefined ordering of the Turtle color array to conform to docs of setzeFarbe(int)
*.ctxt
*.class
\ No newline at end of file
...@@ -67,11 +67,17 @@ public class Turtle ...@@ -67,11 +67,17 @@ public class Turtle
FARBEN.put("gruen", Color.GREEN); FARBEN.put("gruen", Color.GREEN);
FARBEN.put("hellgrau", Color.LIGHT_GRAY); FARBEN.put("hellgrau", Color.LIGHT_GRAY);
FARBEN.put("magenta", Color.MAGENTA); FARBEN.put("magenta", Color.MAGENTA);
FARBEN.put("orange", Color.ORANGE);
FARBEN.put("pink", Color.PINK); FARBEN.put("pink", Color.PINK);
FARBEN.put("rot", Color.RED); FARBEN.put("gelb", Color.YELLOW);
FARBEN.put("schwarz", Color.BLACK);
FARBEN.put("weiss", Color.WHITE); FARBEN.put("weiss", Color.WHITE);
FARBEN.put("gelb", Color.YELLOW); FARBEN.put("cyan", Color.CYAN);
FARBEN.put("grau", Color.GRAY);
FARBEN.put("blau", Color.BLUE);
FARBEN.put("orange", Color.ORANGE);
FARBEN.put("gruen", Color.GREEN);
FARBEN.put("rot", Color.RED);
FARBEN.put("dunkelgrau", Color.DARK_GRAY);
FARB_ARRAY = FARBEN.values().toArray(new Color[FARBEN.size()]); FARB_ARRAY = FARBEN.values().toArray(new Color[FARBEN.size()]);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment