From 4157feb2f3e78f3d12bb33eda52eaba2b256775b Mon Sep 17 00:00:00 2001 From: Dydzio Date: Fri, 6 Jan 2023 21:20:46 +0100 Subject: [PATCH] Small cleanup --- client/CMT.cpp | 30 -------------------------- client/widgets/AdventureMapClasses.cpp | 1 + 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/client/CMT.cpp b/client/CMT.cpp index 40fbbcedf..8cf16809e 100644 --- a/client/CMT.cpp +++ b/client/CMT.cpp @@ -541,36 +541,6 @@ int main(int argc, char * argv[]) return 0; } -void printInfoAboutIntObject(const CIntObject *obj, int level) -{ - std::stringstream sbuffer; - sbuffer << std::string(level, '\t'); - - sbuffer << typeid(*obj).name() << " *** "; - if (obj->active) - { -#define PRINT(check, text) if (obj->active & CIntObject::check) sbuffer << text - PRINT(LCLICK, 'L'); - PRINT(RCLICK, 'R'); - PRINT(HOVER, 'H'); - PRINT(MOVE, 'M'); - PRINT(KEYBOARD, 'K'); - PRINT(TIME, 'T'); - PRINT(GENERAL, 'A'); - PRINT(WHEEL, 'W'); - PRINT(DOUBLECLICK, 'D'); -#undef PRINT - } - else - sbuffer << "inactive"; - sbuffer << " at " << obj->pos.x <<"x"<< obj->pos.y; - sbuffer << " (" << obj->pos.w <<"x"<< obj->pos.h << ")"; - logGlobal->info(sbuffer.str()); - - for(const CIntObject *child : obj->children) - printInfoAboutIntObject(child, level+1); -} - //plays intro, ends when intro is over or button has been pressed (handles events) void playIntro() { diff --git a/client/widgets/AdventureMapClasses.cpp b/client/widgets/AdventureMapClasses.cpp index 8155019ed..eb328541f 100644 --- a/client/widgets/AdventureMapClasses.cpp +++ b/client/widgets/AdventureMapClasses.cpp @@ -1155,6 +1155,7 @@ void CInGameConsole::endEnteringText(bool processEnteredText) LOCPLINT->cb->sendMessage(txt, LOCPLINT->getSelection()); previouslyEntered.push_back(txt); + //some commands like gosolo don't work when executed from GUI thread boost::thread clientCommandThread(ClientCommandManager::processCommand, txt, true); clientCommandThread.join(); }