mirror of
https://github.com/alliedmodders/amxmodx.git
synced 2024-12-25 14:25:38 +03:00
Fixed another bug (I had fixed it once but removed the fix accidentally)
This commit is contained in:
parent
8016d02319
commit
efe4b674e2
@ -115,7 +115,7 @@ AutoIncBuild=1
|
||||
MajorVer=1
|
||||
MinorVer=3
|
||||
Release=0
|
||||
Build=12
|
||||
Build=14
|
||||
Debug=0
|
||||
PreRelease=0
|
||||
Special=0
|
||||
@ -126,7 +126,7 @@ CodePage=1252
|
||||
[Version Info Keys]
|
||||
CompanyName=AMX Mod X Dev Team
|
||||
FileDescription=
|
||||
FileVersion=1.3.0.12
|
||||
FileVersion=1.3.0.14
|
||||
InternalName=
|
||||
LegalCopyright=
|
||||
LegalTrademarks=
|
||||
|
Binary file not shown.
Binary file not shown.
@ -54,6 +54,7 @@ var eCILine: Integer;
|
||||
FItems: TObjectList;
|
||||
STLItem: TSelectionTextList;
|
||||
eStock: Boolean;
|
||||
eUpdating: Boolean;
|
||||
|
||||
implementation
|
||||
|
||||
@ -371,12 +372,15 @@ end;
|
||||
|
||||
procedure UpdateCI(eLine: Integer);
|
||||
begin
|
||||
if eUpdating then exit;
|
||||
eUpdating := True;
|
||||
if not Plugin_UpdateCodeInspector(GetCurrLang.Name, ActiveDoc.FileName, frmMain.tsMain.Items[frmMain.tsMain.ActiveTabIndex].Caption, True) then exit;
|
||||
|
||||
if GetCurrLang.Name = 'Pawn' then begin
|
||||
UpdateCI_Pawn(eLine);
|
||||
Plugin_UpdateCodeInspector(GetCurrLang.Name, ActiveDoc.FileName, frmMain.tsMain.Items[frmMain.tsMain.ActiveTabIndex].Caption, False);
|
||||
end;
|
||||
eUpdating := False;
|
||||
end;
|
||||
|
||||
procedure UpdateCI_Pawn(eLine: Integer);
|
||||
@ -387,6 +391,7 @@ var eCurrLine, eBackupLine: string;
|
||||
eVarCount, eConstCount: Integer;
|
||||
eFound: Boolean;
|
||||
begin
|
||||
eCILine := eLine;
|
||||
eBackupLine := frmMain.sciEditor.Lines[eLine];
|
||||
// Prevent parse errors
|
||||
eBackupLine := StringReplace(eBackupLine, #1, '', [rfReplaceAll]);
|
||||
@ -576,9 +581,7 @@ begin
|
||||
eStr.Free;
|
||||
frmMain.jviCode.EndUpdate;
|
||||
if eLine <> eCILine then
|
||||
UpdateCI_Pawn(eLine)
|
||||
else
|
||||
eCILine := -1;
|
||||
UpdateCI_Pawn(eLine);
|
||||
exit;
|
||||
end;
|
||||
{ Return }
|
||||
@ -598,9 +601,7 @@ begin
|
||||
eStr.Free;
|
||||
frmMain.jviCode.EndUpdate;
|
||||
if eLine <> eCILine then
|
||||
UpdateCI_Pawn(eLine)
|
||||
else
|
||||
eCILine := -1;
|
||||
UpdateCI_Pawn(eLine);
|
||||
exit;
|
||||
end;
|
||||
{ For-Loop }
|
||||
@ -639,9 +640,7 @@ begin
|
||||
eStr.Free;
|
||||
frmMain.jviCode.EndUpdate;
|
||||
if eLine <> eCILine then
|
||||
UpdateCI_Pawn(eLine)
|
||||
else
|
||||
eCILine := -1;
|
||||
UpdateCI_Pawn(eLine);
|
||||
exit;
|
||||
end;
|
||||
{ While-Loops }
|
||||
@ -689,9 +688,7 @@ begin
|
||||
eStr.Free;
|
||||
frmMain.jviCode.EndUpdate;
|
||||
if eLine <> eCILine then
|
||||
UpdateCI_Pawn(eLine)
|
||||
else
|
||||
eCILine := -1;
|
||||
UpdateCI_Pawn(eLine);
|
||||
exit;
|
||||
end;
|
||||
|
||||
@ -779,9 +776,7 @@ begin
|
||||
eStr.Free;
|
||||
frmMain.jviCode.EndUpdate;
|
||||
if eLine <> eCILine then
|
||||
UpdateCI_Pawn(eLine)
|
||||
else
|
||||
eCILine := -1;
|
||||
UpdateCI_Pawn(eLine);
|
||||
exit;
|
||||
end
|
||||
else if (Pos('(', eCurrLine) <> Pos(')', eCurrLine)) and (Assignment(eBackupLine) = '') then begin // Function Call
|
||||
@ -896,9 +891,7 @@ begin
|
||||
eStr2.Free;
|
||||
frmMain.jviCode.EndUpdate;
|
||||
if eLine <> eCILine then
|
||||
UpdateCI_Pawn(eLine)
|
||||
else
|
||||
eCILine := -1;
|
||||
UpdateCI_Pawn(eLine);
|
||||
exit;
|
||||
end
|
||||
{ Assignment }
|
||||
@ -922,9 +915,7 @@ begin
|
||||
eStr.Free;
|
||||
frmMain.jviCode.EndUpdate;
|
||||
if eLine <> eCILine then
|
||||
UpdateCI_Pawn(eLine)
|
||||
else
|
||||
eCILine := -1;
|
||||
UpdateCI_Pawn(eLine);
|
||||
exit;
|
||||
end;
|
||||
|
||||
@ -934,9 +925,7 @@ begin
|
||||
frmMain.jviCode.EndUpdate;
|
||||
|
||||
if eLine <> eCILine then
|
||||
UpdateCI_Pawn(eLine)
|
||||
else
|
||||
eCILine := -1;
|
||||
UpdateCI_Pawn(eLine);
|
||||
end;
|
||||
|
||||
{ TSTLWrapper }
|
||||
@ -1153,7 +1142,8 @@ begin
|
||||
|
||||
if Trim(eLine) <> '' then
|
||||
frmMain.sciEditor.Lines[eCILine] := eLine;
|
||||
// UpdateCI(eCILine);
|
||||
frmMain.mnuModified.Caption := lModified;
|
||||
ActiveDoc.Modified := True;
|
||||
end;
|
||||
|
||||
initialization
|
||||
|
@ -1323,7 +1323,7 @@ begin
|
||||
case tsMain.ActiveTabIndex of
|
||||
0: Collection := PawnProjects;
|
||||
1: Collection := CPPProjects;
|
||||
else Collection := OtherProjects;
|
||||
else Collection := OtherProjects;
|
||||
end;
|
||||
|
||||
frmAllFilesForm.Caption := lCloseAllCaption1;
|
||||
@ -2847,17 +2847,18 @@ end;
|
||||
|
||||
procedure TfrmMain.trvExplorerClick(Sender: TObject);
|
||||
begin
|
||||
if Assigned(trvExplorer.Selected) then
|
||||
if Assigned(trvExplorer.Selected) then begin
|
||||
if trvExplorer.Selected.ImageIndex >= 42 then exit;
|
||||
|
||||
UpdateCI(Integer(trvExplorer.Selected.Data));
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrmMain.jviCodeItemValueChanged(Sender: TObject;
|
||||
Item: TJvCustomInspectorItem);
|
||||
begin
|
||||
if GetCurrLang.Name = 'Pawn' then begin
|
||||
eCILine := sciEditor.GetCurrentLineNumber;
|
||||
if GetCurrLang.Name = 'Pawn' then
|
||||
RebuildLine;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrmMain.mnuRestoreBackupClick(Sender: TObject);
|
||||
|
Loading…
Reference in New Issue
Block a user