Skip to content
This repository has been archived by the owner on Jun 9, 2022. It is now read-only.

Commit

Permalink
Correcting typo. ref #78
Browse files Browse the repository at this point in the history 
Thnx Hobbilis for noticing.
  • Loading branch information
@Faq
Faq committed Oct 20, 2018
1 parent 6526acb commit 95aaf6b
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 42 deletions.
28 changes: 14 additions & 14 deletions MainUnit.dfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ object MainForm: TMainForm
Height = 13
Caption = 'Quest Starter'
end
object lbQuestTenderSearch: TLabel
object lbQuestEnderSearch: TLabel
Left = 136
Top = 50
Width = 65
Height = 13
Caption = 'Quest Tender'
Caption = 'Quest Ender'
end
object edQuestID: TLabeledEdit
Left = 9
Expand Down Expand Up @@ -156,7 +156,7 @@ object MainForm: TMainForm
OnButtonClick = btQuestStarterSearchClick
OnChange = edSearchChange
end
object edQuestTenderSearch: TJvComboEdit
object edQuestEnderSearch: TJvComboEdit
Left = 136
Top = 64
Width = 122
Expand Down Expand Up @@ -192,7 +192,7 @@ object MainForm: TMainForm
FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF}
TabOrder = 3
Text = ''
OnButtonClick = btQuestTenderSearchClick
OnButtonClick = btQuestEnderSearchClick
OnChange = edSearchChange
end
object btSearch: TBitBtn
Expand Down Expand Up @@ -5113,27 +5113,27 @@ object MainForm: TMainForm
end>
end
end
object tsQuestTender: TTabSheet
Caption = 'Quest Tenders'
object tsQuestender: TTabSheet
Caption = 'Quest enders'
ImageIndex = 4
DesignSize = (
964
627)
object lbQuestTenderInfo: TLabel
object lbQuestEnderInfo: TLabel
Left = 8
Top = 37
Width = 185
Height = 13
Caption = 'Quest Tenders (*_questender template)'
Caption = 'Quest enders (*_questender template)'
end
object lbQuestTenderLocation: TLabel
object lbQuestenderLocation: TLabel
Left = 8
Top = 210
Width = 105
Height = 13
Caption = 'Quest Tender location'
Caption = 'Quest Ender location'
end
object btAddQuestTender: TSpeedButton
object btAddQuestEnder: TSpeedButton
Left = 8
Top = 8
Width = 73
Expand Down Expand Up @@ -5191,9 +5191,9 @@ object MainForm: TMainForm
C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0
C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0}
NumGlyphs = 2
OnClick = btAddQuestTenderClick
OnClick = btAddQuestEnderClick
end
object btDelQuestTender: TSpeedButton
object btDelQuestEnder: TSpeedButton
Left = 87
Top = 8
Width = 73
Expand Down Expand Up @@ -5252,7 +5252,7 @@ object MainForm: TMainForm
C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0
C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0}
NumGlyphs = 2
OnClick = btDelQuestTenderClick
OnClick = btDelQuestEnderClick
end
object lvqtTenderTemplate: TJvListView
Left = 8
Expand Down
56 changes: 28 additions & 28 deletions MainUnit.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ TMainForm = class(TForm)
tsSearch: TTabSheet;
pnSearch: TPanel;
lbQuestStarterSearch: TLabel;
lbQuestTenderSearch: TLabel;
lbQuestEnderSearch: TLabel;
edQuestID: TLabeledEdit;
edQuestTitle: TLabeledEdit;
edQuestStarterSearch: TJvComboEdit;
edQuestTenderSearch: TJvComboEdit;
edQuestEnderSearch: TJvComboEdit;
btSearch: TBitBtn;
btClear: TBitBtn;
gbSpecialFlags: TGroupBox;
Expand Down Expand Up @@ -313,9 +313,9 @@ TMainForm = class(TForm)
lbLocationOrLoot: TLabel;
lvqtStarterTemplate: TJvListView;
lvqtStarterLocation: TJvListView;
tsQuestTender: TTabSheet;
lbQuestTenderInfo: TLabel;
lbQuestTenderLocation: TLabel;
tsQuestender: TTabSheet;
lbQuestEnderInfo: TLabel;
lbQuestEnderLocation: TLabel;
lvqtTenderTemplate: TJvListView;
lvqtTenderLocation: TJvListView;
tsScriptTab: TTabSheet;
Expand Down Expand Up @@ -1031,8 +1031,8 @@ TMainForm = class(TForm)
btFullScriptGOLocation: TButton;
btAddQuestStarter: TSpeedButton;
btDelQuestStarter: TSpeedButton;
btAddQuestTender: TSpeedButton;
btDelQuestTender: TSpeedButton;
btAddQuestEnder: TSpeedButton;
btDelQuestEnder: TSpeedButton;
edqtRequiredMaxRepFaction: TJvComboEdit;
edqtRequiredMaxRepValue: TLabeledEdit;
lbRequiredMaxRepFaction: TLabel;
Expand Down Expand Up @@ -1606,7 +1606,7 @@ TMainForm = class(TForm)
procedure btSearchClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure btAddQuestTenderClick(Sender: TObject);
procedure btAddQuestEnderClick(Sender: TObject);
procedure lvQuestDblClick(Sender: TObject);
procedure tsScriptTabShow(Sender: TObject);
procedure btExecuteScriptClick(Sender: TObject);
Expand All @@ -1626,7 +1626,7 @@ TMainForm = class(TForm)
procedure btCheckQuestClick(Sender: TObject);
procedure btCheckAllClick(Sender: TObject);
procedure btQuestStarterSearchClick(Sender: TObject);
procedure btQuestTenderSearchClick(Sender: TObject);
procedure btQuestEnderSearchClick(Sender: TObject);
procedure nSettingsClick(Sender: TObject);
procedure btBrowseSiteClick(Sender: TObject);
procedure btDeleteQuestClick(Sender: TObject);
Expand Down Expand Up @@ -1874,7 +1874,7 @@ TMainForm = class(TForm)
procedure lvqtStarterTemplateChange(Sender: TObject; Item: TListItem; Change: TItemChange);
procedure lvqtTenderTemplateChange(Sender: TObject; Item: TListItem; Change: TItemChange);
procedure btDelQuestStarterClick(Sender: TObject);
procedure btDelQuestTenderClick(Sender: TObject);
procedure btDelQuestEnderClick(Sender: TObject);
procedure nReconnectClick(Sender: TObject);
procedure tsCreatureUsedShow(Sender: TObject);
procedure lvCreatureStartsEndsDblClick(Sender: TObject);
Expand Down Expand Up @@ -2036,10 +2036,10 @@ TMainForm = class(TForm)
procedure CompleteLocalesQuest;
procedure ExecuteScript(script: string; memo: TMemo); overload;
procedure LoadQuestStarters(QuestID: integer);
procedure LoadQuestTenders(QuestID: integer);
procedure LoadQuestEnders(QuestID: integer);
procedure LoadQuestLocales(QuestID: integer);
procedure LoadQuestStarterInfo(objtype: string; entry: string);
procedure LoadQuestTenderInfo(objtype: string; entry: string);
procedure LoadQuestEnderInfo(objtype: string; entry: string);
procedure ClearFields(Where: TType);
procedure SetDefaultFields(Where: TType);
procedure ShowSettings(n: integer);
Expand Down Expand Up @@ -2299,9 +2299,9 @@ procedure TMainForm.SearchQuest;
end;
end;

if edQuestTenderSearch.Text<>'' then
if edQuestEnderSearch.Text<>'' then
begin
GetWhoAndKey(edQuestTenderSearch.Text, who, key);
GetWhoAndKey(edQuestEnderSearch.Text, who, key);
if who = 'creature' then
MyTempQuery.SQL.Text := Format('SELECT `quest` FROM `creature_questender` WHERE (`id`=%s)',[key])
else
Expand Down Expand Up @@ -2535,7 +2535,7 @@ procedure TMainForm.btAddQuestStarterClick(Sender: TObject);
end;
end;

procedure TMainForm.btAddQuestTenderClick(Sender: TObject);
procedure TMainForm.btAddQuestEnderClick(Sender: TObject);
var
F: TWhoQuestForm;
begin
Expand All @@ -2544,7 +2544,7 @@ procedure TMainForm.btAddQuestTenderClick(Sender: TObject);
if Assigned(lvqtTenderTemplate.Selected) then F.Prepare(lvqtTenderTemplate.Selected.Caption + ',' + lvqtTenderTemplate.Selected.SubItems[0]);
if F.ShowModal=mrOk then
begin
if F.rgTypeOfWho.ItemIndex=2 then // item cannot be a quest Tender now
if F.rgTypeOfWho.ItemIndex=2 then // item cannot be a quest Ender now
ShowMessage(dmMain.Text[1]) else
with lvqtTenderTemplate.Items.Add do
begin
Expand Down Expand Up @@ -2639,7 +2639,7 @@ procedure TMainForm.LoadQuest(QuestID: integer);
MyQuery.Close;

LoadQuestStarters(QuestID);
LoadQuestTenders(QuestID);
LoadQuestEnders(QuestID);
LoadQuestLocales(QuestID);
except
on E: Exception do
Expand Down Expand Up @@ -2843,7 +2843,7 @@ procedure TMainForm.CompleteScript;
end;

if lvqtTenderTemplate.Items.Count = 0 then
meqtLog.Lines.Add(dmMain.Text[6]) //'Error: QuestTender is not set'
meqtLog.Lines.Add(dmMain.Text[6]) //'Error: QuestEnder is not set'
else
for I := 0 to lvqtTenderTemplate.Items.Count - 1 do
begin
Expand Down Expand Up @@ -3215,7 +3215,7 @@ procedure TMainForm.LoadQuestStarters(QuestID: integer);
MyQuery.Close;
end;

procedure TMainForm.LoadQuestTenderInfo(objtype: string; entry: string);
procedure TMainForm.LoadQuestEnderInfo(objtype: string; entry: string);
var
SQLText: string;
begin
Expand All @@ -3232,7 +3232,7 @@ procedure TMainForm.LoadQuestTenderInfo(objtype: string; entry: string);
LoadQueryToListView(SQLText, lvqtTenderLocation);
end;

procedure TMainForm.LoadQuestTenders(QuestID: integer);
procedure TMainForm.LoadQuestEnders(QuestID: integer);
begin
// search for quest starter
MyQuery.SQL.Text := Format('SELECT t.entry, t.name, t.npcflag FROM `creature_questender` q ' +
Expand Down Expand Up @@ -3548,18 +3548,18 @@ procedure TMainForm.btQuestStarterSearchClick(Sender: TObject);
end;
end;

procedure TMainForm.btQuestTenderSearchClick(Sender: TObject);
procedure TMainForm.btQuestEnderSearchClick(Sender: TObject);
var
F: TWhoQuestForm;
begin
F := TWhoQuestForm.Create(self);
try
if edQuestTenderSearch.Text<>'' then F.Prepare(edQuestTenderSearch.Text);
if edQuestEnderSearch.Text<>'' then F.Prepare(edQuestEnderSearch.Text);
if F.ShowModal=mrOk then
begin
if F.rgTypeOfWho.ItemIndex=2 then // item cannot be a quest Tender now
if F.rgTypeOfWho.ItemIndex=2 then // item cannot be a quest Ender now
ShowMessage(dmMain.Text[1]) else
edQuestTenderSearch.Text := Format('%s,%s',[F.rgTypeOfWho.items[F.rgTypeOfWho.itemindex],F.lvWho.Selected.Caption]);
edQuestEnderSearch.Text := Format('%s,%s',[F.rgTypeOfWho.items[F.rgTypeOfWho.itemindex],F.lvWho.Selected.Caption]);
end;
finally
F.Free;
Expand Down Expand Up @@ -3915,7 +3915,7 @@ procedure TMainForm.btDelQuestStarterClick(Sender: TObject);
lvqtStarterTemplate.DeleteSelected;
end;

procedure TMainForm.btDelQuestTenderClick(Sender: TObject);
procedure TMainForm.btDelQuestEnderClick(Sender: TObject);
begin
if Assigned(lvqtTenderTemplate.Selected) then
lvqtTenderTemplate.DeleteSelected;
Expand Down Expand Up @@ -3945,7 +3945,7 @@ procedure TMainForm.btClearClick(Sender: TObject);
edQuestID.Clear;
edQuestTitle.Clear;
edQuestStarterSearch.Clear;
edQuestTenderSearch.Clear;
edQuestEnderSearch.Clear;
edQuestSortIDSearch.Clear;
edQuestFlagsSearch.Clear;
lvQuest.Clear;
Expand Down Expand Up @@ -12879,7 +12879,7 @@ procedure TMainForm.lvQuickListMouseMove(Sender: TObject; Shift: TShiftState; X,

procedure TMainForm.lvqtTenderTemplateChange(Sender: TObject; Item: TListItem; Change: TItemChange);
begin
btDelQuestTender.Enabled := Assigned(lvqtTenderTemplate.Selected);
btDelQuestEnder.Enabled := Assigned(lvqtTenderTemplate.Selected);
end;

procedure TMainForm.lvqtTenderTemplateDblClick(Sender: TObject);
Expand All @@ -12892,7 +12892,7 @@ procedure TMainForm.lvqtTenderTemplateSelectItem(Sender: TObject; Item: TListIte
Selected: Boolean);
begin
if Selected then
LoadQuestTenderInfo(Item.Caption, Item.SubItems[0]);
LoadQuestEnderInfo(Item.Caption, Item.SubItems[0]);
end;

procedure TMainForm.lvqtStarterTemplateChange(Sender: TObject; Item: TListItem; Change: TItemChange);
Expand Down

0 comments on commit 95aaf6b

Please sign in to comment.