Revert "In case a tile set fails to load, provide feedback to the user in the form...

This reverts commit 2d01414a9600ea1bc557493296b4fdd78561eb33.

diff --git a/src/cocoa/en.lproj/Localizable.strings b/src/cocoa/en.lproj/Localizable.strings
index b5d1359..3c82f51 100644 (file)
--- a/src/cocoa/en.lproj/Localizable.strings
+++ b/src/cocoa/en.lproj/Localizable.strings
@@ -7,11 +7,5 @@
 /* Alert informative message for missing Angband lib/ folder */
 "Error.MissingAngbandLib" = "Hengband was unable to find required resources and must quit. Please send a bug report to \"hengband-dev@lists.sourceforge.jp\".";
 
-/* Alert text for failed tile set load */
-"Error.TileSetLoadFailed" = "Failed to Load Tile Set";
-
-/* Alert informative message for failed tile set load */
-"Error.TileSetRevertToASCII" = "Could not load the tile set.  Switched back to ASCII.";
-
 /* Quit */
 "Label.Quit" = "Quit";

diff --git a/src/cocoa/ja.lproj/Localizable.strings b/src/cocoa/ja.lproj/Localizable.strings
index ef8190c..f081c54 100644 (file)
--- a/src/cocoa/ja.lproj/Localizable.strings
+++ b/src/cocoa/ja.lproj/Localizable.strings
@@ -7,11 +7,5 @@
 /* Alert informative message for missing Angband lib/ folder */
 "Error.MissingAngbandLib" = "変愚蛮怒 は必要なリソースを見つけることができなかったため、終了する必要があります。 バグレポートを「hengband-dev@lists.sourceforge.jp」に送信してください。";
 
-/* Alert text for failed tile set load */
-"Error.TileSetLoadFailed" = "タイルセットを読み込めませんでした";
-
-/* Alert informative message for failed tile set load */
-"Error.TileSetRevertToASCII" = "タイルセットを読み込めませんでした。 ASCIIに切り替えます。";
-
 /* Quit */
 "Label.Quit" = "を終了";

diff --git a/src/main-cocoa.m b/src/main-cocoa.m
index d47ddf8..1ef7623 100644 (file)
--- a/src/main-cocoa.m
+++ b/src/main-cocoa.m
@@ -2233,33 +2233,10 @@ static errr Term_xtra_cocoa_react(void)
             NSString *img_path = [NSString stringWithFormat:@"%s/%s", new_mode->path, new_mode->file];
             pict_image = create_angband_image(img_path);
 
-            /* If we failed to create the image, revert to ASCII. */
-            if (! pict_image) {
+            /* If we failed to create the image, set the new desired mode to
+                        * NULL */
+            if (! pict_image)
                 new_mode = NULL;
-               [[NSUserDefaults angbandDefaults]
-                   setInteger:GRAPHICS_NONE
-                   forKey:AngbandGraphicsDefaultsKey];
-               [[NSUserDefaults angbandDefaults] synchronize];
-
-               NSString *msg = NSLocalizedStringWithDefaultValue(
-                   @"Error.TileSetLoadFailed",
-                   AngbandMessageCatalog,
-                   [NSBundle mainBundle],
-                   @"Failed to Load Tile Set",
-                   @"Alert text for failed tile set load");
-               NSString *info = NSLocalizedStringWithDefaultValue(
-                   @"Error.TileSetRevertToASCII",
-                   AngbandMessageCatalog,
-                   [NSBundle mainBundle],
-                   @"Could not load the tile set.  Switched back to ASCII.",
-                   @"Alert informative message for failed tile set load");
-               NSAlert *alert = [[NSAlert alloc] init];
-
-               alert.messageText = msg;
-               alert.informativeText = info;
-               NSModalResponse result = [alert runModal];
-               [alert release];
-           }
         }
         
         /* Record what we did */