fix(TRSObject): fixed finding them without a TColorFinder and not TModel

- fixed a small bug for the cpp client where window resizing was not coded properly

Author: Torwent

osrs/interfaces/login/login.simba

@@ -583,7 +583,7 @@ before giving up.
 *)
 procedure TRSLogin.SwitchWorld(worlds: TIntegerArray);
 var
-  attempt, time: Integer;
+  attempt: Integer;
 begin
   for attempt := 0 to 4 do
   begin

osrs/position/map/entities.simba

@@ -323,25 +323,27 @@ begin
     Exit;
   end;
 
+  if Self.Model <> nil then
+    Exit(boundsArray);
+
   for i := 0 to High(boundsArray) do
-    Result += TPointArray(boundsArray[i]).ShapeFill();
+    Result += TPointArray(boundsArray[i]).Connect().ShapeFill();
 end;
 
 (*
-## TRSEntityV2.Find
+## TRSEntity.FindEx
 ```pascal
-function TRSEntityV2.FindEx(out cuboids: TCuboidArray; out atpa: T2DPointArray): Boolean;
-function TRSEntityV2.Find(out atpa: T2DPointArray): Boolean;
-function TRSEntityV2.FindFromPosition(me: TPoint; out atpa: T2DPointArray): Boolean;
+function TRSEntity.FindEx(me: TPoint; out boundsArray: TPolygonArray; out coordinates: TPointArray; out atpa: T2DPointArray): Boolean;
 ```
-TRSEntityV2 method used to find a {ref}`TRSEntityV2`. If found returns true, if not returns false.
-The "extended" method in particular is mostly meant for debugging and is the one used when you call `Debug(TRSEntity)`.
+Internal {ref}`TRSEntity` method used to find a {ref}`RSEntity`.
 
-Example:
-```pascal
-WriteLn RSObjects.GEBank.Find(atpa); //Be in ge and with a walker setup there.
-Debug(atpa);
-```
+You also have {ref}`RSEntity.Find` to find entities, this version of the method
+is internal because it returns extra information about the found entities for
+internal use, like it's `cuboids` for example.
+
+This also returns an `atpa` containing the colors of the object that were found
+assuming the object has a {ref}`TColorFinder` setup.
+If not, the cuboids area are returned as the match.
 *)
 function TRSEntity.FindEx(me: TPoint; out boundsArray: TPolygonArray; out coordinates: TPointArray; out atpa: T2DPointArray): Boolean;
 begin
@@ -353,13 +355,35 @@ begin
 end;
 
 
+(*
+## RSEntity.Find
+```pascal
 function TRSEntity.Find(out coordinates: TPointArray; out atpa: T2DPointArray): Boolean;
+function TRSEntity.Find(out atpa: T2DPointArray): Boolean; overload;
+```
+{ref}`TRSEntity` method used to find a {ref}`RSEntity`.
+This returns True/False if the entity was found and it's `atpa` which cointains
+the colors of it that were found.
+
+For more information on this refer to {ref}`TRSEntity.FindEx`, it's an internal
+function but is used within this one and will go into more detail.
+*)
+function TRSEntity.Find(out coordinates: TPointArray; out atpa: T2DPointArray): Boolean;
+var
+  boundsArray: TPolygonArray;
+begin
+  Result := Self.FindEx(Self.Walker^.Position(), boundsArray, coordinates, atpa);
+end;
+
+function TRSEntity.Find(out atpa: T2DPointArray): Boolean; overload;
 var
+  coordinates: TPointArray;
   boundsArray: TPolygonArray;
 begin
   Result := Self.FindEx(Self.Walker^.Position(), boundsArray, coordinates, atpa);
 end;
 
+
 function TRSEntity.FindFrom(position: TPoint; out atpa: T2DPointArray): Boolean;
 var
   boundsArray: TPolygonArray;

osrs/position/map/objects.simba

@@ -334,15 +334,18 @@ begin
     Exit;
   end;
 
+  if Self.Model <> nil then
+    Exit(boundsArray);
+
   for i := 0 to High(boundsArray) do
-    Result += TPointArray(boundsArray[i]).ShapeFill();
+    Result += TPointArray(boundsArray[i]).Connect().ShapeFill();
 end;
 
 
 (*
 ## RSObject.FindEx
 ```pascal
-function TRSObject.FindEx(me: TPoint; out cuboids: TCuboidArray; out atpa: T2DPointArray): Boolean;
+function TRSObject.FindEx(me: TPoint; out boundsArray: TPolygonArray; out coordinates: TPointArray; out atpa: T2DPointArray): Boolean;
 ```
 Internal {ref}`TRSObject` method used to find a {ref}`RSObject`.
 If found returns true, if not returns false.
@@ -410,14 +413,15 @@ end;
 (*
 ## RSObject.Find
 ```pascal
-function TRSObject.Find(out atpa: T2DPointArray): Boolean;
+function TRSObject.Find(out coordinates: TPointArray; out atpa: T2DPointArray): Boolean;
+function TRSObject.Find(out atpa: T2DPointArray): Boolean; overload;
 ```
 {ref}`TRSObject` method used to find a {ref}`RSObject`.
 This returns True/False if the object was found and it's `atpa` which cointains
 the colors of it that were found.
 
 For more information on this refer to {ref}`RSObject.FindEx`, it's an internal
-function but is user within this one and will go into more detail.
+function but is used within this one and will go into more detail.
 *)
 function TRSObject.Find(out coordinates: TPointArray; out atpa: T2DPointArray): Boolean;
 var
@@ -426,6 +430,15 @@ begin
   Result := Self.FindEx(Self.Walker^.Position(), boundsArray, coordinates, atpa);
 end;
 
+function TRSObject.Find(out atpa: T2DPointArray): Boolean; overload;
+var
+  coordinates: TPointArray;
+  boundsArray: TPolygonArray;
+begin
+  Result := Self.FindEx(Self.Walker^.Position(), boundsArray, coordinates, atpa);
+end;
+
+
 (*
 ## RSObject.FindFrom
 ```pascal

osrs/rsclient.simba

@@ -101,6 +101,7 @@ ShowOnTarget(RSClient._Bounds());
 function TRSClient._Bounds(img: TImage): TBox;
 var
   x1, x2, y2: Integer;
+  win: TWindowHandle;
 begin
   if img.Pixel[0, img.Height-1] <> $0 then
     Exit(Target.Bounds);
@@ -115,8 +116,9 @@ begin
 
   if img.Height-1 < 503 then
   begin
-    with GetSimbaTargetWindow().GetBounds() do
-      GetSimbaTargetWindow().SetBounds([X1, Y1, X2, Y1+503]);
+    win := GetSimbaTargetWindow().GetRootWindow();
+    with win.GetBounds() do
+      win.SetBounds([X1, Y1, X2, Y1+535]);
     Result := [x1, 0, x2, 503];
   end
   else

utils/rschunks.simba

@@ -152,6 +152,7 @@ type
     EDGEVILLE,
     FALADOR,
     FOSSIL_ISLAND,
+    GUARDIANS_OF_THE_RIFT,
     HOSIDIUS_KITCHEN,
     ICEBERG,
     LUMBRIDGE,
@@ -162,6 +163,7 @@ type
     PRIFDDINAS,
     ROGUES_DEN,
     RUINS_OF_UNKAH,
+    RUNECRAFTING_ALTARS,
     SEERS_VILLAGE,
     STRONGHOLD_SLAYER_CAVE,
     TEMPOROSS_COVE,
@@ -185,8 +187,9 @@ begin
     ERSChunk.EDGEVILLE              : Result := Chunk(Box(48,54,48,54), 0);
     ERSChunk.FALADOR                : Result := Chunk(Box(45,53,47,51), 0);
     ERSChunk.FOSSIL_ISLAND          : Result := Chunk(Box(56,61,60,57), [0,1]);
-    ERSChunk.ICEBERG                : Result := Chunk(Box(40,64,42,61), [0,1]);
+    ERSChunk.GUARDIANS_OF_THE_RIFT  : Result := Chunk(Box(55,149,57,147), 0);
     ERSChunk.HOSIDIUS_KITCHEN       : Result := Chunk(Box(25,56,26,56), 0);
+    ERSChunk.ICEBERG                : Result := Chunk(Box(40,64,42,61), [0,1]);
     ERSChunk.LUMBRIDGE              : Result := Chunk(Box(49,51,50,49), [0,1,2]);
     ERSChunk.LUNAR_ISLE             : Result := Chunk(Box(32,61,33,60), 0);
     ERSChunk.MINING_GUILD           : Result := Chunk(Box(46,152,47,151), 0);
@@ -195,6 +198,7 @@ begin
     ERSChunk.PRIFDDINAS             : Result := Chunk(Box(50,95,51,94), 0);
     ERSChunk.ROGUES_DEN             : Result := Chunk(Box(46,79,47,77), 1);
     ERSChunk.RUINS_OF_UNKAH         : Result := Chunk(Box(48,44,49,44), 0);
+    ERSChunk.RUNECRAFTING_ALTARS    : Result := Chunk(Box(31,76,51,74), 0);
     ERSChunk.SEERS_VILLAGE          : Result := Chunk(Box(41,55,43,53), [0,2]);
     ERSChunk.STRONGHOLD_SLAYER_CAVE : Result := Chunk(Box(37,153,38,152), 0);
     ERSChunk.TEMPOROSS_COVE         : Result := Chunk(Box(47,46,47,46), 0);