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

Merge branch 'lape-integration' into tests

This commit is contained in:
Merlijn Wajer 2011-09-26 23:19:23 +02:00
parent ba248f9ec1 2176f1d596
commit a7a9da90ba
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/Simba/psextension.pas
View File

@ -399,7 +399,7 @@ begin
end;
if InitScript then
mDebugLn('Init procedure succesfully called')
mDebugLn('Init procedure successfully called')
else
mDebugLn('Init procedure didn''t execute right, or couldn''t be found');
Enabled:= FWorking;

2
Projects/Simba/simbaunit.pas
View File

@ -3195,7 +3195,7 @@ begin
Idler;
if UnTarrer.Result then
begin;
FormWriteln('Succesfully installed the new fonts!');
FormWriteln('Successfully installed the new fonts!');
SetSetting('Settings/Fonts/Version',IntToStr(LatestVersion),true);
if Assigned(self.OCR_Fonts) then
self.OCR_Fonts.Free;

3
Projects/Simba/updateform.pas
View File

@ -241,7 +241,8 @@ begin
FCancelling := False;
FCancelled := True;
DownloadSpeed.Visible := false;
Self.UpdateLog.Lines.Add('Download stopped at '+inttostr(DownloadProgress.Position)+'%... Simba did not succesfully update.');
Self.UpdateLog.Lines.Add('Download stopped at '+inttostr(DownloadProgress.Position)+
'%... Simba did not successfully update.');
// more detailed info
mDebugLn('EXCEPTION IN UPDATEFORM: We either hit Cancel, or something went wrong with files');
if FileExists(Updater.BasePath + Updater.ReplacementFile + '_') then

6
Units/MMLAddon/mmlpsthread.pas
View File

@ -985,7 +985,7 @@ begin
if PSScript.Compile then
begin
OutputMessages;
psWriteln('Compiled succesfully in ' + IntToStr(GetTickCount - Starttime) + ' ms.');
psWriteln('Compiled successfully in ' + IntToStr(GetTickCount - Starttime) + ' ms.');
if CompileOnly then
exit;
// if not (ScriptState = SCompiling) then
@ -1229,7 +1229,7 @@ begin
RUTIS.Compile;
if not RUTIS.CompilerError then
begin
psWriteln('Compiled succesfully in ' + IntToStr(GetTickCount - Starttime) + ' ms.');
psWriteln('Compiled successfully in ' + IntToStr(GetTickCount - Starttime) + ' ms.');
if CompileOnly then
exit;
RUTIS.Run;
@ -1411,7 +1411,7 @@ begin
Starttime := lclintf.GetTickCount;
if Compiler.Compile() then
begin
psWriteln('Compiled succesfully in ' + IntToStr(GetTickCount - Starttime) + ' ms.');
psWriteln('Compiled successfully in ' + IntToStr(GetTickCount - Starttime) + ' ms.');
if CompileOnly then
Exit;
RunCode(Compiler.Emitter.Code);

2
Units/lape

@ -1 +1 @@
Subproject commit 2655d89f2cc2068560ed66497c7068bb19ed1bc4
Subproject commit f2e8f9cd12044293070cf31234143b0b3f702379