Game: Improve map switch message

http://doom2d.org/forum/viewtopic.php?f=36&t=2277

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 15cea720cf088791e89b011ab29d7d93d0632308..eaccccca74e1523f2ecabebfd34367f9a8f64ef0 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -6058,7 +6058,7 @@ begin
         if P[2] = '' then
           g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[1]]))
         else
-          g_Console_Add(Format(_lc[I_MSG_NO_MAP], [UpperCase(P[2])]));
+          g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [UpperCase(P[2]), P[1]]));
     end else
       g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
   end
@@ -6112,7 +6112,7 @@ begin
         if P[4] = '' then
           g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[3]]))
         else
-          g_Console_Add(Format(_lc[I_MSG_NO_MAP], [UpperCase(P[4])]));
+          g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [UpperCase(P[4]), P[3]]));
     end else
       g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[3]]));
   end
@@ -6146,9 +6146,9 @@ begin
               g_Game_ChangeMap(s);
           end else
           begin
-            g_Console_Add(Format(_lc[I_MSG_NO_MAP], [s]));
             // Òàêîé êàðòû íåò, èùåì WAD ôàéë
             P[1] := addWadExtension(P[1]);
+            g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, P[1]]));
             if FileExists(MapsDir + P[1]) then
             begin
               // Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
@@ -6235,9 +6235,9 @@ begin
               nm := True;
             end else
             begin
-              g_Console_Add(Format(_lc[I_MSG_NO_MAP], [s]));
               // Òàêîé êàðòû íåò, èùåì WAD ôàéë
               P[1] := addWadExtension(P[1]);
+              g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, P[1]]));
               if FileExists(MapsDir + P[1]) then
               begin
                 // Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà

diff --git a/src/game/g_language.pas b/src/game/g_language.pas
index 19ee8af56f56442af13bb75a6a47b35fc23ae868..7617d4c28653ea588f0cc02d3bc2c7019d018b2d 100644 (file)
--- a/src/game/g_language.pas
+++ b/src/game/g_language.pas
@@ -570,6 +570,7 @@ type
     I_MSG_NO_WAD,
     I_MSG_NO_MAPS,
     I_MSG_NO_MAP,
+    I_MSG_NO_MAP_FALLBACK,
     I_MSG_NO_MONSTER,
     I_MSG_SCORE_LIMIT,
     I_MSG_TIME_LIMIT,
@@ -1670,6 +1671,8 @@ const
                                        'WAD ôàéë "%s" íå ñîäåðæèò êàðò!'),
     ('MSG NO MAP',                     'Map "%s" doesn''t exist!',
                                        'Êàðòà "%s" íå íàéäåíà!'),
+    ('MSG NO MAP FALLBACK',            'Map "%s" doesn''t exist in this WAD, looking for %s.',
+                                       'Êàðòà "%s" íå íàéäåíà â ýòîì WAD ôàéëå, èùó %s.'),
     ('MSG NO MONSTER',                 'Wrong monster type: "%s"!',
                                        '"%s" - íåò òàêîãî ìîíñòðà!'),
     ('MSG SCORE LIMIT',                'Score Limit is %d',