summaryrefslogtreecommitdiff
path: root/src/i_system.c
diff options
context:
space:
mode:
authorSimon Howard2011-02-12 18:42:10 +0000
committerSimon Howard2011-02-12 18:42:10 +0000
commit516a7028994df6718289a7e3db4d07a45c95466b (patch)
treecf974cb4bd38b8e9d0101a41263b42b8c87e96c7 /src/i_system.c
parenta15ba75736d15409876c1f0a44fffc99adf1c192 (diff)
parenta9996b41e954d85fde5ec5188bbf6a7f4df88011 (diff)
downloadchocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.gz
chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.tar.bz2
chocolate-doom-516a7028994df6718289a7e3db4d07a45c95466b.zip
Merge from raven-branch. FEATURE_MULTIPLAYER has been disabled
temporarily until the netgame changes on raven-branch are finished. Subversion-branch: /branches/strife-branch Subversion-revision: 2259
Diffstat (limited to 'src/i_system.c')
-rw-r--r--src/i_system.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i_system.c b/src/i_system.c
index cd8ddcee..0a856ca9 100644
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -189,7 +189,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)
{
@@ -327,9 +327,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);
@@ -362,7 +362,7 @@ void I_Error (char *error, ...)
msgbuf, strlen(msgbuf) + 1,
wmsgbuf, sizeof(wmsgbuf));
- MessageBoxW(NULL, wmsgbuf, L"Error", MB_OK);
+ MessageBoxW(NULL, wmsgbuf, L"", MB_OK);
}
#endif