From c7b77349a83c70ce50acae28d1ed3606cdbb8ba9 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Fri, 10 Dec 2010 22:21:56 +0000
Subject: Remove "Error:" from the message displayed by I_Error, to match
 Vanilla.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2210
---
 src/i_system.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/i_system.c')

diff --git a/src/i_system.c b/src/i_system.c
index f37b5bec..aa7875ff 100644
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -328,9 +328,9 @@ void I_Error (char *error, ...)
     
     // 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 @@ void I_Error (char *error, ...)
                             msgbuf, strlen(msgbuf) + 1,
                             wmsgbuf, sizeof(wmsgbuf));
 
-        MessageBoxW(NULL, wmsgbuf, L"Error", MB_OK);
+        MessageBoxW(NULL, wmsgbuf, L"" PACKAGE_NAME, MB_OK);
     }
 #endif
 
-- 
cgit v1.2.3


From e225e0c93ce58bb0e33c174847305d39800fd755 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Fri, 10 Dec 2010 22:37:29 +0000
Subject: Fix build problem (thanks Proteh).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2211
---
 src/i_system.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/i_system.c')

diff --git a/src/i_system.c b/src/i_system.c
index aa7875ff..afff1a95 100644
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -360,7 +360,7 @@ void I_Error (char *error, ...)
                             msgbuf, strlen(msgbuf) + 1,
                             wmsgbuf, sizeof(wmsgbuf));
 
-        MessageBoxW(NULL, wmsgbuf, L"" PACKAGE_NAME, MB_OK);
+        MessageBoxW(NULL, wmsgbuf, L"", MB_OK);
     }
 #endif
 
-- 
cgit v1.2.3


From 463bcf013ce355398974953508d232ac88a6b2d6 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 18 Dec 2010 23:55:07 +0000
Subject: Add a M_CheckParmWithArgs function, that behaves like M_CheckParm but
 also checks that extra options were provided on the command line (thanks
 Sander van Dijk).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2223
---
 src/i_system.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/i_system.c')

diff --git a/src/i_system.c b/src/i_system.c
index afff1a95..9f599192 100644
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -171,7 +171,7 @@ byte *I_ZoneBase (int *size)
     // Specify the heap size, in MiB (default 16).
     //
 
-    p = M_CheckParm("-mb");
+    p = M_CheckParmWithArgs("-mb", 1);
 
     if (p > 0)
     {
-- 
cgit v1.2.3