merge fixes

tecbeat · Dec 6, 2020 · 2e41765 · 2e41765
1 parent 545aafd
commit 2e41765
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/de/jspll/data/objects/game/tasks/CommonTask.java b/src/de/jspll/data/objects/game/tasks/CommonTask.java
@@ -23,7 +23,6 @@
  * @version 1.0
  */
 public class CommonTask implements Task {
-    private final Color maskColor = new Color(0, 0, 0, 172);
     // headings
     private final String goodHeading;
     private final String badHeading;

diff --git a/src/de/jspll/handlers/GraphicsHandler.java b/src/de/jspll/handlers/GraphicsHandler.java
@@ -29,10 +29,10 @@ public GraphicsHandler(String windowTitle, Dimension size, HandlerMode mode){
         frame_graphics.setClip(0,0,size.width,size.height);
         this.mode = mode;
         switch (mode){
-            case DIALOG:
+/*            case DIALOG:
                 dialog = new Secondary_window(windowTitle,slate,size);
                 cameras[0] = new Camera(624,377,(int) size.getWidth(),(int) size.getHeight(),2);
-                break;
+                break;*/
             case MAIN:
                 this.window = new de.jspll.graphics.Window(windowTitle,slate,size);
                 this.windowTitle = windowTitle;