No language barriers on low-pop servers. Fixes #314

jasonrohrer · Jun 13, 2019 · 1ed67e2 · 1ed67e2
1 parent 3ec4722
commit 1ed67e2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/documentation/changeLog.txt b/documentation/changeLog.txt
@@ -68,6 +68,8 @@ Server Fixes
   roads in natural reclamation.  However, surface non-permanent natural objects
   (stones, iron, etc.) will re-occur on top of the road.  Fixes #334
 
+--No language barriers on low-pop servers.  Fixes #314
+
 
 
 Version 238    2019-June-8

diff --git a/server/server.cpp b/server/server.cpp
@@ -130,6 +130,9 @@ static int babyBirthFoodDecrement = 10;
 static int eatBonus = 0;
 
 
+static int minActivePlayersForLanguages = 15;
+
+
 // keep a running sequence number to challenge each connecting client
 // to produce new login hashes, avoiding replay attacks.
 static unsigned int nextSequenceNumber = 1;
@@ -4889,6 +4892,8 @@ int processLoggedInPlayer( Socket *inSock,
     eatBonus = 
         SettingsManager::getIntSetting( "eatBonus", 0 );
 
+    minActivePlayersForLanguages =
+        SettingsManager::getIntSetting( "minActivePlayersForLanguages", 15 );
 
 
     numConnections ++;
@@ -16890,9 +16895,15 @@ int main() {
 
                                 char *translatedPhrase;
 
+                                // skip language filtering in some cases
+                                // VOG can talk to anyone
+                                // also, skip in on very low pop servers
+                                // (just let everyone talk together)
                                 if( nextPlayer->vogMode || 
                                     ( speakerObj != NULL &&
-                                      speakerObj->vogMode ) ) {
+                                      speakerObj->vogMode ) ||
+                                    players.size() < 
+                                    minActivePlayersForLanguages ) {
 
                                     translatedPhrase =
                                         stringDuplicate( 

diff --git a/server/settings/minActivePlayersForLanguages.ini b/server/settings/minActivePlayersForLanguages.ini
@@ -0,0 +1 @@
+15