1
0
mirror of https://github.com/moparisthebest/Simba synced 2024-12-22 23:38:50 -05:00

Few fixes.

git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@102 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
Wizzup? 2009-10-03 22:28:29 +00:00
parent e9292ee853
commit 6cb7800002
2 changed files with 29 additions and 29 deletions

View File

@ -7,7 +7,7 @@
<TargetFileExt Value=""/>
<Title Value="Mufasa Stand Alone"/>
<UseXPManifest Value="True"/>
<ActiveEditorIndexAtStart Value="10"/>
<ActiveEditorIndexAtStart Value="6"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
@ -41,7 +41,7 @@
<CursorPos X="26" Y="12"/>
<TopLine Value="1"/>
<EditorIndex Value="0"/>
<UsageCount Value="157"/>
<UsageCount Value="158"/>
<Loaded Value="True"/>
</Unit0>
<Unit1>
@ -173,7 +173,7 @@
<CursorPos X="10" Y="11"/>
<TopLine Value="1"/>
<EditorIndex Value="14"/>
<UsageCount Value="123"/>
<UsageCount Value="124"/>
<Loaded Value="True"/>
</Unit18>
<Unit19>
@ -305,7 +305,7 @@
<CursorPos X="39" Y="8"/>
<TopLine Value="1"/>
<EditorIndex Value="2"/>
<UsageCount Value="122"/>
<UsageCount Value="123"/>
<Loaded Value="True"/>
</Unit37>
<Unit38>
@ -315,7 +315,7 @@
<CursorPos X="21" Y="36"/>
<TopLine Value="30"/>
<EditorIndex Value="1"/>
<UsageCount Value="122"/>
<UsageCount Value="123"/>
<Loaded Value="True"/>
</Unit38>
<Unit39>
@ -332,7 +332,7 @@
<CursorPos X="15" Y="76"/>
<TopLine Value="47"/>
<EditorIndex Value="4"/>
<UsageCount Value="123"/>
<UsageCount Value="124"/>
<Loaded Value="True"/>
</Unit40>
<Unit41>
@ -341,7 +341,7 @@
<UnitName Value="Window"/>
<CursorPos X="41" Y="243"/>
<TopLine Value="228"/>
<UsageCount Value="122"/>
<UsageCount Value="123"/>
</Unit41>
<Unit42>
<Filename Value="../../../Documents/lazarus/lcl/forms.pp"/>
@ -380,7 +380,7 @@
<CursorPos X="79" Y="29"/>
<TopLine Value="15"/>
<EditorIndex Value="3"/>
<UsageCount Value="115"/>
<UsageCount Value="116"/>
<Loaded Value="True"/>
</Unit46>
<Unit47>
@ -397,7 +397,7 @@
<CursorPos X="10" Y="62"/>
<TopLine Value="50"/>
<EditorIndex Value="11"/>
<UsageCount Value="113"/>
<UsageCount Value="114"/>
<Loaded Value="True"/>
</Unit48>
<Unit49>
@ -410,10 +410,10 @@
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="mmlpsthread"/>
<CursorPos X="72" Y="15"/>
<TopLine Value="11"/>
<CursorPos X="72" Y="41"/>
<TopLine Value="21"/>
<EditorIndex Value="10"/>
<UsageCount Value="111"/>
<UsageCount Value="112"/>
<Loaded Value="True"/>
</Unit50>
<Unit51>
@ -544,7 +544,7 @@
<CursorPos X="31" Y="430"/>
<TopLine Value="419"/>
<EditorIndex Value="5"/>
<UsageCount Value="101"/>
<UsageCount Value="102"/>
<Loaded Value="True"/>
</Unit69>
<Unit70>
@ -565,7 +565,7 @@
<IsPartOfProject Value="True"/>
<CursorPos X="30" Y="34"/>
<TopLine Value="22"/>
<UsageCount Value="100"/>
<UsageCount Value="101"/>
</Unit72>
<Unit73>
<Filename Value="../../../FPC/FPCCheckout/packages/fcl-image/src/fpcanvas.inc"/>
@ -697,7 +697,7 @@
<UnitName Value="colour_conv"/>
<CursorPos X="11" Y="148"/>
<TopLine Value="140"/>
<UsageCount Value="83"/>
<UsageCount Value="84"/>
</Unit92>
<Unit93>
<Filename Value="../../../cogat/Units/CogatUnits/compcolors.pas"/>
@ -756,7 +756,7 @@
<UnitName Value="plugins"/>
<CursorPos X="86" Y="128"/>
<TopLine Value="128"/>
<UsageCount Value="77"/>
<UsageCount Value="78"/>
</Unit101>
<Unit102>
<Filename Value="../../../Compilertje/Units/CogatUnits/compfiles.pas"/>
@ -848,10 +848,10 @@
<Filename Value="../../Units/MMLCore/dtm.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="dtm"/>
<CursorPos X="48" Y="128"/>
<TopLine Value="111"/>
<CursorPos X="50" Y="145"/>
<TopLine Value="240"/>
<EditorIndex Value="6"/>
<UsageCount Value="58"/>
<UsageCount Value="59"/>
<Loaded Value="True"/>
</Unit115>
<Unit116>
@ -868,7 +868,7 @@
<CursorPos X="53" Y="33"/>
<TopLine Value="15"/>
<EditorIndex Value="12"/>
<UsageCount Value="54"/>
<UsageCount Value="55"/>
<Loaded Value="True"/>
</Unit117>
<Unit118>
@ -894,7 +894,7 @@
<UnitName Value="windowselector"/>
<CursorPos X="76" Y="83"/>
<TopLine Value="65"/>
<UsageCount Value="44"/>
<UsageCount Value="45"/>
</Unit120>
<Unit121>
<Filename Value="../../../../../../usr/lib64/fpc/2.2.4/source/rtl/objpas/classes/classesh.inc"/>
@ -929,7 +929,7 @@
<CursorPos X="1" Y="17"/>
<TopLine Value="1"/>
<EditorIndex Value="7"/>
<UsageCount Value="31"/>
<UsageCount Value="32"/>
<Loaded Value="True"/>
</Unit125>
<Unit126>

View File

@ -135,7 +135,6 @@ Var
GetCol: PMGetCol;
Begin
writeln('areashape');
SimCol := @TClient(Client).MFinder.SimilarColors;
GetCol := @TClient(Client).MWindow.GetColor;
Case Shape Of
@ -380,7 +379,6 @@ var
I, J, H, dH: Integer;
Found: Boolean;
TempTP: TPoint;
RetData: TRetData;
MaxSubPointDist: TPoint;
begin
@ -403,13 +401,15 @@ begin
If Y2 > Y1 then }
//Exit;
// Will make sure there are no out of bounds exceptions, and will make it faster
TClient(Client).MWindow.Freeze();
TClient(Client).MFinder.FindColorsTolerance(mP, DTM.c[Low(DTM.c)],
x1, y1, x2, y2, DTM.t[Low(DTM.t)]);
with TClient(Client) do
begin
MWindow.Freeze();
TClient(Client).MWindow.GetDimensions(H, dH);
RetData := TClient(Client).MWindow.ReturnData(0, 0, H, dH);
MFinder.FindColorsTolerance(mP, DTM.c[Low(DTM.c)], x1, y1, x2, y2,
DTM.t[Low(DTM.t)]);
MWindow.GetDimensions(H, dH);
end;
H := High(mP);
dH := High(DTM.p);