Merge conflict with ddnet/pulls/4728

[chillerbotpng]

Failed to merge https://github.com/ddnet/ddnet/pull/4728 into chillerbot

$ git status
On branch updatebot-test-pull-chillerbot
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
    new file:   data/demos/Multeasymap_bench.demo
    new file:   data/demos/RaiNyMore2_bench.demo
    modified:   data/editor/entities/DDNet.png
    modified:   data/editor/entities_clear/ddnet.png
    modified:   data/game.png
    modified:   datasrc/content.py
    modified:   datasrc/network.py
    modified:   src/engine/client/graphics_threaded.cpp
    modified:   src/engine/client/graphics_threaded.h
    modified:   src/engine/client/graphics_threaded_null.h
    modified:   src/engine/graphics.h
    modified:   src/game/client/components/items.cpp
    modified:   src/game/client/components/items.h
    modified:   src/game/client/gameclient.h
    modified:   src/game/client/prediction/entities/pickup.cpp
    modified:   src/game/client/render.cpp
    modified:   src/game/client/render.h
    modified:   src/game/editor/editor.h
    modified:   src/game/editor/explanations.cpp
    modified:   src/game/mapitems.cpp
    modified:   src/game/mapitems.h
    modified:   src/game/server/entities/pickup.cpp
    modified:   src/game/server/gamecontroller.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   CMakeLists.txt
    both modified:   src/base/system.h
    both modified:   src/engine/client.h
    both modified:   src/game/client/components/menus.cpp
    both modified:   src/game/client/gameclient.cpp

Conflicts:

CMakeLists.txt
    set(AUTO_VULKAN_BACKEND OFF)
  endif()
elseif(TARGET_OS STREQUAL "mac")
  set(AUTO_VULKAN_BACKEND OFF)
endif()

option(WEBSOCKETS "Enable websockets support" OFF)
option(MYSQL "Enable mysql support" OFF)
option(TEST_MYSQL "Test mysql support in unit tests (also sets -DMYSQL=ON)" OFF)
option(AUTOUPDATE "Enable the autoupdater" OFF)
<<<<<<< HEAD
option(INFORM_UPDATE "Inform about available updates" OFF)
=======
option(INFORM_UPDATE "Inform about available updates" ON)
>>>>>>> updatebot-test-pull-ddnet
option(VIDEORECORDER "Enable video recording support via FFmpeg" ON)
option(UPNP "Enable UPnP support" OFF)
option(ANTIBOT "Enable support for a dynamic anticheat library" OFF)
option(HEADLESS_CLIENT "Build the client without graphics" OFF)
option(CURSES_CLIENT "Build the client in curses mode (terminal ui)" OFF)
option(CLIENT "Compile client" ON)
--
  steam.h
  storage.h
  textrender.h
  updater.h
  uuid.h
  warning.h
)
set_src(ENGINE_SHARED GLOB_RECURSE src/engine/shared
  assertion_logger.cpp
  assertion_logger.h
<<<<<<< HEAD
  chillerbot/langparser.cpp
  chillerbot/langparser.h
=======
>>>>>>> updatebot-test-pull-ddnet
  compression.cpp
  compression.h
  config.cpp
  config.h
  config_variables.h
  console.cpp

src/base/system.h
        0 - Success in getting the version.
        1 - Failure in getting the version.
*/
int os_version_str(char *version, int length);

#if defined(CONF_EXCEPTION_HANDLING)
void init_exception_handler();
void set_exception_handler_log_file(const char *log_file_path);
#endif

<<<<<<< HEAD
#if defined(CONF_CURSES_CLIENT)
void curses_logf(const char *sys, const char *fmt, ...);
#define dbg_msg(sys, fmt, ...) curses_logf(sys, fmt, ##__VA_ARGS__)
#endif

=======
>>>>>>> updatebot-test-pull-ddnet
#if defined(__cplusplus)
}
#endif

src/engine/client.h
    virtual void GenerateTimeoutSeed() = 0;

    virtual IFriends *Foes() = 0;

    virtual void GetSmoothTick(int *pSmoothTick, float *pSmoothIntraTick, float MixAmount) = 0;

    virtual SWarning *GetCurWarning() = 0;

    virtual CChecksumData *ChecksumData() = 0;
    virtual bool InfoTaskRunning() = 0;
<<<<<<< HEAD

    // chillerbot

    virtual void ChillerBotLoadMap(const char *pMap) = 0;
=======
>>>>>>> updatebot-test-pull-ddnet
};

class IGameClient : public IInterface
{

src/game/client/components/menus.cpp
        "ddnet++ > ddnet"};
    static int len = sizeof(apMsg) / sizeof(*apMsg);
    static int index = rand() % len;

    CUIRect r;
    r.x = x;
    r.y = y + 20;
    r.w = w;
    r.h = h - 130;
    UI()->DoLabel(&r, pCaption, 48.0f, TEXTALIGN_CENTER);
<<<<<<< HEAD
    r.y += 42;
    UI()->DoLabel(&r, apMsg[index], 20.0f, TEXTALIGN_CENTER);
=======
>>>>>>> updatebot-test-pull-ddnet

    if(RenderLoadingBar)
    {
        Graphics()->TextureClear();
        Graphics()->QuadsBegin();
        Graphics()->SetColor(1, 1, 1, 0.75f);

src/game/client/gameclient.cpp
        }
        else if(Item.m_Type == NETEVENTTYPE_SOUNDWORLD)
        {
            CNetEvent_SoundWorld *ev = (CNetEvent_SoundWorld *)pData;
            if(!Config()->m_SndGame)
                continue;

            if(m_GameInfo.m_RaceSounds && ((ev->m_SoundID == SOUND_GUN_FIRE && !g_Config.m_SndGun) || (ev->m_SoundID == SOUND_PLAYER_PAIN_LONG && !g_Config.m_SndLongPain)))
                continue;

<<<<<<< HEAD
            if(!g_Config.m_SndLongPain)
                if(ev->m_SoundID == SOUND_PLAYER_PAIN_LONG)
                    ev->m_SoundID = SOUND_PICKUP_HEALTH;

=======
>>>>>>> updatebot-test-pull-ddnet
            m_Sounds.PlayAt(CSounds::CHN_WORLD, ev->m_SoundID, 1.0f, vec2(ev->m_X, ev->m_Y));
        }
    }
}