wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove unused, deprecated SendGetGameList from the lobby.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D389
Reviewed By: scythetwirler
Refs D207

This was SVN commit r19467.
This commit is contained in:
elexis 2017-04-28 23:22:41 +00:00
parent a227a7f45b
commit 41d4649c6d
6 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/lobby/IXmppClient.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2015 Wildfire Games.
/* Copyright (C) 2017 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -31,7 +31,6 @@ public:
virtual void connect() = 0;
virtual void disconnect() = 0;
virtual void recv() = 0;
virtual void SendIqGetGameList() = 0;
virtual void SendIqGetBoardList() = 0;
virtual void SendIqGetProfile(const std::string& player) = 0;
virtual void SendIqGameReport(ScriptInterface& scriptInterface, JS::HandleValue data) = 0;

14
source/lobby/XmppClient.cpp
View File

@ -252,20 +252,6 @@ void XmppClient::handleMUCError(glooxwrapper::MUCRoom*, gloox::StanzaError err)
* Requests to server *
*****************************************************/
/**
* Request a listing of active games from the server.
*/
void XmppClient::SendIqGetGameList()
{
glooxwrapper::JID xpartamuppJid(m_xpartamuppId);
// Send IQ
glooxwrapper::IQ iq(gloox::IQ::Get, xpartamuppJid);
iq.addExtension(new GameListQuery());
DbgXMPP("SendIqGetGameList [" << tag_xml(iq) << "]");
m_client->send(iq);
}
/**
* Request the leaderboard data from the server.
*/

1
source/lobby/XmppClient.h
View File

@ -61,7 +61,6 @@ public:
void connect();
void disconnect();
void recv();
void SendIqGetGameList();
void SendIqGetBoardList();
void SendIqGetProfile(const std::string& player);
void SendIqGameReport(ScriptInterface& scriptInterface, JS::HandleValue data);

8
source/lobby/scripting/JSInterface_Lobby.cpp
View File

@ -39,7 +39,6 @@ void JSI_Lobby::RegisterScriptFunctions(ScriptInterface& scriptInterface)
scriptInterface.RegisterFunction<void, &JSI_Lobby::StopXmppClient>("StopXmppClient");
scriptInterface.RegisterFunction<void, &JSI_Lobby::ConnectXmppClient>("ConnectXmppClient");
scriptInterface.RegisterFunction<void, &JSI_Lobby::DisconnectXmppClient>("DisconnectXmppClient");
scriptInterface.RegisterFunction<void, &JSI_Lobby::SendGetGameList>("SendGetGameList");
scriptInterface.RegisterFunction<void, &JSI_Lobby::SendGetBoardList>("SendGetBoardList");
scriptInterface.RegisterFunction<void, std::wstring, &JSI_Lobby::SendGetProfile>("SendGetProfile");
scriptInterface.RegisterFunction<void, JS::HandleValue, &JSI_Lobby::SendRegisterGame>("SendRegisterGame");
@ -119,13 +118,6 @@ void JSI_Lobby::DisconnectXmppClient(ScriptInterface::CxPrivate* UNUSED(pCxPriva
g_XmppClient->disconnect();
}
void JSI_Lobby::SendGetGameList(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
{
if (!g_XmppClient)
return;
g_XmppClient->SendIqGetGameList();
}
void JSI_Lobby::SendGetBoardList(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
{
if (!g_XmppClient)

1
source/lobby/scripting/JSInterface_Lobby.h
View File

@ -36,7 +36,6 @@ namespace JSI_Lobby
void StopXmppClient(ScriptInterface::CxPrivate* pCxPrivate);
void ConnectXmppClient(ScriptInterface::CxPrivate* pCxPrivate);
void DisconnectXmppClient(ScriptInterface::CxPrivate* pCxPrivate);
void SendGetGameList(ScriptInterface::CxPrivate* pCxPrivate);
void SendGetBoardList(ScriptInterface::CxPrivate* pCxPrivate);
void SendGetProfile(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& player);
void SendGameReport(ScriptInterface::CxPrivate* pCxPrivate, JS::HandleValue data);

8
source/tools/XpartaMuPP/XpartaMuPP.py
View File

@ -280,13 +280,7 @@ class XpartaMuPP(sleekxmpp.ClientXMPP):
"""
# Send lists/register on leaderboard; depreciated once muc_online
# can send lists/register automatically on joining the room.
if 'gamelist' in iq.plugins:
try:
self.sendGameList(iq['from'])
except:
traceback.print_exc()
logging.error("Failed to process gamelist request from %s" % iq['from'].bare)
elif 'boardlist' in iq.plugins:
if 'boardlist' in iq.plugins:
command = iq['boardlist']['command']
try:
self.relayBoardListRequest(iq['from'])