[Freeorion-programmers] SF.net SVN: freeorion:[4381] trunk/FreeOrion/util/VarText.cpp

[<geo...@us...>]

Revision: 4381
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4381&view=rev
Author:   geoffthemedio
Date:     2011-10-10 17:21:34 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Switched to using ApparentName in VarText references to SystemObjects.

Modified Paths:
--------------
    trunk/FreeOrion/util/VarText.cpp

Modified: trunk/FreeOrion/util/VarText.cpp
===================================================================
--- trunk/FreeOrion/util/VarText.cpp	2011-10-10 17:20:15 UTC (rev 4380)
+++ trunk/FreeOrion/util/VarText.cpp	2011-10-10 17:21:34 UTC (rev 4381)
@@ -98,13 +98,11 @@
 #ifdef FREEORION_BUILD_SERVER
                 std::string name_text = obj->Name();
 #else
-                int empire_id = ClientApp::GetApp()->EmpireID();
-                std::string name_text = obj->PublicName(empire_id);
-#endif
+                int client_empire_id = ClientApp::GetApp()->EmpireID();
+                std::string name_text = obj->PublicName(client_empire_id);
                 if (const System* system = universe_object_cast<const System*>(obj))
-                    if (system->GetStarType() == STAR_NONE)
-                        name_text = UserString("EMPTY_SPACE");
-
+                    name_text = system->ApparentName(client_empire_id);
+#endif
                 m_str += open_tag + name_text + close_tag;
 
             // technology token