Add Changes for CE v1.11.1

bilgincoskun · Aug 23, 2022 · be68246 · be68246
1 parent f1823c4
commit be68246
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -44,6 +44,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lint {
+        abortOnError false
+    }
     if (!project.hasProperty('EXCLUDE_NATIVE_LIBS')) {
         sourceSets.main {
             jniLibs.srcDir 'libs'
@@ -55,10 +58,7 @@ android {
         }
 
     }
-    lintOptions {
-        abortOnError false
-    }
-
+
     if (buildAsLibrary) {
         libraryVariants.all { variant ->
             variant.outputs.each { output ->

diff --git a/app/jni/src/platform/display.c b/app/jni/src/platform/display.c
@@ -340,13 +340,13 @@ void draw_screen() {
             double width = (COLS - LEFT_PANEL_WIDTH) * cell_w / zoom_level;
             double height = (ROWS - TOP_LOG_HEIGIHT - BOTTOM_BUTTONS_HEIGHT) * cell_h / zoom_level;
             int x, y;
-            if (zoom_mode == 2 && rogue.cursorLoc[0] >= 0 && rogue.cursorLoc[1] >= 0 &&
+            if (zoom_mode == 2 && rogue.cursorLoc.x >= 0 && rogue.cursorLoc.y >= 0 &&
                 !rogue.automationActive && !rogue.autoPlayingLevel && rogue.disturbed) {
-                x = rogue.cursorLoc[0];
-                y = rogue.cursorLoc[1];
+                x = rogue.cursorLoc.x;
+                y = rogue.cursorLoc.y;
             } else {
-                x = player.xLoc;
-                y = player.yLoc;
+                x = player.loc.x;
+                y = player.loc.y;
             }
             int center_x = x * cell_w + left_panel_box.w - width / 2;
             int center_y = y * cell_h + log_panel_box.h - height / 2;