Fixed bugs

This commit is contained in:
Christian Hammacher 2005-11-01 03:07:47 +00:00
parent d5c75fd6a5
commit 67c0230a62
6 changed files with 28 additions and 18 deletions

View File

@ -115,7 +115,7 @@ AutoIncBuild=1
MajorVer=1 MajorVer=1
MinorVer=3 MinorVer=3
Release=0 Release=0
Build=11 Build=12
Debug=0 Debug=0
PreRelease=0 PreRelease=0
Special=0 Special=0
@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys] [Version Info Keys]
CompanyName=AMX Mod X Dev Team CompanyName=AMX Mod X Dev Team
FileDescription= FileDescription=
FileVersion=1.3.0.11 FileVersion=1.3.0.12
InternalName= InternalName=
LegalCopyright= LegalCopyright=
LegalTrademarks= LegalTrademarks=

Binary file not shown.

Binary file not shown.

View File

@ -371,11 +371,6 @@ end;
procedure UpdateCI(eLine: Integer); procedure UpdateCI(eLine: Integer);
begin begin
if eCILine <> -1 then begin
eCILine := eLine;
exit;
end;
if not Plugin_UpdateCodeInspector(GetCurrLang.Name, ActiveDoc.FileName, frmMain.tsMain.Items[frmMain.tsMain.ActiveTabIndex].Caption, True) then exit; if not Plugin_UpdateCodeInspector(GetCurrLang.Name, ActiveDoc.FileName, frmMain.tsMain.Items[frmMain.tsMain.ActiveTabIndex].Caption, True) then exit;
if GetCurrLang.Name = 'Pawn' then begin if GetCurrLang.Name = 'Pawn' then begin

View File

@ -59,6 +59,7 @@ var i, k: integer;
eAddingEnum: Integer; eAddingEnum: Integer;
eTempResult: TPawnParseResult; eTempResult: TPawnParseResult;
eProcedureAdded: Boolean; eProcedureAdded: Boolean;
eCActive: Boolean;
begin begin
Result := TPawnParseResult.Create; Result := TPawnParseResult.Create;
if not IsRecursive then if not IsRecursive then
@ -70,13 +71,20 @@ begin
eStartLine := -1; eStartLine := -1;
eTimeToSleep := 0; eTimeToSleep := 0;
eAddingEnum := 0; eAddingEnum := 0;
eCActive := False;
for i := 0 to eCode.Count - 1 do begin for i := 0 to eCode.Count - 1 do begin
if (Application.Terminated) or (not Started) or (frmMain.pnlLoading.Visible) or (not frmMain.trvExplorer.Visible) then exit; if (Application.Terminated) or (not Started) or (frmMain.pnlLoading.Visible) or (not frmMain.trvExplorer.Visible) then exit;
eString := RemoveStringsAndComments(Trim(eCode[i]), True, True); eString := RemoveStringsAndComments(Trim(eCode[i]), True, True);
eBackup := Trim(eCode[i]); if (Pos('/*', eString) = 1) or (Pos('*/', eString) <> 0) then begin
eCActive := (Pos('/*', eString) = 1);
continue;
end;
if eCActive then
continue;
eBackup := Trim(eCode[i]);
eProcedureAdded := False; eProcedureAdded := False;
Inc(eTimeToSleep, 1); Inc(eTimeToSleep, 1);
@ -116,9 +124,10 @@ begin
end; end;
eString := RemoveStringsAndComments(Trim(eCode[i]), True, True); eString := RemoveStringsAndComments(Trim(eCode[i]), True, True);
end; end;
end continue;
end;
{ Included } { Included }
else if (IsAtStart('#include', eBackup)) then begin if (IsAtStart('#include', eBackup)) then begin
eString := StringReplace(eBackup, '/', '\', [rfReplaceAll]); eString := StringReplace(eBackup, '/', '\', [rfReplaceAll]);
if Between(eString, '<', '>') <> '' then begin if Between(eString, '<', '>') <> '' then begin
eString := Between(eString, '<', '>'); eString := Between(eString, '<', '>');
@ -164,14 +173,16 @@ begin
Sleep(20); Sleep(20);
end; end;
end; end;
end continue;
end;
{ CVars } { CVars }
else if (IsAtStart('register_cvar', eString)) and (not IsRecursive) then begin if (IsAtStart('register_cvar', eString)) and (not IsRecursive) then begin
if Between(eString, '"', '"') <> '' then if Between(eString, '"', '"') <> '' then
Result.CVars.AddObject(Between(eBackup, '"', '"'), TObject(i)); Result.CVars.AddObject(Between(eBackup, '"', '"'), TObject(i));
end continue;
end;
{ Defined } { Defined }
else if (IsAtStart('#define', eString)) then begin if (IsAtStart('#define', eString)) then begin
eString := Copy(eString, 8, Length(eString)); eString := Copy(eString, 8, Length(eString));
eString := Trim(eString); eString := Trim(eString);
Result.CallTips.Add(eString + '-> ' + FileName); Result.CallTips.Add(eString + '-> ' + FileName);
@ -181,13 +192,15 @@ begin
eString := Copy(eString, 1, Pos(' ', eString) - 1); eString := Copy(eString, 1, Pos(' ', eString) - 1);
Result.Defined.AddObject(eString, TObject(i)); Result.Defined.AddObject(eString, TObject(i));
Result.AutoComplete.Add(eString); Result.AutoComplete.Add(eString);
end continue;
end;
{ Events (Part 1) } { Events (Part 1) }
else if (IsAtStart('register_event(', eString)) and (not IsRecursive) then begin if (IsAtStart('register_event(', eString)) and (not IsRecursive) then begin
if CountChars(eBackup, '"') >= 4 then begin if CountChars(eBackup, '"') >= 4 then begin
eTemp := StringReplace(eBackup, '"' + Between(eBackup, '"', '"') + '"', '', []); eTemp := StringReplace(eBackup, '"' + Between(eBackup, '"', '"') + '"', '', []);
ePreEvents.Add(Between(eBackup, '"', '"')); ePreEvents.Add(Between(eBackup, '"', '"'));
end; end;
continue;
end; end;
{ Functions (1), this is adapted from AMXX-Edit v2 [see TextAnalyze.pas] } { Functions (1), this is adapted from AMXX-Edit v2 [see TextAnalyze.pas] }

View File

@ -2854,8 +2854,10 @@ end;
procedure TfrmMain.jviCodeItemValueChanged(Sender: TObject; procedure TfrmMain.jviCodeItemValueChanged(Sender: TObject;
Item: TJvCustomInspectorItem); Item: TJvCustomInspectorItem);
begin begin
if GetCurrLang.Name = 'Pawn' then if GetCurrLang.Name = 'Pawn' then begin
eCILine := sciEditor.GetCurrentLineNumber;
RebuildLine; RebuildLine;
end;
end; end;
procedure TfrmMain.mnuRestoreBackupClick(Sender: TObject); procedure TfrmMain.mnuRestoreBackupClick(Sender: TObject);