Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- added headless min player required message 

- remove configurator from linux installer
- bugfix for headless stats connected player counts
This commit is contained in:
Mark Vejvoda 2012-07-10 13:49:49 +00:00
parent 6cfe9cadbb
commit a97f8ead7e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mk/linux/mojosetup/megaglest-installer/make.sh
View File

@ -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}

7
source/glest_game/network/server_interface.cpp
View File

@ -2317,6 +2317,13 @@ std::map<string,string> 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__);