refactor(Core/CliRunnable): Make AC> a static (#5621)

This commit is contained in:
Kitzunu
2021-05-22 15:14:04 +02:00
committed by GitHub
parent 8ac74e475f
commit 565e9ff8aa
@@ -22,6 +22,13 @@
#include "World.h" #include "World.h"
#include "WorldSession.h" #include "WorldSession.h"
static constexpr char CLI_PREFIX[] = "AC> ";
static inline void PrintCliPrefix()
{
printf("%s", CLI_PREFIX);
}
#if AC_PLATFORM != AC_PLATFORM_WINDOWS #if AC_PLATFORM != AC_PLATFORM_WINDOWS
#include <readline/readline.h> #include <readline/readline.h>
#include <readline/history.h> #include <readline/history.h>
@@ -97,7 +104,7 @@ void utf8print(void* /*arg*/, const char* str)
void commandFinished(void*, bool /*success*/) void commandFinished(void*, bool /*success*/)
{ {
printf("AC> "); PrintCliPrefix();
fflush(stdout); fflush(stdout);
} }
@@ -131,7 +138,7 @@ void CliRunnable::run()
// print this here the first time // print this here the first time
// later it will be printed after command queue updates // later it will be printed after command queue updates
printf("AC>"); PrintCliPrefix();
///- As long as the World is running (no World::m_stopEvent), get the command line and handle it ///- As long as the World is running (no World::m_stopEvent), get the command line and handle it
while (!World::IsStopped()) while (!World::IsStopped())
@@ -144,7 +151,7 @@ void CliRunnable::run()
char commandbuf[256]; char commandbuf[256];
command_str = fgets(commandbuf, sizeof(commandbuf), stdin); command_str = fgets(commandbuf, sizeof(commandbuf), stdin);
#else #else
command_str = readline("AC>"); command_str = readline(CLI_PREFIX);
rl_bind_key('\t', rl_complete); rl_bind_key('\t', rl_complete);
#endif #endif
@@ -160,7 +167,7 @@ void CliRunnable::run()
if (!*command_str) if (!*command_str)
{ {
#if AC_PLATFORM == AC_PLATFORM_WINDOWS #if AC_PLATFORM == AC_PLATFORM_WINDOWS
printf("AC>"); PrintCliPrefix();
#else #else
free(command_str); free(command_str);
#endif #endif
@@ -171,7 +178,7 @@ void CliRunnable::run()
if (!consoleToUtf8(command_str, command)) // convert from console encoding to utf8 if (!consoleToUtf8(command_str, command)) // convert from console encoding to utf8
{ {
#if AC_PLATFORM == AC_PLATFORM_WINDOWS #if AC_PLATFORM == AC_PLATFORM_WINDOWS
printf("AC>"); PrintCliPrefix();
#else #else
free(command_str); free(command_str);
#endif #endif