diff --git a/mk/linux/mojosetup/megaglest-installer/make.sh b/mk/linux/mojosetup/megaglest-installer/make.sh index 53225ce0..7c7b391b 100755 --- a/mk/linux/mojosetup/megaglest-installer/make.sh +++ b/mk/linux/mojosetup/megaglest-installer/make.sh @@ -149,8 +149,8 @@ if [ $REPACKONLY -eq 0 ]; then cp "$CURRENTDIR/$megaglest_linux_path/glest.ini" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/megaglest.bmp" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/glestkeys.ini" $INSTALLDATADIR - cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_configurator" $INSTALLDATADIR - cp "$CURRENTDIR/$megaglest_linux_path/megaglest_configurator" ${INSTALLDATADIR} +# cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_configurator" $INSTALLDATADIR +# cp "$CURRENTDIR/$megaglest_linux_path/megaglest_configurator" ${INSTALLDATADIR} cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_mapeditor" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/megaglest_editor" ${INSTALLDATADIR} cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_g3dviewer" $INSTALLDATADIR @@ -166,7 +166,7 @@ if [ $REPACKONLY -eq 0 ]; then # Now copy all glest data echo Copying live MegaGlest data files... - cp "$CURRENTDIR/$megaglest_data_path/configuration.xml" $INSTALLDATADIR +# cp "$CURRENTDIR/$megaglest_data_path/configuration.xml" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_data_path/megaglest.ico" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_data_path/megaglest_uninstall.ico" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_data_path/g3dviewer.ico" ${INSTALLDATADIR} diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp index a4aaa6ad..a6380e61 100644 --- a/source/glest_game/network/server_interface.cpp +++ b/source/glest_game/network/server_interface.cpp @@ -2317,6 +2317,13 @@ std::map ServerInterface::publishToMasterserver() { int slotCountUsed = 1; int slotCountHumans = 1; int slotCountConnectedPlayers = 1; + + if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) { + slotCountUsed = 0; + slotCountHumans = 0; + slotCountConnectedPlayers = 0; + } + Config & config = Config::getInstance(); std::map < string, string > publishToServerInfo; if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);