summaryrefslogtreecommitdiff
path: root/plugins/Boltun
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Boltun')
-rw-r--r--plugins/Boltun/src/Engine/TalkEngine.cpp25
-rw-r--r--plugins/Boltun/src/Engine/TalkEngine.h29
-rw-r--r--plugins/Boltun/src/actionQueue.cpp2
3 files changed, 27 insertions, 29 deletions
diff --git a/plugins/Boltun/src/Engine/TalkEngine.cpp b/plugins/Boltun/src/Engine/TalkEngine.cpp
index a72bbdeb80..d771012a5f 100644
--- a/plugins/Boltun/src/Engine/TalkEngine.cpp
+++ b/plugins/Boltun/src/Engine/TalkEngine.cpp
@@ -76,7 +76,7 @@ TalkBot::TalkBot(const Mind& goodMind)
:mind(goodMind), beSilent(false), makeLowercase(false),
understandAlways(false)
{
- contactDatas = new PerContactData<Mind, ContactData, void*>(mind);
+ contactDatas = new PerContactData<Mind, ContactData, HCONTACT>(mind);
}
TalkBot::~TalkBot()
@@ -84,7 +84,7 @@ TalkBot::~TalkBot()
delete contactDatas;
}
-tstring TalkBot::GetInitMessage(void* contact)
+tstring TalkBot::GetInitMessage(HCONTACT contact)
{
ContactData* d = contactDatas->GetData(contact);
tstring s = d->initial.GetString();
@@ -108,8 +108,7 @@ tstring TalkBot::ReplaceAliases(const tstring &message)
for (unsigned j = max; j > 0; j--)
{
tstring item = sentence.substr(i, j);
- if (mind.GetData()->smiles.find(item)
- != mind.GetData()->smiles.end())
+ if (mind.GetData()->smiles.find(item) != mind.GetData()->smiles.end())
{
sm[i] = item;
sentence.replace(i, j, _T("\1"));
@@ -160,7 +159,7 @@ tstring TalkBot::ReplaceAliases(const tstring &message)
return result;
}
-tstring TalkBot::AllReplies(const tstring &incomingMessage, ContactData* contactData, Level &maxValue, std::multimap<Level, tstring> &mm)
+tstring TalkBot::AllReplies(const tstring &incomingMessage, ContactData *contactData, Level &maxValue, std::multimap<Level, tstring> &mm)
{
tstring res;
//Part 1
@@ -273,14 +272,14 @@ tstring TalkBot::AllReplies(const tstring &incomingMessage, ContactData* contact
return tstring();
}
-TalkBot::MessageInfo* TalkBot::Reply(void* contact, tstring incomingMessage, bool saveChoice)
+TalkBot::MessageInfo* TalkBot::Reply(HCONTACT contact, tstring incomingMessage, bool saveChoice)
{
TCHAR* str = new TCHAR[incomingMessage.length()+1];
_tcscpy(str, incomingMessage.c_str());
CharLower(str);
incomingMessage = str;
delete [] str;
- ContactData* contactData = contactDatas->GetData(contact);
+ ContactData *contactData = contactDatas->GetData(contact);
if (incomingMessage == contactData->lastMessage && GetTickCount() < contactData->lastMessageTime + 30*60*1000)
{
@@ -353,7 +352,7 @@ TalkBot::MessageInfo* TalkBot::Reply(void* contact, tstring incomingMessage, boo
return info;
}
-bool TalkBot::FindExact(ContactData* contactData, const tstring &incomingMessage,
+bool TalkBot::FindExact(ContactData *contactData, const tstring &incomingMessage,
const multimap<tstring, tstring>& map, tstring& res)
{
int max = (int)map.count(incomingMessage);
@@ -371,9 +370,9 @@ bool TalkBot::FindExact(ContactData* contactData, const tstring &incomingMessage
return true;
}
-void TalkBot::AnswerGiven(void* contact, const TalkBot::MessageInfo& info)
+void TalkBot::AnswerGiven(HCONTACT contact, const TalkBot::MessageInfo& info)
{
- ContactData* contactData = contactDatas->GetData(contact);
+ ContactData *contactData = contactDatas->GetData(contact);
RecordAnswer(contactData, info);
contactDatas->PutData(contact);
}
@@ -441,7 +440,7 @@ tstring LevelToStr(TalkBot::Level target)
}
#endif
-tstring TalkBot::ChooseResult(ContactData* contactData, Level maxValue, const multimap<Level, tstring> &mm)
+tstring TalkBot::ChooseResult(ContactData *contactData, Level maxValue, const multimap<Level, tstring> &mm)
{
#ifdef DEBUG_SHOW_VARIANTS
AddBotMessage(_T(">>Availabe:"));
@@ -470,7 +469,7 @@ tstring TalkBot::ChooseResult(ContactData* contactData, Level maxValue, const mu
#endif
}
-void TalkBot::FindByKeywords(ContactData* contactData, const vector<tstring> &keywords, tstring& res/*, tstring& ures*/,
+void TalkBot::FindByKeywords(ContactData *contactData, const vector<tstring> &keywords, tstring& res/*, tstring& ures*/,
bool isQuestion)
{
if (keywords.size() == 0)
@@ -490,7 +489,7 @@ void TalkBot::FindByKeywords(ContactData* contactData, const vector<tstring> &ke
res = contactData->chooser.Choose();
}
-bool TalkBot::FindByOthers(ContactData* contactData, const vector<tstring> &otherwords, tstring& res, bool isQuestion)
+bool TalkBot::FindByOthers(ContactData *contactData, const vector<tstring> &otherwords, tstring& res, bool isQuestion)
{
//vector<tstring> results;
const multimap<WordsList, tstring> &specs = isQuestion ? mind.GetData()->qspecialEscapes :
diff --git a/plugins/Boltun/src/Engine/TalkEngine.h b/plugins/Boltun/src/Engine/TalkEngine.h
index b57cb7f89c..9701b09637 100644
--- a/plugins/Boltun/src/Engine/TalkEngine.h
+++ b/plugins/Boltun/src/Engine/TalkEngine.h
@@ -74,27 +74,26 @@ private:
}
};
- PerContactData<Mind, ContactData, void*>* contactDatas;
+ PerContactData<Mind, ContactData, HCONTACT>* contactDatas;
const Mind mind;
bool beSilent;
bool makeLowercase;
bool understandAlways;
- void UpdateStartChar(std::tstring& str);
+ void UpdateStartChar(std::tstring &str);
typedef std::multimap<std::tstring, std::tstring>::const_iterator mm_cit;
- bool FindExact(ContactData* contactData, const std::tstring &incomingMessage,
- const std::multimap<std::tstring, std::tstring>& map, std::tstring& res);
- bool FindAny(ValueChooser<> &ch, std::tstring& res);
- void FindByKeywords(ContactData* contactData, const std::vector<std::tstring> &keywords, std::tstring& res/*, std::tstring& ures*/, bool isQuestion);
- bool FindByOthers(ContactData* contactData, const std::vector<std::tstring> &otherwords, std::tstring& res, bool isQuestion);
- std::tstring AllReplies(const std::tstring &incomingMessage, ContactData* contactData, Level &maxValue, std::multimap<Level, std::tstring> &mm);
+ bool FindExact(ContactData *contactData, const std::tstring &incomingMessage, const std::multimap<std::tstring, std::tstring> &map, std::tstring &res);
+ bool FindAny(ValueChooser<> &ch, std::tstring &res);
+ void FindByKeywords(ContactData *contactData, const std::vector<std::tstring> &keywords, std::tstring &res/*, std::tstring& ures*/, bool isQuestion);
+ bool FindByOthers(ContactData *contactData, const std::vector<std::tstring> &otherwords, std::tstring &res, bool isQuestion);
+ std::tstring AllReplies(const std::tstring &incomingMessage, ContactData *contactData, Level &maxValue, std::multimap<Level, std::tstring> &mm);
std::tstring ReplaceAliases(const std::tstring &message);
- std::tstring ChooseResult(ContactData* contactData, Level maxValue, const std::multimap<Level, std::tstring> &mm);
- void RecordAnswer(ContactData *contactData, const TalkBot::MessageInfo& info);
+ std::tstring ChooseResult(ContactData *contactData, Level maxValue, const std::multimap<Level, std::tstring> &mm);
+ void RecordAnswer(ContactData *contactData, const TalkBot::MessageInfo &info);
#ifdef _DEBUG
public:
#endif
- void SplitSectences(const std::tstring &incomingMessage, std::vector<std::tstring>& vec);
- void SplitAndSortWords(std::tstring sentence, std::vector<std::tstring>& keywords,
+ void SplitSectences(const std::tstring &incomingMessage, std::vector<std::tstring> &vec);
+ void SplitAndSortWords(std::tstring sentence, std::vector<std::tstring> &keywords,
std::vector<std::tstring>& otherwords, bool& isQuestion);
public:
TalkBot(const Mind& goodMind);
@@ -104,9 +103,9 @@ public:
void SetLowercase(const bool isLowercase);
void SetUnderstandAlways(const bool understandAlways);
//const MindData *GetData();
- std::tstring GetInitMessage(void* contact);
- MessageInfo* Reply(void* contact, const std::tstring incomingMessage, bool saveChoice);
- void AnswerGiven(void* contact, const MessageInfo& info);
+ std::tstring GetInitMessage(HCONTACT contact);
+ MessageInfo* Reply(HCONTACT contact, const std::tstring incomingMessage, bool saveChoice);
+ void AnswerGiven(HCONTACT contact, const MessageInfo &info);
};
#endif
diff --git a/plugins/Boltun/src/actionQueue.cpp b/plugins/Boltun/src/actionQueue.cpp
index 3f0fead59b..fab338a8dc 100644
--- a/plugins/Boltun/src/actionQueue.cpp
+++ b/plugins/Boltun/src/actionQueue.cpp
@@ -44,7 +44,7 @@ typedef struct _QueueElement {
} QueueElement;
static list<QueueElement> actionQueue;
-static set<HANDLE> typingContacts;
+static set<HCONTACT> typingContacts;
UINT_PTR timerID = 0;
CriticalSection cs;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 14:09:32 +0000