Diffusion 0 A.D. Public Repository rP7653

# Refactored the networking code, and redesigned the game setup screen.
rP7653
Actions

Tags

None

Referenced Files

None

Subscribers

Description

Refactored the networking code, and redesigned the game setup screen.

Major updates to most network classes.
Simplify CNetServer so it doesn't duplicate any client behaviour; all players now run CNetClient.
Remove most player/slot management from networking code.
Wait for all players to finish loading before starting the simulation.
Remove CGameAttributes; attributes are now just a JS object.
Remove CPlayer; they are now just simulation entities.
Handle player colours via simulation system.
Add a default map for Atlas, so it always has something to load.
Move network documentation to Doxygen.
Remove lots of now-unused code.

Details

Provenance

Authored on

Parents

rP7652: Fix line endings

Branches

Unknown

Tags

Unknown

Event Timeline

philip committed rP7653: # Refactored the networking code, and redesigned the game setup screen..Jun 30 2010, 11:41 PM

elexis mentioned this in D1179: Move player templates from special/ to special/player/.Dec 27 2017, 4:37 PM

elexis mentioned this in rP21650: Simplify GUI g_IsNetworked variable init..Apr 4 2018, 2:21 PM

elexis mentioned this in rP22528: Provide ScriptInterface CreateObject and CreateArray functions to replace Eval….Jul 22 2019, 9:35 PM

elexis mentioned this in D2147: gui/gamesetup: Fix no-unmodified-loop-condition warning on 'g_IsNetworked'.Aug 12 2019, 1:22 PM

elexis mentioned this in rP17689: Don't create replays without commands in case of running non-visual replay or….Aug 22 2019, 5:29 PM

elexis mentioned this in D2211: Clean CGame constructor arguments.Aug 22 2019, 7:09 PM

elexis mentioned this in rP22785: Remove default CGame constructor values to make the code less error-prone, use….Aug 25 2019, 1:03 PM

elexis mentioned this in rP22826: Gamesetup OOP cleanup, refs #5322..Sep 1 2019, 5:35 PM

elexis added a subscriber: elexis.Nov 5 2019, 3:18 PM

elexis added inline comments.

/ps/trunk/binaries/data/mods/public/simulation/helpers/Commands.js
12	That's just printing a GUI provided value from the simulation, but that feature is already covered by the JS console since rP469, and it entirely should not be a player available command nor in the simulation.

elexis mentioned this in D2407: Delete void "debug-print", unused "chat" simulation command and non-existent "aichat" network message.Nov 5 2019, 3:46 PM

elexis mentioned this in rP23137: Delete dead "chat" simulation command, "chat" GUIInterface notification type….Nov 5 2019, 11:36 PM

elexis mentioned this in D2410: Send NetClient GUIMessages to subscribing GUIObjects instead of pulling them onTick.Nov 7 2019, 3:24 PM

Freagarach mentioned this in D4482: Clean LoadPlayerSettings in Player-helper..Feb 10 2022, 8:30 AM

Changes (120)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

gui/

common/

functions_global_object.js

functions_page_pregame.js

functions_page_pregame_load.js

functions_page_pregame_multiplayer.js

functions_page_pregame_setup.js

functions_utility.js

functions_utility_animation.js

functions_utility_coord.js

functions_utility_list.js

functions_utility_music.js

functions_utility_object.js

functions_utility_test.js

icon_sprites.xml

gamesetup_mp.js

gamesetup_mp.xml

loading/

msgbox/

page_gamesetup.xml

page_gamesetup_mp.xml

page_loading.xml

page_msgbox.xml

page_pregame.xml

page_session_new.xml

pregame/

session_new/

session_new_old/

maps/

scenarios/

simulation/

components/

helpers/

build/

premake/

extern_libs.lua

docs/

doxygen/

source/

graphics/

UnitManager.cpp

gui/

scripting/

ScriptFunctions.cpp

network/

NetMessageSim.cpp

NetTurnManager.cpp

NetTurnManager.h

Serialization.h

tests/

ps/

GameAttributes.cpp

GameAttributes.h

GameSetup/

scripting/

JSCollection.cpp

renderer/

scripting/

JSConversions.cpp

JSConversions.h

scriptinterface/

simulation2/

components/

tools/

atlas/

GameInterface/

Handlers/

GraphicsSetupHandlers.cpp

MapHandlers.cpp

rP7653

ps/trunk/binaries/data/mods/public/gui/common/emptyinit.xml

ps/trunk/binaries/data/mods/public/gui/common/functions_global_object.js

ps/trunk/binaries/data/mods/public/gui/common/functions_page_pregame.js

ps/trunk/binaries/data/mods/public/gui/common/functions_page_pregame_load.js

ps/trunk/binaries/data/mods/public/gui/common/functions_page_pregame_multiplayer.js

ps/trunk/binaries/data/mods/public/gui/common/functions_page_pregame_setup.js

ps/trunk/binaries/data/mods/public/gui/common/functions_utility.js

ps/trunk/binaries/data/mods/public/gui/common/functions_utility_animation.js

ps/trunk/binaries/data/mods/public/gui/common/functions_utility_coord.js

ps/trunk/binaries/data/mods/public/gui/common/functions_utility_list.js

ps/trunk/binaries/data/mods/public/gui/common/functions_utility_music.js

ps/trunk/binaries/data/mods/public/gui/common/functions_utility_object.js

ps/trunk/binaries/data/mods/public/gui/common/functions_utility_test.js

ps/trunk/binaries/data/mods/public/gui/common/global.xml

ps/trunk/binaries/data/mods/public/gui/common/icon_sprites.xml

ps/trunk/binaries/data/mods/public/gui/common/init.xml

ps/trunk/binaries/data/mods/public/gui/common/setup.xml

ps/trunk/binaries/data/mods/public/gui/common/sprite1.xml

ps/trunk/binaries/data/mods/public/gui/common/styles.xml

ps/trunk/binaries/data/mods/public/gui/gamesetup/

ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js

ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml

ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js

ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml

ps/trunk/binaries/data/mods/public/gui/gamesetup/setup.xml

ps/trunk/binaries/data/mods/public/gui/gamesetup/sprites.xml

ps/trunk/binaries/data/mods/public/gui/gamesetup/styles.xml

ps/trunk/binaries/data/mods/public/gui/gui.dtd

ps/trunk/binaries/data/mods/public/gui/loading/loading.js

ps/trunk/binaries/data/mods/public/gui/loading/loading.xml

ps/trunk/binaries/data/mods/public/gui/msgbox/msgbox.xml

ps/trunk/binaries/data/mods/public/gui/page_atlas.xml

ps/trunk/binaries/data/mods/public/gui/page_gamesetup.xml

ps/trunk/binaries/data/mods/public/gui/page_gamesetup_mp.xml

ps/trunk/binaries/data/mods/public/gui/page_loading.xml

ps/trunk/binaries/data/mods/public/gui/page_msgbox.xml

ps/trunk/binaries/data/mods/public/gui/page_pregame.xml

ps/trunk/binaries/data/mods/public/gui/page_session_new.xml

ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml

ps/trunk/binaries/data/mods/public/gui/pregame/sprites.xml

ps/trunk/binaries/data/mods/public/gui/pregame/styles.xml

ps/trunk/binaries/data/mods/public/gui/session_new/session.js

ps/trunk/binaries/data/mods/public/gui/session_new/session.xml

ps/trunk/binaries/data/mods/public/gui/session_new/sprites.xml

ps/trunk/binaries/data/mods/public/gui/session_new/styles.xml

ps/trunk/binaries/data/mods/public/gui/session_new_old/input.js

ps/trunk/binaries/data/mods/public/gui/session_new_old/music.js

ps/trunk/binaries/data/mods/public/gui/session_new_old/selection.js

ps/trunk/binaries/data/mods/public/gui/session_new_old/session.js

ps/trunk/binaries/data/mods/public/gui/session_new_old/session.xml

ps/trunk/binaries/data/mods/public/gui/session_new_old/sprites.xml

ps/trunk/binaries/data/mods/public/gui/session_new_old/styles.xml

ps/trunk/binaries/data/mods/public/maps/scenarios/_default.xml

ps/trunk/binaries/data/mods/public/simulation/components/Player.js

ps/trunk/binaries/data/mods/public/simulation/data/

ps/trunk/binaries/data/mods/public/simulation/data/players.xml

ps/trunk/binaries/data/mods/public/simulation/helpers/Commands.js

Loading...

ps/trunk/binaries/data/mods/public/temp/

ps/trunk/binaries/data/mods/public/temp/players.xml

ps/trunk/binaries/data/mods/public/temp/terrain.png

ps/trunk/build/premake/extern_libs.lua

ps/trunk/docs/doxygen/config

ps/trunk/source/graphics/GameView.cpp

ps/trunk/source/graphics/GameView.h

ps/trunk/source/graphics/MapReader.cpp

ps/trunk/source/graphics/MapWriter.cpp

ps/trunk/source/graphics/Material.cpp

ps/trunk/source/graphics/Unit.cpp

ps/trunk/source/graphics/UnitManager.cpp

ps/trunk/source/gui/MiniMap.cpp

ps/trunk/source/gui/scripting/ScriptFunctions.cpp

ps/trunk/source/main.cpp

ps/trunk/source/network/JSEvents.h

ps/trunk/source/network/NetClient.cpp

ps/trunk/source/network/NetClient.h

ps/trunk/source/network/NetHost.cpp

ps/trunk/source/network/NetHost.h

ps/trunk/source/network/NetJsEvents.h

ps/trunk/source/network/NetMessage.cpp

ps/trunk/source/network/NetMessage.h

ps/trunk/source/network/NetMessageSim.cpp

ps/trunk/source/network/NetMessages.h

ps/trunk/source/network/NetServer.cpp

ps/trunk/source/network/NetServer.h

ps/trunk/source/network/NetSession.cpp

ps/trunk/source/network/NetSession.h

ps/trunk/source/network/NetTurnManager.cpp

ps/trunk/source/network/NetTurnManager.h

ps/trunk/source/network/Network.cpp

ps/trunk/source/network/Network.h

ps/trunk/source/network/Serialization.h

ps/trunk/source/network/fsm.cpp

ps/trunk/source/network/fsm.h

ps/trunk/source/network/tests/test_Net.h

ps/trunk/source/ps/CConsole.cpp

ps/trunk/source/ps/CLogger.cpp

ps/trunk/source/ps/CLogger.h

ps/trunk/source/ps/Game.cpp

ps/trunk/source/ps/Game.h

ps/trunk/source/ps/GameAttributes.cpp

ps/trunk/source/ps/GameAttributes.h

ps/trunk/source/ps/GameSetup/GameSetup.cpp

ps/trunk/source/ps/GameSetup/GameSetup.h

ps/trunk/source/ps/Player.cpp

ps/trunk/source/ps/Player.h

ps/trunk/source/ps/World.cpp

ps/trunk/source/ps/World.h

ps/trunk/source/ps/scripting/JSCollection.cpp

ps/trunk/source/ps/scripting/JSCollection.h

ps/trunk/source/ps/scripting/JSMap.h

ps/trunk/source/renderer/Renderer.cpp

ps/trunk/source/scripting/JSConversions.cpp

ps/trunk/source/scripting/JSConversions.h

ps/trunk/source/scripting/ScriptGlue.cpp

ps/trunk/source/scriptinterface/ScriptVal.cpp

ps/trunk/source/scriptinterface/ScriptVal.h

ps/trunk/source/simulation2/components/ICmpPlayer.cpp

ps/trunk/source/simulation2/components/ICmpPlayer.h

ps/trunk/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp

ps/trunk/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp