1
0
mirror of https://github.com/moparisthebest/Simba synced 2024-11-28 12:02:15 -05:00

libMML: Some bugfixes + started changing indent.

This commit is contained in:
Merlijn Wajer 2011-02-06 00:14:56 +01:00
parent fa4d89446b
commit 40f6b542c6

View File

@ -5,7 +5,7 @@ library libmml;
uses uses
cmem,Classes,interfaces,graphics,client,sysutils,MufasaTypes,dtmutil, dtm; cmem,Classes,interfaces,graphics,client,sysutils,MufasaTypes,dtmutil, dtm;
{$R *.res} //{$R *.res}
Const Const
RESULT_OK = 0; RESULT_OK = 0;
@ -59,24 +59,22 @@ begin
C := TClient.Create(''); C := TClient.Create('');
Result := PtrUInt(C); Result := PtrUInt(C);
except on e : Exception do except on e : Exception do
begin
// FIXME UINT negative // FIXME UINT negative
result := PtrUInt(RESULT_ERROR); result := PtrUInt(RESULT_ERROR);
set_last_error(e.Message); set_last_error(e.Message);
end; end;
end;
writeln(format('C: %d, IOManager: %d', [PtrUInt(C), PtrUInt(C.IOManager)])); writeln(format('C: %d, IOManager: %d', [PtrUInt(C), PtrUInt(C.IOManager)]));
end; end;
{ Destroy a TClient } { Destroy a TClient }
function destroy_client(C: TClient): integer; cdecl; function destroy_client(C: TClient): integer; cdecl;
begin begin
if not validate_client(C) then try
begin
exit(RESULT_ERROR);
end;
C.Free; C.Free;
except on e : Exception do
result := RESULT_ERROR;
set_last_error(e.message):
end;
end; end;
{ Set (verbose) debug on/off } { Set (verbose) debug on/off }
@ -150,31 +148,22 @@ begin
C.IOManager.GetMousePos(t.x,t.y); C.IOManager.GetMousePos(t.x,t.y);
result := RESULT_OK; result := RESULT_OK;
except on e : Exception do except on e : Exception do
begin
result := RESULT_ERROR; result := RESULT_ERROR;
set_last_error(e.Message); set_last_error(e.Message);
end; end;
end; end;
end;
{ Set mouse position of client C to point t } { Set mouse position of client C to point t }
function set_mouse_pos(C: TClient; var t: tpoint): integer; cdecl; function set_mouse_pos(C: TClient; var t: tpoint): integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
C.IOManager.MoveMouse(t.x,t.y); C.IOManager.MoveMouse(t.x,t.y);
result := RESULT_OK; result := RESULT_OK;
except on e : Exception do except on e : Exception do
begin
result := RESULT_ERROR; result := RESULT_ERROR;
set_last_error(e.Message); set_last_error(e.Message);
end; end;
end; end;
end;
{ Helper function } { Helper function }
@ -190,30 +179,20 @@ end;
{ Return the state of a mouse button given client C } { Return the state of a mouse button given client C }
function get_mouse_button_state(C: TClient; But: Integer): Integer; cdecl; function get_mouse_button_state(C: TClient; But: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
if C.IOManager.IsMouseButtonDown(ConvIntClickType(But)) then if C.IOManager.IsMouseButtonDown(ConvIntClickType(But)) then
result := MOUSE_DOWN; result := MOUSE_DOWN;
else
result := MOUSE_UP;
except on e : Exception do except on e : Exception do
begin
result := RESULT_ERROR; result := RESULT_ERROR;
set_last_error(e.Message); set_last_error(e.Message);
end; end;
end; end;
end;
{ Set the state of a mouse button given client C } { Set the state of a mouse button given client C }
function set_mouse_button_state(C: TClient; But, State, X, Y: Integer): Integer; cdecl; function set_mouse_button_state(C: TClient; But, State, X, Y: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
if State = MOUSE_UP then if State = MOUSE_UP then
begin begin
@ -225,12 +204,10 @@ begin
result := RESULT_OK; result := RESULT_OK;
end; end;
except on e : Exception do except on e : Exception do
begin
result := RESULT_ERROR; result := RESULT_ERROR;
set_last_error(e.Message); set_last_error(e.Message);
end; end;
end; end;
end;
{ Colour } { Colour }
@ -238,78 +215,53 @@ end;
function get_color(C: TClient; x, y: Integer; function get_color(C: TClient; x, y: Integer;
out color: Integer): Integer; cdecl; out color: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
begin
color := C.IOManager.GetColor(x, y); color := C.IOManager.GetColor(x, y);
if color > -1 then if color > -1 then
result := RESULT_OK result := RESULT_OK
else else
result := RESULT_FALSE; result := RESULT_FALSE;
end;
except on e : Exception do except on e : Exception do
begin
set_last_error(e.message); set_last_error(e.message);
result := RESULT_ERROR; result := RESULT_ERROR;
end; end;
end; end;
end;
{ Find color on client C in area (x1,y1,x2,y2) and return coordinate (if any) in x, y }
function find_color(C: TClient; var x, y: Integer; function find_color(C: TClient; var x, y: Integer;
color, x1, y1, x2, y2: Integer): Integer; cdecl; color, x1, y1, x2, y2: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
if C.MFinder.FindColor(x, y, color, x1, y1, x2, y2) then if C.MFinder.FindColor(x, y, color, x1, y1, x2, y2) then
result := RESULT_OK result := RESULT_OK
else else
result := RESULT_FALSE; result := RESULT_FALSE;
except on e : Exception do except on e : Exception do
begin
set_last_error(e.Message); set_last_error(e.Message);
result := RESULT_ERROR; result := RESULT_ERROR;
end; end;
end; end;
end;
function find_color_tolerance(C: TClient; var x, y: Integer; color: Integer; function find_color_tolerance(C: TClient; var x, y: Integer; color: Integer;
tol, x1, y1, x2, y2: Integer): Integer; cdecl; tol, x1, y1, x2, y2: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
if C.MFinder.FindColorTolerance(x, y, color, x1, y1, x2, y2, tol) then if C.MFinder.FindColorTolerance(x, y, color, x1, y1, x2, y2, tol) then
result := RESULT_OK result := RESULT_OK
else else
result := RESULT_FALSE; result := RESULT_FALSE;
except on e : Exception do except on e : Exception do
begin
set_last_error(e.Message); set_last_error(e.Message);
result := RESULT_ERROR; result := RESULT_ERROR;
end; end;
end; end;
end;
function find_color_tolerance_optimised(C: TClient; var x, y: Integer; function find_color_tolerance_optimised(C: TClient; var x, y: Integer;
var len: Integer; col: Integer; var len: Integer; col: Integer;
x1, y1, x2, y2: Integer; x1, y1, x2, y2: Integer;
tol: Integer): Integer; cdecl; tol: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
if C.MFinder.FindColorToleranceOptimised(x, y, col, x1, y1, x2, y2, if C.MFinder.FindColorToleranceOptimised(x, y, col, x1, y1, x2, y2,
tol) then tol) then
@ -317,39 +269,32 @@ begin
else else
result := RESULT_FALSE; result := RESULT_FALSE;
except on e : Exception do except on e : Exception do
begin
set_last_error(e.message); set_last_error(e.message);
result := RESULT_ERROR; result := RESULT_ERROR;
end; end;
end; end;
end;
function find_colors(C: TClient; var ptr: PPoint; var len: Integer; function find_colors(C: TClient; var ptr: PPoint; var len: Integer;
color, x1, y1, x2, y2: Integer): Integer; cdecl; color, x1, y1, x2, y2: Integer): Integer; cdecl;
var var
TPA: TPointArray; TPA: TPointArray;
begin begin
if not validate_client(C) then setlength(TPA, 0);
begin
exit(RESULT_ERROR);
end;
SetLength(TPA, 0);
try try
C.MFinder.FindColors(TPA, color, x1, y1, x2, y2); C.MFinder.FindColors(TPA, color, x1, y1, x2, y2);
except on e : Exception do except on e : Exception do
begin
set_last_error(e.Message); set_last_error(e.Message);
result := RESULT_ERROR; result := RESULT_ERROR;
end; end;
end;
len := Length(TPA); len := Length(TPA);
ptr := array_to_ptr(Pointer(@TPA[0]), len, sizeof(TPoint));
if len > 0 then if len > 0 then
result := RESULT_OK result := RESULT_OK
else else
result := RESULT_FALSE; setlength(tpa, 0);
exit(RESULT_FALSE);
ptr := array_to_ptr(Pointer(@TPA[0]), len, sizeof(TPoint));
setlength(tpa, 0); setlength(tpa, 0);
end; end;
@ -358,11 +303,6 @@ function find_colors_tolerance(C: TClient; var ptr: PPoint; var len: Integer;
var var
TPA: TPointArray; TPA: TPointArray;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
C.MFinder.FindColorsTolerance(TPA, color, x1, y1, x2, y2, tol); C.MFinder.FindColorsTolerance(TPA, color, x1, y1, x2, y2, tol);
except on e : Exception do except on e : Exception do
@ -373,11 +313,13 @@ begin
end; end;
len := Length(TPA); len := Length(TPA);
ptr := array_to_ptr(Pointer(@TPA[0]), len, sizeof(TPoint));
if len > 0 then if len > 0 then
result := RESULT_OK result := RESULT_OK
else else
result := RESULT_FALSE; setlength(tpa, 0);
exit(RESULT_FALSE);
ptr := array_to_ptr(Pointer(@TPA[0]), len, sizeof(TPoint));
setlength(TPA, 0); setlength(TPA, 0);
end; end;
@ -388,10 +330,6 @@ function find_colors_tolerance_optimised(C: TClient; var ptr: PPoint;
var var
TPA: TPointArray; TPA: TPointArray;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
C.MFinder.FindColorsToleranceOptimised(TPA, col, x1, y1, x2, y2, tol); C.MFinder.FindColorsToleranceOptimised(TPA, col, x1, y1, x2, y2, tol);
except on e : Exception do except on e : Exception do
@ -402,19 +340,18 @@ begin
end; end;
len := Length(TPA); len := Length(TPA);
ptr := array_to_ptr(Pointer(@TPA[0]), len, sizeof(TPoint));
if len > 0 then if len > 0 then
result := RESULT_OK result := RESULT_OK
else else
result := RESULT_FALSE; setlength(tpa, 0);
exit(RESULT_FALSE);
ptr := array_to_ptr(Pointer(@TPA[0]), len, sizeof(TPoint));
setlength(TPA, 0);
end; end;
function similar_colors(C: TClient; col1, col2, tol: Integer): Integer; cdecl; function similar_colors(C: TClient; col1, col2, tol: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
if C.MFinder.SimilarColors(col1, col2, tol) then if C.MFinder.SimilarColors(col1, col2, tol) then
result := RESULT_OK result := RESULT_OK
else else
@ -424,10 +361,6 @@ end;
function count_color(C: TClient; out count: Integer; function count_color(C: TClient; out count: Integer;
Color, xs, ys, xe, ye: Integer): Integer; cdecl; Color, xs, ys, xe, ye: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
begin begin
count := C.MFinder.CountColor(Color, xs, ys, xe, ye); count := C.MFinder.CountColor(Color, xs, ys, xe, ye);
@ -447,10 +380,6 @@ end;
function count_color_tolerance(C: TClient; out count: Integer; col: Integer; function count_color_tolerance(C: TClient; out count: Integer; col: Integer;
xs, ys, xe, ye, tol: Integer): Integer; cdecl; xs, ys, xe, ye, tol: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
count := C.MFinder.CountColorTolerance(col, xs, ys, xe, ye, tol); count := C.MFinder.CountColorTolerance(col, xs, ys, xe, ye, tol);
except on e : Exception do except on e : Exception do
@ -468,10 +397,6 @@ end;
function find_color_spiral(C: TClient; var x, y: Integer; function find_color_spiral(C: TClient; var x, y: Integer;
col, xs, ys, xe, ye: Integer): Integer; cdecl; col, xs, ys, xe, ye: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
if C.MFinder.FindColorSpiral(x, y, col, xs, ys, xe, ye) then if C.MFinder.FindColorSpiral(x, y, col, xs, ys, xe, ye) then
result := RESULT_OK result := RESULT_OK
@ -489,10 +414,6 @@ function find_color_spiral_tolerance(C: TClient; var x, y: Integer;
col, xs, ys, xe, ye: Integer; col, xs, ys, xe, ye: Integer;
tol: Integer): Integer; cdecl; tol: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
if C.MFinder.FindColorSpiralTolerance(x, y, col, xs, ys, xe, ye, tol) then if C.MFinder.FindColorSpiralTolerance(x, y, col, xs, ys, xe, ye, tol) then
result := RESULT_OK result := RESULT_OK
@ -509,10 +430,6 @@ end;
function find_colored_area(C: TClient; var x, y: Integer; function find_colored_area(C: TClient; var x, y: Integer;
col, xs, ys, xe, ye, minA: Integer): Integer; cdecl; col, xs, ys, xe, ye, minA: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
if C.MFinder.FindColoredArea(x, y, col, xs, ys, xe, ye, minA) then if C.MFinder.FindColoredArea(x, y, col, xs, ys, xe, ye, minA) then
result := RESULT_OK result := RESULT_OK
@ -530,10 +447,6 @@ function find_colored_area_tolerance(C: TClient; var x, y: Integer;
col, xs, ys, xe, ye, minA: Integer; col, xs, ys, xe, ye, minA: Integer;
tol: Integer): Integer; cdecl; tol: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
if C.MFinder.FindColoredAreaTolerance(x, y, col, if C.MFinder.FindColoredAreaTolerance(x, y, col,
xs, ys, xe, ye, minA, tol) then xs, ys, xe, ye, minA, tol) then
@ -550,10 +463,6 @@ end;
function set_tolerance_speed(C: TClient; nCTS: Integer): Integer; cdecl; function set_tolerance_speed(C: TClient; nCTS: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
begin begin
C.MFinder.SetToleranceSpeed(nCTS); C.MFinder.SetToleranceSpeed(nCTS);
@ -569,21 +478,21 @@ end;
function get_tolerance_speed(C: TClient; out cts: Integer): Integer; cdecl; function get_tolerance_speed(C: TClient; out cts: Integer): Integer; cdecl;
begin begin
if not validate_client(C) then try
begin begin
exit(RESULT_ERROR);
end;
cts := C.MFinder.GetToleranceSpeed; cts := C.MFinder.GetToleranceSpeed;
result := RESULT_OK; result := RESULT_OK;
end
except on e: Exception do
begin
set_last_error(e.message);
result := RESULT_ERROR;
end;
end; end;
function set_tolerance_speed_2_modifiers(C: TClient; function set_tolerance_speed_2_modifiers(C: TClient;
nHue, nSat: Extended): Integer; cdecl; nHue, nSat: Extended): Integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
begin begin
C.MFinder.SetToleranceSpeed2Modifiers(nHue, nSat); C.MFinder.SetToleranceSpeed2Modifiers(nHue, nSat);
@ -602,15 +511,19 @@ function get_tolerance_speed_2_modifiers(C: TClient; out hueMod: Extended;
var var
h, s: Extended; h, s: Extended;
begin begin
if not validate_client(C) then try:
begin begin
exit(RESULT_ERROR);
end;
C.MFinder.GetToleranceSpeed2Modifiers(h, s); C.MFinder.GetToleranceSpeed2Modifiers(h, s);
hueMod := h; hueMod := h;
satMod := s; satMod := s;
result := RESULT_OK; result := RESULT_OK;
end; end;
except on e : Exception do
begin
set_last_error(e.message);
result := RESULT_ERROR;
end;
end;
{ DTM } { DTM }
@ -636,11 +549,6 @@ end;
{ Delete a MDTM. Don't delete it if it is managed! use remove_dtm instead } { Delete a MDTM. Don't delete it if it is managed! use remove_dtm instead }
function delete_dtm(C: TClient; DTM: TMDTM): integer; cdecl; function delete_dtm(C: TClient; DTM: TMDTM): integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
if not assigned(DTM) then if not assigned(DTM) then
begin begin
set_last_error('DTM is NULL'); set_last_error('DTM is NULL');
@ -655,28 +563,26 @@ end;
{ Add a previously created DTM to the DTM Manager } { Add a previously created DTM to the DTM Manager }
function add_dtm(C: TClient; DTM: TMDTM; var index: integer): integer; cdecl; function add_dtm(C: TClient; DTM: TMDTM; var index: integer): integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
if not assigned(DTM) then if not assigned(DTM) then
begin begin
set_last_error('DTM is NULL'); set_last_error('DTM is NULL');
exit(RESULT_ERROR); exit(RESULT_ERROR);
end; end;
try:
begin
index := C.MDTMs.AddDTM(DTM); index := C.MDTMs.AddDTM(DTM);
exit(RESULT_OK);
end;
except on e : Exception do
begin
exit(RESULT_ERROR);
end;
end; end;
{ Remove a previously added DTM from the DTM manager. This also frees the DTM } { Remove a previously added DTM from the DTM manager. This also frees the DTM }
function remove_dtm(C: TClient; DTMi: integer): integer; cdecl; function remove_dtm(C: TClient; DTMi: integer): integer; cdecl;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
C.MDTMs.FreeDTM(DTMi); C.MDTMs.FreeDTM(DTMi);
end; end;
@ -685,11 +591,6 @@ function find_dtm(C: TClient; DTMi: integer; var x, y: integer; x1, y1, x2, y2:
var var
res: boolean; res: boolean;
begin begin
if not validate_client(C) then
begin
exit(RESULT_ERROR);
end;
try try
res := C.MFinder.FindDTM(C.MDTMs.DTM[DTMi], x, y, x1, y1, x2, y2); res := C.MFinder.FindDTM(C.MDTMs.DTM[DTMi], x, y, x1, y1, x2, y2);
except on e : Exception do except on e : Exception do
@ -705,13 +606,34 @@ begin
result := RESULT_FALSE; result := RESULT_FALSE;
end; end;
function set_array_target(C: TClient; Arr: PRGB32; Size: TPoint): integer; cdecl; { Find a DTM given DTM index i, client C in area x1,y1,x2,y2. Return coord at x, y. }
function find_dtms(C: TClient; DTMi: integer; ptr: PPoint; x1, y1, x2, y2: integer): integer; cdecl;
var
res: boolean;
TPA: TPointArray;
begin begin
if not validate_client(C) then try
res := C.MFinder.FindDTMs(C.MDTMs.DTM[DTMi], TPA, x1, y1, x2, y2);
except on e : Exception do
begin begin
exit(RESULT_ERROR); result := RESULT_ERROR;
set_last_error(e.Message);
end;
end; end;
len := Length(TPA);
if len > 0 then
result := RESULT_OK
else
setlength(tpa, 0);
exit(RESULT_FALSE);
ptr := array_to_ptr(Pointer(@TPA[0]), len, sizeof(TPoint));
setlength(TPA, 0);
end;
function set_array_target(C: TClient; Arr: PRGB32; Size: TPoint): integer; cdecl;
begin
if not assigned(Arr) then if not assigned(Arr) then
begin begin
set_last_error('Arr is not assigned'); set_last_error('Arr is not assigned');