X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_create_mapinfo.c;h=8e4bc5a23cb153c815da6a06a48477b154229a06;hb=be5a823f20ae87084f1e4f5ea9cfd69577bc7ba0;hp=677161b637077ff6aab7d7b57f329e4cc965c9f5;hpb=8b3142364603ea77d9514d20be020370102da9fc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
index 677161b63..8e4bc5a23 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
@@ -43,8 +43,8 @@ void XonoticMapInfoDialog_loadMapInfo(entity me, float i, entity mlb)
 		strunzone(me.currentMapFeaturesText);
 	}
 	me.currentMapBSPName = strzone(MapInfo_Map_bspname);
-	me.currentMapTitle = strzone(MapInfo_Map_title);
-	me.currentMapAuthor = strzone(MapInfo_Map_author);
+	me.currentMapTitle = strzone(strdecolorize(MapInfo_Map_title));
+	me.currentMapAuthor = strzone(strdecolorize(MapInfo_Map_author));
 	me.currentMapDescription = strzone(MapInfo_Map_description);
 	me.currentMapFeaturesText = strzone((MapInfo_Map_supportedFeatures & MAPINFO_FEATURE_WEAPONS) ? _("Full item placement") : _("MinstaGib only"));
 	me.currentMapPreviewImage = strzone(strcat("/maps/", MapInfo_Map_bspname));
@@ -54,7 +54,10 @@ void XonoticMapInfoDialog_loadMapInfo(entity me, float i, entity mlb)
 	me.authorLabel.setText(me.authorLabel, me.currentMapAuthor);
 	me.descriptionLabel.setText(me.descriptionLabel, me.currentMapDescription);
 	me.featuresLabel.setText(me.featuresLabel, me.currentMapFeaturesText);
-	me.previewImage.src = me.currentMapPreviewImage;
+	if(draw_PictureSize(me.currentMapPreviewImage) == '0 0 0')
+		me.previewImage.src = "nopreview_map";
+	else
+		me.previewImage.src = me.currentMapPreviewImage;
 
 	for(i = 0; i < GameType_GetCount(); ++i)
 	{
@@ -94,7 +97,6 @@ void XonoticMapInfoDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, w, e = makeXonoticTextLabel(0, _("Game types:")));
 
-	
 	n = ceil(GameType_GetCount() / (me.rows - 6));
 	wgt = (w - 0.2) / n;
 	for(i = 0; i < GameType_GetCount(); ++i)
@@ -104,7 +106,7 @@ void XonoticMapInfoDialog_fill(entity me)
 			me.TR(me);
 			me.TDempty(me, 0.2);
 		}
-		me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, GameType_GetName(i)));
+		me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, MapInfo_Type_ToText(GameType_GetID(i))));
 			me.(typeLabels[i]) = e;
 	}
 
@@ -119,7 +121,7 @@ void XonoticMapInfoDialog_fill(entity me)
 		me.TD(me, 1, me.columns - 5.5, e = makeXonoticButton(_("Close"), '0 0 0'));
 			e.onClick = Dialog_Close;
 			e.onClickEntity = me;
-		me.TD(me, 1, me.columns - 5.5, me.startButton = e = makeXonoticButton(_("Play"), '0 0 0'));
+		me.TD(me, 1, me.columns - 5.5, me.startButton = e = makeXonoticButton(ZCTX(_("MAP^Play")), '0 0 0'));
 			me.startButton.onClick = MapList_LoadMap;
 			me.startButton.onClickEntity = NULL; // filled later
 }