From aec1e6d416bcda83179b1ee911db3c837f5b230b Mon Sep 17 00:00:00 2001 From: titiger Date: Mon, 11 Mar 2019 01:56:06 +0100 Subject: [PATCH] display map author if available in map header --- source/glest_game/menu/menu_state_connected_game.cpp | 2 ++ source/glest_game/menu/menu_state_custom_game.cpp | 2 ++ source/shared_lib/sources/map/map_preview.cpp | 7 ++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index 1cd6590b..cdecfb67 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -313,6 +313,8 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM labelMapInfo.registerGraphicComponent(containerName,"labelMapInfo"); labelMapInfo.init(xoffset+100, mapPos-labelOffset-10, 200, 40); + labelMapInfo.setFont(CoreData::getInstance().getDisplayFontSmall()); + labelMapInfo.setFont3D(CoreData::getInstance().getDisplayFontSmall3D()); labelMapInfo.setText("?"); labelMap.registerGraphicComponent(containerName,"labelMap"); diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index 3bf20254..3a7d2822 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -284,6 +284,8 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, labelMapInfo.registerGraphicComponent(containerName,"labelMapInfo"); labelMapInfo.init(xoffset+100, mapPos-labelOffset-10, 200, 40); + labelMapInfo.setFont(CoreData::getInstance().getDisplayFontSmall()); + labelMapInfo.setFont3D(CoreData::getInstance().getDisplayFontSmall3D()); labelTileset.registerGraphicComponent(containerName,"labelTileset"); labelTileset.init(xoffset+500, mapHeadPos); diff --git a/source/shared_lib/sources/map/map_preview.cpp b/source/shared_lib/sources/map/map_preview.cpp index d1eec5ea..285b08e3 100644 --- a/source/shared_lib/sources/map/map_preview.cpp +++ b/source/shared_lib/sources/map/map_preview.cpp @@ -1108,7 +1108,12 @@ bool MapPreview::loadMapInfo(string file, MapInfo *mapInfo, string i18nMaxMapPla mapInfo->players= header.maxFactions; mapInfo->desc = i18nMaxMapPlayersTitle + ": " + intToStr(mapInfo->players) + "\n"; - mapInfo->desc += i18nMapSizeTitle + ": " + intToStr(mapInfo->size.x) + " x " + intToStr(mapInfo->size.y); + mapInfo->desc += i18nMapSizeTitle + ": " + intToStr(mapInfo->size.x) + " x " + intToStr(mapInfo->size.y)+"\n"; + string author=header.author; + if( author.length()>35){ + author=author.substr(0,35)+"..."; + } + mapInfo->desc +=author; validMap = true; }