moparisthebest
/
Simba
mirror of https://github.com/moparisthebest/Simba
1
0
Fork 0
Code Issues Releases Wiki Activity

Cleanup 

git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@228 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
Raymond 2009-11-12 18:22:09 +00:00
parent fce233838d
commit 8f220c8796
15 changed files with 2748 additions and 2748 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

282
Projects/SAMufasaGUI/project1.lpi
View File

@ -7,7 +7,7 @@
<TargetFileExt Value=""/>
<Title Value="Mufasa Stand Alone"/>
<UseXPManifest Value="True"/>
<ActiveEditorIndexAtStart Value="6"/>
<ActiveEditorIndexAtStart Value="5"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
@ -38,7 +38,7 @@
<Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/>
<UnitName Value="project1"/>
<CursorPos X="32" Y="29"/>
<CursorPos X="62" Y="38"/>
<TopLine Value="24"/>
<EditorIndex Value="5"/>
<UsageCount Value="205"/>
@ -166,9 +166,7 @@
<UnitName Value="TestUnit"/>
<CursorPos X="34" Y="677"/>
<TopLine Value="676"/>
<EditorIndex Value="0"/>
<UsageCount Value="202"/>
<Loaded Value="True"/>
</Unit17>
<Unit18>
<Filename Value="../cogat/Units/CogatUnits/compcolors.pas"/>
@ -221,9 +219,9 @@
<Filename Value="../../Units/MMLCore/client.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="Client"/>
<CursorPos X="25" Y="41"/>
<TopLine Value="24"/>
<EditorIndex Value="3"/>
<CursorPos X="54" Y="45"/>
<TopLine Value="44"/>
<EditorIndex Value="2"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit25>
@ -233,7 +231,7 @@
<UnitName Value="MufasaTypes"/>
<CursorPos X="66" Y="42"/>
<TopLine Value="30"/>
<EditorIndex Value="1"/>
<EditorIndex Value="0"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit26>
@ -248,19 +246,19 @@
<Filename Value="../../Units/MMLCore/files.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="files"/>
<CursorPos X="42" Y="33"/>
<TopLine Value="1"/>
<CursorPos X="56" Y="52"/>
<TopLine Value="42"/>
<EditorIndex Value="3"/>
<UsageCount Value="202"/>
<Loaded Value="True"/>
</Unit28>
<Unit29>
<Filename Value="../../Units/MMLCore/window.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="Window"/>
<CursorPos X="39" Y="52"/>
<TopLine Value="41"/>
<EditorIndex Value="11"/>
<CursorPos X="29" Y="676"/>
<TopLine Value="670"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit29>
<Unit30>
<Filename Value="../../../cogat/Units/CogatUnits/comptypes.pas"/>
@ -274,25 +272,21 @@
<UnitName Value="windowutil"/>
<CursorPos X="20" Y="21"/>
<TopLine Value="21"/>
<EditorIndex Value="10"/>
<UsageCount Value="55"/>
<Loaded Value="True"/>
<UsageCount Value="56"/>
</Unit31>
<Unit32>
<Filename Value="../../Units/MMLCore/input.pas"/>
<UnitName Value="Input"/>
<CursorPos X="71" Y="171"/>
<TopLine Value="169"/>
<EditorIndex Value="12"/>
<UsageCount Value="82"/>
<Loaded Value="True"/>
<CursorPos X="34" Y="234"/>
<TopLine Value="234"/>
<UsageCount Value="83"/>
</Unit32>
<Unit33>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="finder"/>
<CursorPos X="75" Y="1181"/>
<TopLine Value="1170"/>
<CursorPos X="36" Y="71"/>
<TopLine Value="54"/>
<EditorIndex Value="6"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
@ -315,11 +309,9 @@
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="mmlpsthread"/>
<CursorPos X="21" Y="194"/>
<TopLine Value="184"/>
<EditorIndex Value="15"/>
<CursorPos X="18" Y="248"/>
<TopLine Value="232"/>
<UsageCount Value="202"/>
<Loaded Value="True"/>
</Unit36>
<Unit37>
<Filename Value="../../Units/PascalScript/uPSComponent.pas"/>
@ -384,10 +376,10 @@
</Unit45>
<Unit46>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<CursorPos X="68" Y="104"/>
<TopLine Value="99"/>
<EditorIndex Value="20"/>
<UsageCount Value="97"/>
<CursorPos X="30" Y="118"/>
<TopLine Value="107"/>
<EditorIndex Value="8"/>
<UsageCount Value="98"/>
<Loaded Value="True"/>
</Unit46>
<Unit47>
@ -408,9 +400,7 @@
<UnitName Value="bitmaps"/>
<CursorPos X="1" Y="867"/>
<TopLine Value="856"/>
<EditorIndex Value="8"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit49>
<Unit50>
<Filename Value="../../../FPC/FPCCheckout/packages/fcl-image/src/fpcanvas.pp"/>
@ -421,18 +411,18 @@
</Unit50>
<Unit51>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/colour.inc"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<EditorIndex Value="21"/>
<UsageCount Value="41"/>
<Loaded Value="True"/>
<CursorPos X="58" Y="71"/>
<TopLine Value="50"/>
<UsageCount Value="42"/>
</Unit51>
<Unit52>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/bitmap.inc"/>
<IsPartOfProject Value="True"/>
<CursorPos X="42" Y="236"/>
<TopLine Value="200"/>
<CursorPos X="10" Y="170"/>
<TopLine Value="197"/>
<EditorIndex Value="11"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit52>
<Unit53>
<Filename Value="../../../FPC/FPCCheckout/packages/fcl-image/src/fpcanvas.inc"/>
@ -493,9 +483,7 @@
<UnitName Value="GraphType"/>
<CursorPos X="3" Y="186"/>
<TopLine Value="175"/>
<EditorIndex Value="9"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
<UsageCount Value="11"/>
</Unit61>
<Unit62>
<Filename Value="../../../FPC/FPCCheckout/packages/fcl-image/src/fpcolors.inc"/>
@ -564,11 +552,9 @@
<Filename Value="../../Units/MMLCore/colour_conv.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="colour_conv"/>
<CursorPos X="39" Y="295"/>
<TopLine Value="282"/>
<EditorIndex Value="7"/>
<CursorPos X="11" Y="45"/>
<TopLine Value="34"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
</Unit72>
<Unit73>
<Filename Value="../../../cogat/Units/CogatUnits/compcolors.pas"/>
@ -579,17 +565,19 @@
</Unit73>
<Unit74>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/mouse.inc"/>
<CursorPos X="33" Y="31"/>
<TopLine Value="9"/>
<EditorIndex Value="19"/>
<UsageCount Value="18"/>
<CursorPos X="11" Y="29"/>
<TopLine Value="18"/>
<EditorIndex Value="12"/>
<UsageCount Value="19"/>
<Loaded Value="True"/>
</Unit74>
<Unit75>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<UsageCount Value="38"/>
<CursorPos X="26" Y="54"/>
<TopLine Value="53"/>
<EditorIndex Value="14"/>
<UsageCount Value="39"/>
<Loaded Value="True"/>
</Unit75>
<Unit76>
<Filename Value="../../Units/PascalScript/uPSCompiler.pas"/>
@ -629,7 +617,7 @@
<UnitName Value="plugins"/>
<CursorPos X="32" Y="80"/>
<TopLine Value="80"/>
<EditorIndex Value="2"/>
<EditorIndex Value="1"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
</Unit81>
@ -662,9 +650,9 @@
<Unit86>
<Filename Value="../../Units/MMLAddon/PSInc/psdefines.inc"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<EditorIndex Value="18"/>
<UsageCount Value="13"/>
<TopLine Value="15"/>
<EditorIndex Value="17"/>
<UsageCount Value="14"/>
<Loaded Value="True"/>
</Unit86>
<Unit87>
@ -723,8 +711,8 @@
<Filename Value="../../Units/MMLCore/dtm.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="dtm"/>
<CursorPos X="71" Y="392"/>
<TopLine Value="388"/>
<CursorPos X="21" Y="38"/>
<TopLine Value="27"/>
<EditorIndex Value="4"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
@ -812,9 +800,11 @@
</Unit106>
<Unit107>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/dtm.inc"/>
<CursorPos X="2" Y="23"/>
<TopLine Value="6"/>
<UsageCount Value="10"/>
<CursorPos X="35" Y="77"/>
<TopLine Value="66"/>
<EditorIndex Value="13"/>
<UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit107>
<Unit108>
<Filename Value="../../../Documents/lazarus/lcl/graphics.pp"/>
@ -877,9 +867,11 @@
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ocr"/>
<CursorPos X="19" Y="91"/>
<TopLine Value="75"/>
<UsageCount Value="195"/>
<CursorPos X="54" Y="645"/>
<TopLine Value="633"/>
<EditorIndex Value="10"/>
<UsageCount Value="198"/>
<Loaded Value="True"/>
</Unit116>
<Unit117>
<Filename Value="../../Units/PascalScript/uPSR_extctrls.pas"/>
@ -946,10 +938,10 @@
</Unit126>
<Unit127>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/window.inc"/>
<CursorPos X="41" Y="52"/>
<CursorPos X="34" Y="35"/>
<TopLine Value="31"/>
<EditorIndex Value="16"/>
<UsageCount Value="12"/>
<EditorIndex Value="15"/>
<UsageCount Value="13"/>
<Loaded Value="True"/>
</Unit127>
<Unit128>
@ -1009,7 +1001,7 @@
<UnitName Value="web"/>
<CursorPos X="1" Y="1"/>
<TopLine Value="1"/>
<UsageCount Value="120"/>
<UsageCount Value="123"/>
</Unit136>
<Unit137>
<Filename Value="../../../lazarus/lcl/lazhelphtml.pas"/>
@ -1208,9 +1200,7 @@
<UnitName Value="framescript"/>
<CursorPos X="15" Y="195"/>
<TopLine Value="180"/>
<EditorIndex Value="22"/>
<UsageCount Value="113"/>
<Loaded Value="True"/>
<UsageCount Value="116"/>
</Unit161>
<Unit162>
<Filename Value="framesynedit.lrs"/>
@ -1430,9 +1420,11 @@
</Unit194>
<Unit195>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/ocr.inc"/>
<CursorPos X="33" Y="4"/>
<CursorPos X="40" Y="3"/>
<TopLine Value="1"/>
<EditorIndex Value="9"/>
<UsageCount Value="29"/>
<Loaded Value="True"/>
</Unit195>
<Unit196>
<Filename Value="../../../Documents/lazarus/lcl/interfaces/gtk/gtkwidgetset.inc"/>
@ -1522,10 +1514,10 @@
<ComponentName Value="ColourHistoryForm"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="colourhistory"/>
<CursorPos X="37" Y="126"/>
<TopLine Value="104"/>
<EditorIndex Value="14"/>
<UsageCount Value="50"/>
<CursorPos X="54" Y="115"/>
<TopLine Value="23"/>
<EditorIndex Value="7"/>
<UsageCount Value="53"/>
<Loaded Value="True"/>
</Unit208>
<Unit209>
@ -1640,10 +1632,8 @@
<Filename Value="../../Units/MMLCore/mmlkeyinput.pas"/>
<UnitName Value="MMLKeyInput"/>
<CursorPos X="62" Y="31"/>
<TopLine Value="21"/>
<EditorIndex Value="13"/>
<UsageCount Value="23"/>
<Loaded Value="True"/>
<TopLine Value="40"/>
<UsageCount Value="24"/>
</Unit225>
<Unit226>
<Filename Value="../../../Documents/lazarus/components/mouseandkeyinput/xkeyinput.pas"/>
@ -1696,9 +1686,9 @@
<Unit233>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/keyboard.inc"/>
<CursorPos X="13" Y="46"/>
<TopLine Value="24"/>
<EditorIndex Value="17"/>
<UsageCount Value="13"/>
<TopLine Value="25"/>
<EditorIndex Value="16"/>
<UsageCount Value="14"/>
<Loaded Value="True"/>
</Unit233>
<Unit234>
@ -1768,124 +1758,124 @@
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="215" Column="1" TopLine="197"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="99" Column="28" TopLine="84"/>
</Position1>
<Position2>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="268" Column="76" TopLine="254"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="103" Column="51" TopLine="93"/>
</Position2>
<Position3>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="205" Column="7" TopLine="194"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="128" Column="33" TopLine="120"/>
</Position3>
<Position4>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="209" Column="1" TopLine="198"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="142" Column="85" TopLine="132"/>
</Position4>
<Position5>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="329" Column="16" TopLine="318"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="137" Column="75" TopLine="132"/>
</Position5>
<Position6>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="326" Column="18" TopLine="318"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="144" Column="77" TopLine="132"/>
</Position6>
<Position7>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="330" Column="18" TopLine="317"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="145" Column="95" TopLine="132"/>
</Position7>
<Position8>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="484" Column="1" TopLine="473"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="146" Column="85" TopLine="132"/>
</Position8>
<Position9>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="722" Column="1" TopLine="711"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="147" Column="120" TopLine="132"/>
</Position9>
<Position10>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="30" Column="22" TopLine="19"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="148" Column="103" TopLine="132"/>
</Position10>
<Position11>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="108" Column="25" TopLine="95"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="158" Column="83" TopLine="138"/>
</Position11>
<Position12>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="724" Column="1" TopLine="713"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="159" Column="97" TopLine="138"/>
</Position12>
<Position13>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="51" Column="52" TopLine="40"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="128" Column="26" TopLine="117"/>
</Position13>
<Position14>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="52" Column="30" TopLine="41"/>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/bitmap.inc"/>
<Caret Line="254" Column="52" TopLine="233"/>
</Position14>
<Position15>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="54" Column="52" TopLine="43"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="144" Column="26" TopLine="138"/>
</Position15>
<Position16>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="64" Column="51" TopLine="53"/>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/bitmap.inc"/>
<Caret Line="148" Column="29" TopLine="134"/>
</Position16>
<Position17>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="67" Column="47" TopLine="56"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="19" Column="34" TopLine="9"/>
</Position17>
<Position18>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="100" Column="31" TopLine="87"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="28" Column="34" TopLine="9"/>
</Position18>
<Position19>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="51" Column="9" TopLine="40"/>
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<Caret Line="118" Column="30" TopLine="107"/>
</Position19>
<Position20>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="52" Column="39" TopLine="41"/>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/ocr.inc"/>
<Caret Line="3" Column="40" TopLine="1"/>
</Position20>
<Position21>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="194" Column="21" TopLine="184"/>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="699" Column="44" TopLine="691"/>
</Position21>
<Position22>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/window.inc"/>
<Caret Line="52" Column="41" TopLine="31"/>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="617" Column="4" TopLine="606"/>
</Position22>
<Position23>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="454" Column="41" TopLine="453"/>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="642" Column="21" TopLine="626"/>
</Position23>
<Position24>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="57" Column="34" TopLine="38"/>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="217" Column="10" TopLine="206"/>
</Position24>
<Position25>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="750" Column="59" TopLine="739"/>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="617" Column="4" TopLine="606"/>
</Position25>
<Position26>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="67" Column="18" TopLine="56"/>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="642" Column="18" TopLine="640"/>
</Position26>
<Position27>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="833" Column="56" TopLine="830"/>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="92" Column="12" TopLine="81"/>
</Position27>
<Position28>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="69" Column="18" TopLine="58"/>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="33" Column="3" TopLine="22"/>
</Position28>
<Position29>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="901" Column="67" TopLine="890"/>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="225" Column="12" TopLine="315"/>
</Position29>
<Position30>
<Filename Value="../../Units/MMLCore/finder.pas"/>
<Caret Line="1104" Column="18" TopLine="1092"/>
<Filename Value="../../Units/MMLCore/client.pas"/>
<Caret Line="43" Column="24" TopLine="26"/>
</Position30>
</JumpHistory>
</ProjectOptions>

28
Projects/SAMufasaGUI/testunit.lfm
View File

@ -5,7 +5,7 @@ object Form1: TForm1
Width = 731
ActiveControl = ScriptPanel
Caption = 'THA FUKING MUFASA'
ClientHeight = 532
ClientHeight = 537
ClientWidth = 731
KeyPreview = True
Menu = MainMenu1
@ -166,8 +166,8 @@ object Form1: TForm1
end
object StatusBar: TStatusBar
Left = 0
Height = 21
Top = 511
Height = 23
Top = 514
Width = 731
Panels = <
item
@ -184,21 +184,19 @@ object Form1: TForm1
end
object PanelMemo: TPanel
Left = 0
Height = 151
Height = 154
Top = 360
Width = 731
Align = alBottom
Anchors = [akTop, akLeft, akRight, akBottom]
ClientHeight = 151
ClientHeight = 154
ClientWidth = 731
TabOrder = 2
object Memo1: TMemo
Left = 1
Height = 149
Height = 152
Top = 1
Width = 729
Align = alClient
Anchors = [akLeft, akRight, akBottom]
ScrollBars = ssAutoBoth
TabOrder = 0
end
@ -252,7 +250,7 @@ object Form1: TForm1
Visible = False
object LabeledEditSearch: TLabeledEdit
Left = 104
Height = 27
Height = 21
Top = 6
Width = 174
AutoSelect = False
@ -261,10 +259,10 @@ object Form1: TForm1
EditLabel.AnchorSideTop.Side = asrCenter
EditLabel.AnchorSideRight.Control = LabeledEditSearch
EditLabel.AnchorSideBottom.Control = LabeledEditSearch
EditLabel.Left = 67
EditLabel.Height = 18
EditLabel.Top = 10
EditLabel.Width = 34
EditLabel.Left = 73
EditLabel.Height = 14
EditLabel.Top = 9
EditLabel.Width = 28
EditLabel.Caption = 'Find: '
EditLabel.ParentColor = False
LabelPosition = lpLeft
@ -363,9 +361,9 @@ object Form1: TForm1
end
object CheckBoxMatchCase: TCheckBox
Left = 320
Height = 22
Height = 17
Top = 6
Width = 97
Width = 72
Caption = 'Match case'
OnClick = CheckBoxMatchCaseClick
TabOrder = 1

5002
Projects/SAMufasaGUI/testunit.lrs
View File

File diff suppressed because it is too large Load Diff

18
Units/MMLAddon/PSInc/Wrappers/bitmap.inc
View File

@ -62,7 +62,7 @@ begin;
raise exception.createfmt('Wrong Width or Height in ScretchResize: (%d,%d)',[NewW,NewH]);
end;
procedure GetBitmapSize(Bmp : integer; var BmpW,BmpH : integer);
procedure GetBitmapSize(Bmp : integer; out BmpW,BmpH : integer);
begin;
With CurrThread.Client.MBitmaps.Bmp[bmp] do
begin;
@ -136,19 +136,19 @@ begin
CurrThread.Client.MBitmaps.GetBMP(bmp).CopyClientToBitmap(CurrThread.Client.MWindow, True, xs, ys, xe, ye);
end;
function FindBitmap(Bitmap: integer; var x, y: Integer): Boolean;
function FindBitmap(Bitmap: integer; out x, y: Integer): Boolean;
begin;
with CurrThread.Client do
result := MFinder.FindBitmap( MBitmaps.Bmp[bitmap],x,y);
end;
function FindBitmapIn(bitmap: integer; var x, y: Integer; xs, ys, xe, ye: Integer): Boolean;
function FindBitmapIn(bitmap: integer; out x, y: Integer; xs, ys, xe, ye: Integer): Boolean;
begin;
with CurrThread.Client do
result := MFinder.FindBitmapIn( MBitmaps.Bmp[bitmap],x,y,xs,ys,xe,ye);
end;
function FindBitmapToleranceIn(bitmap: integer; var x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer): Boolean;
function FindBitmapToleranceIn(bitmap: integer; out x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer): Boolean;
begin;
with CurrThread.Client do
result := MFinder.FindBitmapToleranceIn( MBitmaps.Bmp[bitmap],x,y,xs,ys,xe,ye,tolerance);
@ -161,7 +161,7 @@ begin;
result := MFinder.FindBitmapSpiral(Mbitmaps.bmp[bitmap],x,y,xs,ys,xe,ye);
end;
function FindBitmapsSpiralTolerance(bitmap: integer; x, y: Integer; var Points : TPointArray; xs, ys, xe, ye,tolerance: Integer): Boolean;
function FindBitmapsSpiralTolerance(bitmap: integer; x, y: Integer; out Points : TPointArray; xs, ys, xe, ye,tolerance: Integer): Boolean;
begin;
with CurrThread.Client do
result := MFinder.FindBitmapsSpiralTolerance(MBitmaps.Bmp[bitmap],x,y,points,xs,ys,xe,ye,tolerance);
@ -236,20 +236,20 @@ begin;
result := CurrThread.Client.MBitmaps.Bmp[Bitmap].CreateTMask;
end;
function FindMaskTolerance(mask: TMask; var x, y: Integer; xs,ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;
function FindMaskTolerance(mask: TMask; out x, y: Integer; xs,ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;
begin;
result := CurrThread.Client.MFinder.FindBitmapMaskTolerance(Mask,x,y,xs,ys,xe,ye,tolerance,contourtolerance);
end;
function FindBitmapMaskTolerance(mask: Integer; var x, y: Integer; xs, ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;
function FindBitmapMaskTolerance(mask: Integer; out x, y: Integer; xs, ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;
begin;
Writeln('Better be using FindMaskTolerance in combination with CreateBitmapMask, more efficient.');
with CurrThread.Client do
result := MFinder.FindBitmapMaskTolerance(MBitmaps.bmp[mask].CreateTMask,x,y,xs,ys,xe,ye,tolerance,contourtolerance);
end;
function FindDeformedBitmapToleranceIn(bitmap: integer; var x,
function FindDeformedBitmapToleranceIn(bitmap: integer; out x,
y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer; Range: Integer;
AllowPartialAccuracy: Boolean; var accuracy: Extended): Boolean;
AllowPartialAccuracy: Boolean; out accuracy: Extended): Boolean;
begin;
result := CurrThread.Client.MFinder.FindDeformedBitmapToleranceIn(CurrThread.Client.MBitmaps.bmp[Bitmap],x,y,xs,ys,xe,ye,tolerance,range,AllowPartialAccuracy,accuracy);
end;

10
Units/MMLAddon/PSInc/Wrappers/colour.inc
View File

@ -26,17 +26,17 @@ begin;
Result := CurrThread.Client.MWindow.GetColor(x,y);
end;
function findcolor(var x, y: integer; color, x1, y1, x2, y2: integer): boolean;
function findcolor(out x, y: integer; color, x1, y1, x2, y2: integer): boolean;
begin
Result := CurrThread.Client.MFinder.FindColor(x, y, color, x1, y1, x2, y2);
end;
function findcolortolerance(var x, y: integer; color, x1, y1, x2, y2, tol: integer): boolean;
function findcolortolerance(out x, y: integer; color, x1, y1, x2, y2, tol: integer): boolean;
begin
Result := CurrThread.Client.MFinder.FindColorTolerance(x, y, color, x1, y1, x2, y2, tol);
end;
function FindColors(var TPA: TPointArray; Color, x1, y1, x2, y2: Integer): Boolean;
function FindColors(out TPA: TPointArray; Color, x1, y1, x2, y2: Integer): Boolean;
begin
Result := CurrThread.Client.MFinder.FindColors(TPA, color, x1, y1, x2, y2);
end;
@ -56,7 +56,7 @@ begin;
result := CurrThread.Client.MFinder.CountColorTolerance(color,xs,ys,xe,ye,tolerance);
end;
function FindColorsTolerance(var Points: TPointArray; Color, xs, ys, xe, ye, Tolerance: Integer): Boolean;
function FindColorsTolerance(out Points: TPointArray; Color, xs, ys, xe, ye, Tolerance: Integer): Boolean;
begin;
result := CurrThread.Client.MFinder.FindColorsTolerance(points,color,xs,ys,xe,ye,tolerance);
end;
@ -66,7 +66,7 @@ begin;
result := CurrThread.Client.MFinder.FindColorSpiral(x,y,color,xs,ys,xe,ye);
end;
function FindColorsSpiralTolerance(x, y: Integer; var Points: TPointArray; color, xs, ys, xe, ye: Integer; Tolerance: Integer) : boolean;
function FindColorsSpiralTolerance(x, y: Integer; out Points: TPointArray; color, xs, ys, xe, ye: Integer; Tolerance: Integer) : boolean;
begin;
result := CurrThread.Client.MFinder.FindColorsSpiralTolerance(x,y,Points,color,xs,ys,xe,ye,tolerance);
end;

18
Units/MMLAddon/PSInc/Wrappers/dtm.inc
View File

@ -21,35 +21,35 @@
DTM.inc for the Mufasa Macro Library
}
function ps_FindDTM(DTM: Integer; var x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
function ps_FindDTM(DTM: Integer; out x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
begin
Result := CurrThread.Client.MDTM.FindDTM(DTM, x, y, x1, y1, x2, y2);
end;
function ps_FindDTMs(DTM: Integer; var p: TPointArray; x1, y1, x2, y2: Integer): Boolean;
function ps_FindDTMs(DTM: Integer; out p: TPointArray; x1, y1, x2, y2: Integer): Boolean;
begin
Result := CurrThread.Client.MDTM.FindDTMs(DTM, p, x1, y1, x2, y2);
end;
function ps_FindDTMRotated(DTM: Integer; var x, y: Integer; x1, y1, x2, y2:
function ps_FindDTMRotated(DTM: Integer; out x, y: Integer; x1, y1, x2, y2:
Integer; sAngle, eAngle, aStep: Extended;
var aFound: Extended): Boolean;
out aFound: Extended): Boolean;
begin
Result := CurrThread.Client.MDTM.FindDTMRotated(DTM, x, y, x1, y1, x2, y2,
sAngle, eAngle, aStep, aFound);
end;
function ps_FindDTMsRotated(DTM: Integer; var x, y: Integer; x1, y1, x2, y2:
function ps_FindDTMsRotated(DTM: Integer; out x, y: Integer; x1, y1, x2, y2:
Integer; sAngle, eAngle, aStep: Extended;
var aFound: Extended): Boolean;
out aFound: Extended): Boolean;
begin
Result := CurrThread.Client.MDTM.FindDTMRotated(DTM, x, y, x1, y1, x2, y2,
sAngle, eAngle, aStep, aFound);
end;
function ps_FindDTMsRotated(DTM: Integer; var Points: TPointArray; x1,
function ps_FindDTMsRotated(DTM: Integer; out Points: TPointArray; x1,
y1, x2, y2: Integer; sAngle, eAngle,
aStep: Extended; var aFound: T2DExtendedArray)
aStep: Extended; out aFound: T2DExtendedArray)
: Boolean;
begin
Result := CurrThread.Client.MDTM.FindDTMsRotated(DTM, Points, x1, y1, x2, y2,
@ -72,7 +72,7 @@ begin
CurrThread.Client.MDTM.FreeDTM(DTM);
end;
function ps_GetDTM(index: Integer; var dtm: pDTM): Boolean;
function ps_GetDTM(index: Integer; out dtm: pDTM): Boolean;
begin
Result := CurrThread.Client.MDTM.GetDTM(index, dtm);
end;

2
Units/MMLAddon/PSInc/Wrappers/mouse.inc
View File

@ -26,7 +26,7 @@ begin
CurrThread.Client.MInput.SetMousePos(X, Y);
end;
procedure GetMousePos(var x, y: integer);
procedure GetMousePos(out x, y: integer);
begin
CurrThread.Client.MInput.GetMousePos(X, Y);
end;

2
Units/MMLAddon/PSInc/Wrappers/window.inc
View File

@ -32,7 +32,7 @@ begin;
MWindow.SetTarget(MBitmaps.Bmp[Bitmap]);
end;
procedure GetClientDimensions(var w, h: integer);
procedure GetClientDimensions(out w, h: integer);
begin
CurrThread.Client.MWindow.GetDimensions(w, h);
end;

42
Units/MMLAddon/PSInc/pscompile.inc
View File

@ -44,15 +44,15 @@ Sender.AddFunction(@psWriteln,'procedure writeln(s : string);');
{ DTM }
Sender.AddFunction(@PrintpDTM, 'Procedure PrintpDTM(tDTM : pDTM);');
Sender.AddFunction(@ps_GetDTM ,'function GetDTM(index: Integer; var dtm: pDTM): Boolean;');
Sender.AddFunction(@ps_GetDTM ,'function GetDTM(index: Integer; out dtm: pDTM): Boolean;');
Sender.AddFunction(@pDTMToTDTM, 'Function pDTMToTDTM(Const DTM: pDTM): TDTM;');
Sender.AddFunction(@tDTMTopDTM, 'Function tDTMTopDTM(Const DTM: TDTM): pDTM;');
Sender.AddFunction(@ps_DTMFromString, 'function DTMFromString(DTMString: String): Integer;');
Sender.AddFunction(@ps_FreeDTM, 'procedure FreeDTM(DTM: Integer);');
Sender.AddFunction(@ps_FindDTM, 'function FindDTM(DTM: Integer; var x, y: Integer; x1, y1, x2, y2: Integer): Boolean;');
Sender.AddFunction(@ps_FindDTMs, 'function FindDTMs(DTM: Integer; var p: TPointArray; x1, y1, x2, y2: Integer): Boolean;');
Sender.AddFunction(@ps_FindDTMRotated, 'function FindDTMRotated(DTM: Integer; var x, y: Integer; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; var aFound: Extended): Boolean;');
Sender.AddFunction(@ps_FindDTMsRotated, 'function FindDTMsRotated(DTM: Integer; var Points: TPointArray; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; var aFound: T2DExtendedArray) : Boolean;');
Sender.AddFunction(@ps_FindDTM, 'function FindDTM(DTM: Integer; out x, y: Integer; x1, y1, x2, y2: Integer): Boolean;');
Sender.AddFunction(@ps_FindDTMs, 'function FindDTMs(DTM: Integer; out p: TPointArray; x1, y1, x2, y2: Integer): Boolean;');
Sender.AddFunction(@ps_FindDTMRotated, 'function FindDTMRotated(DTM: Integer; out x, y: Integer; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: Extended): Boolean;');
Sender.AddFunction(@ps_FindDTMsRotated, 'function FindDTMsRotated(DTM: Integer; out Points: TPointArray; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: T2DExtendedArray) : Boolean;');
Sender.AddFunction(@ps_addDTM, 'function AddDTM(d: TDTM): Integer;');
Sender.AddFunction(@ps_addpDTM, 'function AddpDTM(d: pDTM): Integer;');
@ -67,7 +67,7 @@ Sender.AddFunction(@Distance,'function Distance(x1,y1,x2,y2 : integer) : integer
{window}
Sender.AddFunction(@Freeze, 'function freeze:boolean;');
Sender.AddFunction(@Unfreeze, 'function unfreeze: boolean;');
Sender.AddFunction(@GetClientDimensions, 'procedure GetClientDimensions(var w, h:integer);');
Sender.AddFunction(@GetClientDimensions, 'procedure GetClientDimensions(out w, h:integer);');
Sender.AddFunction(@SetTargetBitmap,'procedure SetTargetBitmap(Bitmap : integer);');
Sender.AddFunction(@SetDesktopAsClient,'procedure SetDesktopAsClient');
Sender.AddFunction(@SetTargetArray, 'procedure SetTargetArray(P: Integer; Size: TPoint);');
@ -86,21 +86,21 @@ Sender.AddFunction(@OpenWebPage,'procedure OpenWebPage(url : string);');
{Color + Color Finders}
Sender.AddFunction(@GetColor,'function GetColor(x, y: Integer): Integer;');
Sender.AddFunction(@FindColor, 'function findcolor(var x, y: integer; color, x1, y1, x2, y2: integer): boolean;');
Sender.AddFunction(@FindColorTolerance, 'function findcolortolerance(var x, y: integer; color, x1, y1, x2, y2, tol: integer): boolean;');
Sender.AddFunction(@FindColors, 'function findcolors(var TPA: TPointArray; color, x1, y1, x2, y2: integer): boolean;');
Sender.AddFunction(@FindColor, 'function findcolor(out x, y: integer; color, x1, y1, x2, y2: integer): boolean;');
Sender.AddFunction(@FindColorTolerance, 'function findcolortolerance(out x, y: integer; color, x1, y1, x2, y2, tol: integer): boolean;');
Sender.AddFunction(@FindColors, 'function findcolors(out TPA: TPointArray; color, x1, y1, x2, y2: integer): boolean;');
Sender.AddFunction(@SimilarColors,'function SimilarColors(Col1,Col2,Tolerance : integer) : boolean');
Sender.AddFunction(@CountColorTolerance,'function CountColorTolerance(Color, xs, ys, xe, ye, Tolerance: Integer): Integer;');
Sender.AddFunction(@FindColorsTolerance,'function FindColorsTolerance(var Points: TPointArray; Color, xs, ys, xe, ye, Tolerance: Integer): Boolean;');
Sender.AddFunction(@FindColorsTolerance,'function FindColorsTolerance(out Points: TPointArray; Color, xs, ys, xe, ye, Tolerance: Integer): Boolean;');
Sender.AddFunction(@FindColorSpiral,'function FindColorSpiral(var x, y: Integer; color, xs, ys, xe, ye: Integer): Boolean;');
Sender.AddFunction(@FindColorsSpiralTolerance,'function FindColorsSpiralTolerance(x, y: Integer; var Points: TPointArray; color, xs, ys, xe, ye: Integer; Tolerance: Integer) : boolean;');
Sender.AddFunction(@FindColorsSpiralTolerance,'function FindColorsSpiralTolerance(x, y: Integer; out Points: TPointArray; color, xs, ys, xe, ye: Integer; Tolerance: Integer) : boolean;');
Sender.AddFunction(@SetColorToleranceSpeed, 'procedure SetColorToleranceSpeed(cts: integer);');
Sender.AddFunction(@ColorToHSL, 'procedure ColorToHSL(c: integer; var r,g,b: extended);');
Sender.AddFunction(@ColorToHSL, 'procedure ColorToHSL(c: integer; out r,g,b: extended);');
{Mouse etc.}
Sender.AddFunction(@MoveMouse, 'procedure MoveMouse(x, y: integer);');
Sender.AddFunction(@GetMousePos, 'procedure GetMousePos(var x, y: integer);');
Sender.AddFunction(@GetMousePos, 'procedure GetMousePos(out x, y: integer);');
Sender.AddFunction(@HoldMouse, 'procedure HoldMouse(x, y: integer; clickType: TClickType);');
Sender.AddFunction(@ReleaseMouse, 'procedure ReleaseMouse(x, y: integer; clickType: TClickType);');
Sender.AddFunction(@ClickMouse, 'procedure ClickMouse(x, y: integer; clickType: TClickType);');
@ -125,7 +125,7 @@ Sender.AddFunction(@SaveBitmap,'procedure SaveBitmap(Bmp : integer; path : strin
Sender.AddFunction(@BitmapFromString,'function BitmapFromString(Width,Height : integer; Data : string): integer;');
Sender.AddFunction(@LoadBitmap,'function LoadBitmap(Path : string) : integer;');
Sender.AddFunction(@SetBitmapSize,'procedure SetBitmapSize(Bmp,NewW,NewH : integer);');
Sender.AddFunction(@GetBitmapSize,'procedure GetBitmapSize(Bmp : integer; Var BmpW,BmpH : integer);');
Sender.AddFunction(@GetBitmapSize,'procedure GetBitmapSize(Bmp : integer; out BmpW,BmpH : integer);');
Sender.AddFunction(@StretchBitmapResize,'procedure StretchBitmapResize(Bmp,NewW,NewH : integer);');
Sender.AddFunction(@CreateMirroredBitmap,'function CreateMirroredBitmap(Bmp : integer) : integer;');
Sender.AddFunction(@CreateMirroredBitmapEx,'function CreateMirroredBitmapEx(Bmp : integer; MirrorStyle : TBmpMirrorStyle) : integer;');
@ -140,11 +140,11 @@ Sender.AddFunction(@GetTransparentColor,'function GetTransparentColor(bmp: integ
Sender.AddFunction(@FastReplaceColor,'procedure FastReplaceColor(Bmp : integer; OldColor,NewColor : TColor);');
Sender.AddFunction(@ps_CopyClientToBitmap, 'procedure CopyClientToBitmap(bmp, xs, ys, xe, ye: Integer);');
Sender.AddFunction(@SetBitmapName, 'procedure SetBitmapName(Bmp : integer; name : string);');
Sender.AddFunction(@FindBitmap,'function FindBitmap(bitmap: integer; var x, y: Integer): Boolean;');
Sender.AddFunction(@FindBitmapIn,'function FindBitmapIn(bitmap: integer; var x, y: Integer; xs, ys, xe, ye: Integer): Boolean;');
sender.AddFunction(@FindBitmapToleranceIn,'function FindBitmapToleranceIn(bitmap: integer; var x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer): Boolean;');
Sender.AddFunction(@FindBitmap,'function FindBitmap(bitmap: integer; out x, y: Integer): Boolean;');
Sender.AddFunction(@FindBitmapIn,'function FindBitmapIn(bitmap: integer; out x, y: Integer; xs, ys, xe, ye: Integer): Boolean;');
sender.AddFunction(@FindBitmapToleranceIn,'function FindBitmapToleranceIn(bitmap: integer; out x, y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer): Boolean;');
Sender.AddFunction(@FindBitmapSpiral,'function FindBitmapSpiral(bitmap: Integer; var x, y: Integer; xs, ys, xe, ye: Integer): Boolean;');
Sender.AddFunction(@FindBitmapsSpiralTolerance,'function FindBitmapsSpiralTolerance(bitmap: integer; x, y: Integer; var Points : TPointArray; xs, ys, xe, ye,tolerance: Integer): Boolean;');
Sender.AddFunction(@FindBitmapsSpiralTolerance,'function FindBitmapsSpiralTolerance(bitmap: integer; x, y: Integer; out Points : TPointArray; xs, ys, xe, ye,tolerance: Integer): Boolean;');
Sender.AddFunction(@FindBitmapSpiralTolerance,'function FindBitmapSpiralTolerance(bitmap: integer; var x, y: Integer; xs, ys, xe, ye,tolerance : integer): Boolean;');
Sender.AddFunction(@RotateBitmap,'function RotateBitmap(bitmap: Integer; angle: Extended): Integer;');
Sender.AddFunction(@Desaturate,'function DesaturateBitmap(Bitmap : integer) : integer;');
@ -155,6 +155,6 @@ Sender.AddFunction(@BrightnessBitmap,'function BrightnessBitmap(Bitmap,br : inte
Sender.AddFunction(@ContrastBitmap,'function ContrastBitmap(bitmap : integer; co : extended) : integer;');
Sender.AddFunction(@PosterizeBitmap,'function PosterizeBitmap(Bitmap : integer; po : integer) : integer;');
Sender.AddFunction(@CreateBitmapMask,'function CreateBitmapMask(Bitmap : integer) : TMask;');
Sender.AddFunction(@FindMaskTolerance,'function FindMaskTolerance(mask: TMask; var x, y: Integer; xs,ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;');
Sender.AddFunction(@FindBitmapMaskTolerance,'function FindBitmapMaskTolerance(mask: Integer; var x, y: Integer; xs, ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;');
Sender.AddFunction(@FindDeformedBitmapToleranceIn,'function FindDeformedBitmapToleranceIn(bitmap: integer; var x,y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer; Range: Integer; AllowPartialAccuracy: Boolean; var accuracy: Extended): Boolean;');
Sender.AddFunction(@FindMaskTolerance,'function FindMaskTolerance(mask: TMask; out x, y: Integer; xs,ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;');
Sender.AddFunction(@FindBitmapMaskTolerance,'function FindBitmapMaskTolerance(mask: Integer; out x, y: Integer; xs, ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;');
Sender.AddFunction(@FindDeformedBitmapToleranceIn,'function FindDeformedBitmapToleranceIn(bitmap: integer; out x,y: Integer; xs, ys, xe, ye: Integer; tolerance: Integer; Range: Integer; AllowPartialAccuracy: Boolean; out accuracy: Extended): Boolean;');

40
Units/MMLCore/dtm.pas
View File

@ -39,27 +39,27 @@ type
procedure FreeDTM(DTM: Integer);
Function StringToDTM(S: String): pDTM;
function FindDTM(DTM: Integer; var x, y: Integer; x1, y1, x2,
function FindDTM(DTM: Integer; out x, y: Integer; x1, y1, x2,
y2: Integer): Boolean;
function FindDTMs(DTM: Integer; var Points: TPointArray; x1, y1, x2,
function FindDTMs(DTM: Integer; out Points: TPointArray; x1, y1, x2,
y2: Integer): Boolean;
function FindDTMRotated(DTM: Integer; var x, y: Integer; x1, y1, x2,
function FindDTMRotated(DTM: Integer; out x, y: Integer; x1, y1, x2,
y2: Integer; sAngle, eAngle, aStep: Extended;
var aFound: Extended): Boolean;
function FindDTMsRotated(DTM: Integer; var Points: TPointArray; x1,
out aFound: Extended): Boolean;
function FindDTMsRotated(DTM: Integer; out Points: TPointArray; x1,
y1, x2, y2: Integer; sAngle, eAngle,
aStep: Extended; var aFound: T2DExtendedArray)
aStep: Extended; out aFound: T2DExtendedArray)
: Boolean;
function pFindDTM(DTM: pDTM; var x, y: Integer; x1, y1, x2, y2:
function pFindDTM(DTM: pDTM; out x, y: Integer; x1, y1, x2, y2:
Integer): Boolean;
function pFindDTMs(DTM: pDTM; var Points: TPointArray; x1, y1, x2,
function pFindDTMs(DTM: pDTM; out Points: TPointArray; x1, y1, x2,
y2: Integer): Boolean;
function pFindDTMRotated(DTM: pDTM; var x, y: Integer; x1, y1, x2,
function pFindDTMRotated(DTM: pDTM; out x, y: Integer; x1, y1, x2,
y2: Integer; sAngle, eAngle, aStep: Extended;
var aFound: Extended): Boolean;
function pFindDTMsRotated(DTM: pDTM; var Points: TPointArray; x1,
out aFound: Extended): Boolean;
function pFindDTMsRotated(DTM: pDTM; out Points: TPointArray; x1,
y1, x2, y2: Integer; sAngle, eAngle,
aStep: Extended; var aFound: T2DExtendedArray)
aStep: Extended; out aFound: T2DExtendedArray)
: Boolean;
constructor Create(Owner: TObject);
@ -436,7 +436,7 @@ end;
Tries to find the given DTM (index). If found will put the point the dtm has
been found at in x, y and result to true.
}
function TMDTM.FindDTM(DTM: Integer; var x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
function TMDTM.FindDTM(DTM: Integer; out x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
var
temp: pDTM;
begin
@ -455,7 +455,7 @@ end;
been found at in x, y and result to true.
}
function TMDTM.pFindDTM(DTM: pDTM; var x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
function TMDTM.pFindDTM(DTM: pDTM; out x, y: Integer; x1, y1, x2, y2: Integer): Boolean;
var
mP: TPointArray;
@ -531,7 +531,7 @@ end;
DTM's. All the occurances are stored in the Points (TPointArray)
/\}
function TMDTM.FindDTMs(DTM: Integer; Var Points: TPointArray; x1, y1, x2, y2: Integer): Boolean;
function TMDTM.FindDTMs(DTM: Integer; out Points: TPointArray; x1, y1, x2, y2: Integer): Boolean;
Var
temp: pDTM;
Begin
@ -551,7 +551,7 @@ End;
DTM's. All the occurances are stored in the Points (TPointArray)
/\}
Function TMDTM.pFindDTMs(DTM: pDTM; Var Points: TPointArray; x1, y1, x2, y2: Integer): Boolean;
Function TMDTM.pFindDTMs(DTM: pDTM; out Points: TPointArray; x1, y1, x2, y2: Integer): Boolean;
Var
mP: TPointArray;
@ -622,7 +622,7 @@ End;
Returns all Angles in an Extended array.
/\}
Function TMDTM.FindDTMRotated(DTM: Integer; Var x, y: Integer; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; Var aFound: Extended): Boolean;
Function TMDTM.FindDTMRotated(DTM: Integer; out x, y: Integer; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: Extended): Boolean;
Var
temp: pDTM;
Begin
@ -644,7 +644,7 @@ End;
Returns all Angles in an Extended array.
/\}
Function TMDTM.pFindDTMRotated(DTM: pDTM; Var x, y: Integer; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; Var aFound: Extended): Boolean;
Function TMDTM.pFindDTMRotated(DTM: pDTM; out x, y: Integer; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: Extended): Boolean;
Var
mP: TPointArray;
@ -762,7 +762,7 @@ End;
Returns all Angles in a Two Dimensional Extended array.
/\}
Function TMDTM.FindDTMsRotated(DTM: Integer; Var Points: TPointArray; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; Var aFound: T2DExtendedArray): Boolean;
Function TMDTM.FindDTMsRotated(DTM: Integer; out Points: TPointArray; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: T2DExtendedArray): Boolean;
Var
temp: pDTM;
Begin
@ -784,7 +784,7 @@ End;
Returns all Angles in a Two Dimensional Extended array.
/\}
Function TMDTM.pFindDTMsRotated(DTM: pDTM; Var Points: TPointArray; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; Var aFound: T2DExtendedArray): Boolean;
Function TMDTM.pFindDTMsRotated(DTM: pDTM; out Points: TPointArray; x1, y1, x2, y2: Integer; sAngle, eAngle, aStep: Extended; out aFound: T2DExtendedArray): Boolean;
Var
mP: TPointArray;

4
Units/MMLCore/files.pas
View File

@ -49,7 +49,7 @@ type
procedure CloseFile(FileNum: Integer);
function EndOfFile(FileNum: Integer): Boolean;
function FileSizeMuf(FileNum: Integer): LongInt;
function ReadFileString(FileNum: Integer; var s: string; x: Integer): Boolean;
function ReadFileString(FileNum: Integer; out s: string; x: Integer): Boolean;
function WriteFileString(FileNum: Integer; s: string): Boolean;
Function SetFileCharPointer(FileNum, cChars, Origin: Integer): Integer;
function FilePointerPos(FileNum: Integer): Integer;
@ -427,7 +427,7 @@ end;
Reads x numbers of characters from a file, and stores it into s.
/\}
function TMFiles.ReadFileString(FileNum: Integer; var s: string; x: Integer): Boolean;
function TMFiles.ReadFileString(FileNum: Integer; out s: string; x: Integer): Boolean;
begin
If(FileNum < 0) or (FileNum >= Length(MFiles)) Then

8
Units/MMLCore/finder.pas
View File

@ -58,8 +58,8 @@ type
function FindColorSpiral(var x, y: Integer; color, xs, ys, xe, ye: Integer): Boolean;
function FindColorTolerance(out x, y: Integer; Color, xs, ys, xe, ye, tol: Integer): Boolean;
function FindColorsTolerance(out Points: TPointArray; Color, xs, ys, xe, ye, Tol: Integer): Boolean;
function FindColorsSpiralTolerance(x, y: Integer; var Points: TPointArray; color, xs, ys, xe, ye: Integer; Tolerance: Integer) : boolean;
function FindColors(var TPA: TPointArray; Color, xs, ys, xe, ye: Integer): Boolean;
function FindColorsSpiralTolerance(x, y: Integer; out Points: TPointArray; color, xs, ys, xe, ye: Integer; Tolerance: Integer) : boolean;
function FindColors(out TPA: TPointArray; Color, xs, ys, xe, ye: Integer): Boolean;
//Mask
function FindBitmapMaskTolerance(mask: TMask; out x, y: Integer; xs, ys, xe, ye: Integer; Tolerance, ContourTolerance: Integer): Boolean;
procedure CheckMask(Mask : TMask);
@ -621,7 +621,7 @@ begin
end;
function TMFinder.FindColorsSpiralTolerance(x, y: Integer;
var Points: TPointArray; color, xs, ys, xe, ye: Integer; Tolerance: Integer
out Points: TPointArray; color, xs, ys, xe, ye: Integer; Tolerance: Integer
): boolean;
var
PtrData: TRetData;
@ -697,7 +697,7 @@ begin
TClient(Client).MWindow.FreeReturnData;
end;
function TMFinder.FindColors(var TPA: TPointArray; Color, xs, ys, xe, ye: Integer): Boolean;
function TMFinder.FindColors(out TPA: TPointArray; Color, xs, ys, xe, ye: Integer): Boolean;
var
PtrData: TRetData;
Ptr: PRGB32;

4
Units/MMLCore/input.pas
View File

@ -43,7 +43,7 @@ type
constructor Create(Client: TObject);
destructor Destroy; override;
procedure GetMousePos(var X, Y: Integer);
procedure GetMousePos(out X, Y: Integer);
procedure SetMousePos(X, Y: Integer);
procedure MouseButtonAction(x,y : integer; mClick: TClickType; mPress: TMousePress);
procedure MouseButtonActionSilent(x,y : integer; mClick: TClickType; mPress: TMousePress);
@ -231,7 +231,7 @@ begin
{$ENDIF}
end;
procedure TMInput.GetMousePos(var X, Y: Integer);
procedure TMInput.GetMousePos(out X, Y: Integer);
{$IFDEF LINUX}
var
b:integer;

15
Units/MMLCore/ocr.pas
View File

@ -30,7 +30,7 @@ interface
uses
Classes, SysUtils, MufasaTypes, bitmaps, math,
{Begin To-Remove units. Replace ReadBmp with TMufasaBitmap stuff later.}
FPImgCanv, graphtype, intfgraphics,graphics;
graphtype, intfgraphics,graphics;
{End To-Remove unit}
@ -123,7 +123,7 @@ end;
{initalizes the remaining fields from a TocrGlyphMask and finds the global bounds}
procedure findBounds(glyphs: TocrGlyphMaskArray; var width,height: integer);
procedure findBounds(glyphs: TocrGlyphMaskArray; out width,height: integer);
var
i,x,y,c,w,h: integer;
l,r,t,b: integer;
@ -305,7 +305,7 @@ begin
end;
{converts a TPA into a 1-0 image of the smallest possible size}
function PointsToNorm(points: TpointArray; var w,h: integer): TNormArray;
function PointsToNorm(points: TpointArray; out w,h: integer): TNormArray;
var
l,r,t,b: integer;
i,len,size: integer;
@ -440,7 +440,7 @@ begin
result.b:= (color1.b * weight1 + color2.b * weight2) div (weight1 + weight2);
end;
procedure RGBtoXYZ(color: tRGB; var X, Y, Z: real); inline;
procedure RGBtoXYZ(color: tRGB; out X, Y, Z: real); inline;
var
nr,ng,nb: real;
begin
@ -639,7 +639,12 @@ begin
{ This must be dynamic }
SetLength(OCRData, 1);
OCRData[0] := InitOCR(path + DS + 'UpChars' + DS);
result := true;
OCRPath := path + DS;
if DirectoryExists(path + DS + 'UpChars' + DS) then
OCRData[0] := InitOCR(path + DS + 'UpChars' + DS)
else
result := false;
end;
function TMOCR.GetUpTextAt(atX, atY: integer): string;

21
Units/MMLCore/window.pas
View File

@ -94,7 +94,8 @@ type
//Target handle; HWND
TargetHandle : Hwnd;
DrawBmpDataPtr : PRGB32;
DesktopHWND : Hwnd;
DesktopDC : HDC;
//Works on linux as well, test it out
TargetDC : HDC;
DrawBitmap : TBitmap;
@ -169,8 +170,11 @@ begin
Self.DrawBitmap := TBitmap.Create;
Self.DrawBitmap.PixelFormat:= pf32bit;
Self.TargetMode:= w_Window;
Self.TargetHandle:= windows.GetDesktopWindow;
Self.TargetDC:= GetWindowDC(Self.TargetHandle);
Self.TargetHandle:= 0;
Self.TargetDC := 0;
Self.DesktopHWND:= GetDesktopWindow;
Self.DesktopDC:= GetDC(0);
Self.SetDesktop;
Self.UpdateDrawBitmap;
{$ENDIF}
@ -242,7 +246,7 @@ begin
{$IFDEF LINUX}
Self.SetTarget(Self.DesktopWindow);
{$ELSE}
Self.SetTarget(windows.GetDesktopWindow, w_Window);
Self.SetTarget(Self.DesktopHWND, w_Window);
{$ENDIF}
end;
@ -671,9 +675,14 @@ begin
begin;
{$IFDEF MSWINDOWS}
ReleaseDC(Self.TargetHandle,Self.TargetDC);
//We had the desktop as target -> Not freeing that DC!
if not Self.TargetDC= Self.DesktopDC then
ReleaseDC(Self.TargetHandle,Self.TargetDC);
Self.TargetHandle := Window;
Self.TargetDC := GetWindowDC(Window);
if Window = Self.DesktopHWND then
Self.TargetDC := DesktopDC
else
Self.TargetDC := GetWindowDC(Window);
{$ENDIF}
end;
end;