mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-14 04:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix building with --without-lobby. Fixes #2249.

Browse Source 
This was SVN commit r14113.
This commit is contained in:
leper
2013-11-08 15:28:44 +00:00
parent 0f8d3e23db
commit 81cf02cc13
10 changed files with 85 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/scripting/ScriptFunctions.cpp
+9 -9
View File
@@ -27,6 +27,8 @@
#include "lib/timer.h"
#include "lib/utf8.h"
#include "lib/sysdep/sysdep.h"
#include "lobby/IXmppClient.h"
#include "lobby/sha.h"
#include "maths/FixedVector3D.h"
#include "network/NetClient.h"
#include "network/NetServer.h"
@@ -50,8 +52,6 @@
#include "ps/ConfigDB.h"
#include "renderer/scripting/JSInterface_Renderer.h"
#include "tools/atlas/GameInterface/GameLoop.h"
#include "lobby/IXmppClient.h"
#include "lobby/sha.h"
#include "simulation2/Simulation2.h"
#include "simulation2/components/ICmpAIManager.h"
@@ -615,6 +615,11 @@ void RewindTimeWarp(void* UNUSED(cbdata))
/* Begin lobby related functions */
bool HasXmppClient(void* UNUSED(cbdata))
{
return (g_XmppClient ? true : false);
}
void StartXmppClient(void* cbdata, std::string sUsername, std::string sPassword, std::string sRoom, std::string sNick)
{
CGUIManager* guiManager = static_cast<CGUIManager*> (cbdata);
@@ -634,11 +639,6 @@ void StartRegisterXmppClient(void* cbdata, std::string sUsername, std::string sP
g_XmppClient = IXmppClient::create(guiManager->GetScriptInterface(), sUsername, sPassword, "", "", true);
}
bool HasXmppClient(void* UNUSED(cbdata))
{
return (g_XmppClient ? true : false);
}
void StopXmppClient(void* UNUSED(cbdata))
{
ENSURE(g_XmppClient);
@@ -964,11 +964,11 @@ void GuiScriptingInit(ScriptInterface& scriptInterface)
scriptInterface.RegisterFunction<void, &RewindTimeWarp>("RewindTimeWarp");
scriptInterface.RegisterFunction<void, bool, &SetBoundingBoxDebugOverlay>("SetBoundingBoxDebugOverlay");
#if CONFIG2_LOBBY // Allow the lobby to be disabled
// Lobby functions
scriptInterface.RegisterFunction<bool, &HasXmppClient>("HasXmppClient");
#if CONFIG2_LOBBY // Allow the lobby to be disabled
scriptInterface.RegisterFunction<void, std::string, std::string, std::string, std::string, &StartXmppClient>("StartXmppClient");
scriptInterface.RegisterFunction<void, std::string, std::string, &StartRegisterXmppClient>("StartRegisterXmppClient");
scriptInterface.RegisterFunction<bool, &HasXmppClient>("HasXmppClient");
scriptInterface.RegisterFunction<void, &StopXmppClient>("StopXmppClient");
scriptInterface.RegisterFunction<void, &ConnectXmppClient>("ConnectXmppClient");
scriptInterface.RegisterFunction<void, &DisconnectXmppClient>("DisconnectXmppClient");