From 2255d028e140d7d29e9c1db3dd9c64ccd564e548 Mon Sep 17 00:00:00 2001
From: Gouvernathor <44340603+Gouvernathor@users.noreply.github.com>
Date: Thu, 16 Nov 2023 01:11:38 +0100
Subject: [PATCH] Remove unnecessary screen variable

(cherry picked from commit b222860bec0b6ed6f4210239a51c4c572c3e597d)
---
 game/scripts/interface/map.rpy | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/game/scripts/interface/map.rpy b/game/scripts/interface/map.rpy
index 97b91492..81a17286 100644
--- a/game/scripts/interface/map.rpy
+++ b/game/scripts/interface/map.rpy
@@ -392,14 +392,12 @@ screen map_screen_characters():
     tag map
     zorder 5
 
-    $ UI_xpos_offset = 0
-
     #Hermione
     if states.her.unlocked:
         if states.her.map_location == "forest": # Mark forest event.
-            add "interface/achievements/glow.webp" pos (UI_xpos_offset+her_map_xpos, UI_ypos_offset+her_map_ypos) align (0.5, 0.5) zoom 0.15 alpha 0.5 at rotate_circular
+            add "interface/achievements/glow.webp" pos (her_map_xpos, UI_ypos_offset+her_map_ypos) align (0.5, 0.5) zoom 0.15 alpha 0.5 at rotate_circular
         imagebutton:
-            xpos +UI_xpos_offset +her_map_xpos
+            xpos her_map_xpos
             ypos +UI_ypos_offset +her_map_ypos
             xalign 0.5
             yalign 0.5
@@ -412,7 +410,7 @@ screen map_screen_characters():
     #Luna
     if states.lun.unlocked:
         imagebutton:
-            xpos UI_xpos_offset+ lun_map_xpos
+            xpos lun_map_xpos
             ypos UI_ypos_offset+ lun_map_ypos
             xalign 0.5
             yalign 0.5
@@ -425,7 +423,7 @@ screen map_screen_characters():
     #Astoria
     if states.ast.unlocked:
         imagebutton:
-            xpos UI_xpos_offset +ast_map_xpos
+            xpos ast_map_xpos
             ypos UI_ypos_offset +ast_map_ypos
             xalign 0.5
             yalign 0.5
@@ -438,7 +436,7 @@ screen map_screen_characters():
     #Susan
     if states.sus.unlocked:
         imagebutton:
-            xpos UI_xpos_offset +sus_map_xpos
+            xpos sus_map_xpos
             ypos UI_ypos_offset +sus_map_ypos
             xalign 0.5
             yalign 0.5
@@ -451,7 +449,7 @@ screen map_screen_characters():
     #Cho
     if states.cho.unlocked:
         imagebutton:
-            xpos UI_xpos_offset +cho_map_xpos
+            xpos cho_map_xpos
             ypos UI_ypos_offset +cho_map_ypos
             xalign 0.5
             yalign 0.5
@@ -464,7 +462,7 @@ screen map_screen_characters():
     #Snape
     if states.sna.unlocked:
         imagebutton:
-            xpos UI_xpos_offset +sna_map_xpos
+            xpos sna_map_xpos
             ypos UI_ypos_offset +sna_map_ypos
             xalign 0.5
             yalign 0.5
@@ -477,7 +475,7 @@ screen map_screen_characters():
     #Tonks
     if states.ton.unlocked:
         imagebutton:
-            xpos UI_xpos_offset +ton_map_xpos
+            xpos ton_map_xpos
             ypos UI_ypos_offset +ton_map_ypos
             xalign 0.5
             yalign 0.5