Ahora /limpiarmundo no borra el grh de los teleports

ao-libre · May 6, 2020 · a227bd6 · a227bd6
2 parents 7dfcb10 + 762a89e
commit a227bd6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/Changelog-server.txt b/Changelog-server.txt
@@ -994,4 +994,6 @@ Mapa 31, Mapa 32, Mapa 34, Mapa 35, Mapa 45, Mapa 78, Mapa 79, Mapa 87, Mapa 292
 
 - v0.13.37
 * 01/05/2020: Se parchea bug de clon de mochila y alforja prohibiendo tirar la misma al piso mientras esta equipada (Recox)
+* 05/05/2020: Se parchea bug de limpiar mundo, ahora no borra el grafico del teleport (Recox)
+* 05/05/2020: Se actualizan muchos mapas (ReyarB)
 ---
diff --git a/Codigo/InvUsuario.bas b/Codigo/InvUsuario.bas
@@ -587,13 +587,28 @@ Sub MakeObj(ByRef obj As obj, _
             End If
 
             '//Agregamos las pos de los objetos
-            If ObjData(obj.ObjIndex).OBJType <> otFogata And ItemNoEsDeMapa(ObjData(obj.ObjIndex).OBJType) Then
+            Dim IsNotObjFogata As Boolean
+            Dim IsNotObjTeleport As Boolean
+
+            IsNotObjFogata = ObjData(obj.ObjIndex).OBJType <> otFogata 
+            IsNotObjTeleport = ObjData(obj.ObjIndex).OBJType <> otTeleport 
+
+            If IsNotObjFogata And IsNotObjTeleport And ItemNoEsDeMapa(ObjData(obj.ObjIndex).OBJType) Then
                 Dim xPos As WorldPos
 
                 xPos.Map = Map
                 xPos.X = X
                 xPos.Y = Y
-                If (MapData(xPos.Map, xPos.X, xPos.Y).trigger <> eTrigger.CASA Or MapData(xPos.Map, xPos.X, xPos.Y).trigger <> eTrigger.BAJOTECHO) And MapData(xPos.Map, xPos.X, xPos.Y).Blocked <> 1 Then AgregarObjetoLimpieza xPos
+
+                Dim IsNotTileCasaTrigger As Boolean
+                Dim IsNotTileBajoTecho As Boolean
+                Dim IsNotTileBlocked As Boolean
+
+                IsNotTileCasaTrigger = MapData(xPos.Map, xPos.X, xPos.Y).trigger <> eTrigger.CASA 
+                IsNotTileBajoTecho = MapData(xPos.Map, xPos.X, xPos.Y).trigger <> eTrigger.BAJOTECHO
+                IsNotTileBlocked = MapData(xPos.Map, xPos.X, xPos.Y).Blocked <> 1
+
+                If (IsNotTileCasaTrigger Or IsNotTileBajoTecho) And IsNotTileBlocked Then AgregarObjetoLimpieza xPos
 
             End If