Page MenuHomeWildfire Games

[WIP] I tried to remove g_XmppClient
Needs ReviewPublic

Authored by phosit on Dec 24 2023, 12:54 PM.

Details

Reviewers
wraitii
Summary

A bunch of globals holding a reference to the xmpp-client. They should be also be unglobalized. {gui, game, game-view, net-server, net-client}
Some Engine functions are accessable from multiple ScriptInterfaces with different callback/private-data. I made the RegisterScriptFunctions a template of the callback-data type. That requires to #include "gui/CGUI.h" in more places.

Refs: #4211

Test Plan

Run a lobby game
Run in non visual mode
Run atlas

Event Timeline

phosit created this revision.Dec 24 2023, 12:54 PM

Build failure - The Moirai have given mortals hearts that can endure.

Debug:
     6>e:\jenkins\workspace\vs2015-differential\source\lobby\glooxwrapper\glooxwrapper.h(71): fatal error C1083: Cannot open include file: 'gloox/client.h': No such file or directory [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\rlinterface.vcxproj]
     7>e:\jenkins\workspace\vs2015-differential\source\lobby\glooxwrapper\glooxwrapper.h(71): fatal error C1083: Cannot open include file: 'gloox/client.h': No such file or directory (compiling source file ..\..\..\source\network\NetClient.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\network.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\lobby\glooxwrapper\glooxwrapper.h(71): fatal error C1083: Cannot open include file: 'gloox/client.h': No such file or directory (compiling source file ..\..\..\source\network\scripting\JSInterface_Network.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\engine.vcxproj]
    13>e:\jenkins\workspace\vs2015-differential\source\lobby\glooxwrapper\glooxwrapper.h(71): fatal error C1083: Cannot open include file: 'gloox/client.h': No such file or directory (compiling source file ..\..\..\source\ps\GameSetup\GameSetup.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\engine.vcxproj]
    14>e:\jenkins\workspace\vs2015-differential\source\lobby\glooxwrapper\glooxwrapper.h(71): fatal error C1083: Cannot open include file: 'gloox/client.h': No such file or directory (compiling source file ..\..\..\source\graphics\GameView.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\graphics.vcxproj]
    16>e:\jenkins\workspace\vs2015-differential\source\lobby\glooxwrapper\glooxwrapper.h(71): fatal error C1083: Cannot open include file: 'gloox/client.h': No such file or directory (compiling source file ..\..\..\source\gui\GUIManager.cpp) [E:\Jenkins\workspace\vs2015-differential\build\workspaces\vs2017\gui.vcxproj]

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/8665/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

builderr-debug-macos.txt
In file included from ../../../source/network/NetClient.cpp:31:
In file included from ../../../source/lobby/XmppClient.h:23:
../../../source/lobby/glooxwrapper/glooxwrapper.h:71:10: fatal error: 'gloox/client.h' file not found
#include <gloox/client.h>
         ^~~~~~~~~~~~~~~~
1 error generated.
make[1]: *** [obj/network_Debug/NetClient.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [network] Error 2

Link to build: https://jenkins.wildfiregames.com/job/macos-differential/7582/display/redirect

Successful build - Chance fights ever on the side of the prudent.

builderr-release-gcc7.txt
In member function 'void CInput::UpdateText(int, int, int)':
cc1plus: warning: 'void* __builtin_memset(void*, int, long unsigned int)': specified size 18446744073709551612 exceeds maximum object size 9223372036854775807 [-Wstringop-overflow=]

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/9247/display/redirect

phosit requested review of this revision.Dec 24 2023, 1:25 PM
phosit updated this revision to Diff 22803.Feb 25 2024, 11:06 AM
phosit edited the summary of this revision. (Show Details)
phosit edited the test plan for this revision. (Show Details)

Don't store the xmppClient in CGUIManager.