lobby initial game settings sync fix

Author: afwbkbc

GLSMAC_data/default/ui/parts/mainmenu/steps/multiplayer_lobby/game_settings.gls.js

@@ -2,11 +2,11 @@ return (i) => {
 
 	const glsmac = i.glsmac;
 	const game = glsmac.game;
-	const settings = game.get_settings();
+	const settings = game.get_settings().global;
 
 	const readonly = game.is_slave();
 
-	return i.make_section(settings.global.game_name, {
+	return i.make_section(settings.game_name, {
 		width: 296,
 		height: 358,
 	}, (body) => {
@@ -63,39 +63,39 @@ return (i) => {
 			['112x56', 'Standard planet'],
 			['140x70', 'Large planet'],
 			['180x90', 'Huge planet'],
-		], '112x56', (v) => {
+		], #to_string(settings.map.size_x) + 'x' + #to_string(settings.map.size_y), (v) => {
 			return v; // TODO
 		});
 
 		make_line('ocean_coverage', 'Ocean Coverage', [
 			['0.4', '30-50% of surface'],
 			['0.6', '50-70% of surface'],
 			['0.8', '70-90% of surface'],
-		], '0.6', (v) => {
+		], #to_string(settings.map.ocean_coverage), (v) => {
 			return #to_float(v);
 		});
 
 		make_line('erosive_forces', 'Erosive Forces', [
 			['0.5', 'Strong'],
 			['0.75', 'Average'],
 			['1.0', 'Weak'],
-		], '0.75', (v) => {
+		], #to_string(settings.map.erosive_forces), (v) => {
 			return #to_float(v);
 		});
 
 		make_line('native_lifeforms', 'Native Lifeforms', [
 			['0.25', 'Rare'],
 			['0.5', 'Average'],
 			['0.75', 'Abundant'],
-		], '0.5', (v) => {
+		], #to_string(settings.map.native_lifeforms), (v) => {
 			return #to_float(v);
 		});
 
 		make_line('cloud_cover', 'Cloud Cover', [
 			['0.25', 'Sparse'],
 			['0.5', 'Average'],
 			['0.75', 'Dense'],
-		], '0.5', (v) => {
+		], #to_string(settings.map.cloud_cover), (v) => {
 			return #to_float(v);
 		});
 

GLSMAC_data/default/ui/parts/mainmenu/steps/multiplayer_lobby/players.gls.js

@@ -52,6 +52,11 @@ return (i) => {
 			}
 		};
 
+		const players = i.glsmac.game.get_players();
+		for (player of players) {
+			add_row(player);
+		}
+
 		i.connection.on('player_join', (e) => {
 			add_row(e.player);
 		});

src/game/backend/Game.cpp

@@ -790,25 +790,6 @@ WRAPIMPL_BEGIN( Game )
 				return m_state->m_settings.Wrap( GSE_CALL, true );
 			} )
 		},
-		{
-			"get_setting",
-			NATIVE_CALL( this ) {
-				N_EXPECT_ARGS( 1 );
-				N_GETVALUE( key, 0, String );
-
-				return VALUE( gse::value::Undefined );
-			} )
-		},
-		{
-			"set_setting",
-			NATIVE_CALL( this ) {
-				N_EXPECT_ARGS( 2 );
-				N_GETVALUE( key, 0, String );
-				N_GETVALUE( value, 1, String );
-
-				return VALUE( gse::value::Undefined );
-			} )
-		},
 		{
 			"register_event",
 			NATIVE_CALL( this ) {

src/game/backend/connection/Client.cpp

@@ -117,6 +117,7 @@ void Client::ProcessEvent( const network::LegacyEvent& event ) {
 								m_on_global_settings_update();
 							}
 							m_are_global_settings_received = true;
+							OnOpen();
 							break;
 						}
 						case types::Packet::PT_SLOT_UPDATE:

src/game/backend/connection/Connection.cpp

@@ -18,6 +18,10 @@ void Connection::SetState( State* state ) {
 }
 
 void Connection::ResetHandlers() {
+	if ( m_f_on_open ) {
+		Unpersist( m_f_on_open );
+		m_f_on_open = nullptr;
+	}
 	m_on_connect = nullptr;
 	m_on_cancel = nullptr;
 	m_on_disconnect = nullptr;
@@ -169,13 +173,6 @@ const bool Connection::IterateAndMaybeDelete() {
 					WTrigger(
 						"connect", ARGS_F() {}; }
 					);
-					if ( m_f_on_open ) {
-						m_state->WithGSE( this, [ this ]( GSE_CALLABLE ) {
-							m_f_on_open->Run( GSE_CALL, {} );
-							Unpersist( m_f_on_open );
-							m_f_on_open = nullptr;
-						});
-					}
 					break;
 				}
 				case network::R_CANCELED: {
@@ -349,6 +346,16 @@ void Connection::WTrigger( const std::string& event, const f_args_t& fargs, cons
 	}, f_after );
 }
 
+void Connection::OnOpen() {
+	if ( m_f_on_open ) {
+		m_state->WithGSE( this, [ this ]( GSE_CALLABLE ) {
+			m_f_on_open->Run( GSE_CALL, {} );
+			Unpersist( m_f_on_open );
+			m_f_on_open = nullptr;
+		});
+	}
+}
+
 void Connection::Disconnect( const std::string& reason ) {
 	if ( !reason.empty() ) {
 		m_disconnect_reason = reason;

src/game/backend/connection/Connection.h

@@ -121,6 +121,8 @@ class Connection : public gse::GCWrappable {
 
 	void WTrigger( const std::string& event, const f_args_t& fargs, const std::function< void() >& f_after = nullptr );
 
+	void OnOpen();
+
 	virtual void SendGameEvents( const game_events_t& game_events ) = 0;
 
 private:

src/game/backend/connection/Server.cpp

@@ -62,6 +62,8 @@ void Server::ProcessEvent( const network::LegacyEvent& event ) {
 				}
 			);
 
+			OnOpen();
+
 			break;
 		}
 		case network::LegacyEvent::ET_CLIENT_CONNECT: {

src/game/backend/slot/Slot.cpp

@@ -180,7 +180,9 @@ WRAPIMPL_BEGIN( Slot )
 			},
 			{
 				"faction",
-				player->GetFaction()->Wrap( GSE_CALL, gc_space )
+				player->GetFaction()
+					? player->GetFaction()->Wrap( GSE_CALL, gc_space )
+					: VALUE( gse::value::Undefined )
 			},
 		};
 WRAPIMPL_END_PTR()