shithub: choc

Info  •  Files  •  Log  •  Branches

Remove "Error:" from the message displayed by I_Error, to match Vanilla.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2210

--- a/NEWS

+++ b/NEWS

@@ -45,6 +45,11 @@

      * The HacX v1.2 IWAD file is now supported, and can be used

        standalone without the need for the Doom II IWAD (thanks

        atyth).

+     * The I_Error function doesn't display "Error:" before the error

+       message, matching the Vanilla behavior.  "Error" has also been

+       removed from the title of the dialog box that appears on

+       Windows when this happens.  This is desirable as not all such

+       messages are actually errors (thanks Proteh).

     Bugs fixed:

      * A workaround has been a bug in old versions of SDL_mixer

--- a/src/i_system.c

+++ b/src/i_system.c

@@ -328,9 +328,9 @@

     // Message first.

     va_start(argptr, error);

-    fprintf(stderr, "\nError: ");

+    //fprintf(stderr, "\nError: ");

     vfprintf(stderr, error, argptr);

-    fprintf(stderr, "\n");

+    fprintf(stderr, "\n\n");

     va_end(argptr);

     fflush(stderr);

@@ -360,7 +360,7 @@

                             msgbuf, strlen(msgbuf) + 1,

                             wmsgbuf, sizeof(wmsgbuf));

-        MessageBoxW(NULL, wmsgbuf, L"Error", MB_OK);

+        MessageBoxW(NULL, wmsgbuf, L"" PACKAGE_NAME, MB_OK);

     }

 #endif

--- a/src/net_gui.c

+++ b/src/net_gui.c

@@ -284,7 +284,7 @@

         if (!net_client_connected)

         {

-            I_Error("Disconnected from server");

+            I_Error("Lost connection to server");

         }

         TXT_Sleep(100);