From e7f0d2727a01c90a5552a3baf442c11f43a95ce8 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 24 Apr 2010 23:53:03 +0000
Subject: Add -reject_pad_with_ff parameter to allow padding value to be
 specified.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1915
---
 src/p_setup.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/p_setup.c b/src/p_setup.c
index 385759f8..58edc6fd 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -33,6 +33,7 @@
 
 #include "deh_main.h"
 #include "i_swap.h"
+#include "m_argv.h"
 #include "m_bbox.h"
 
 #include "g_game.h"
@@ -651,6 +652,7 @@ static void PadRejectArray(byte *array, unsigned int len)
     unsigned int i;
     unsigned int byte_num;
     byte *dest;
+    unsigned int padvalue;
 
     // Values to pad the REJECT array with:
 
@@ -681,9 +683,18 @@ static void PadRejectArray(byte *array, unsigned int len)
         fprintf(stderr, "PadRejectArray: REJECT lump too short to pad! (%i > %i)\n",
                         len, sizeof(rejectpad));
 
-        // Pad remaining space with 0xff.
+        // Pad remaining space with 0 (or 0xff, if specified on command line).
 
-        memset(array + sizeof(rejectpad), 0x00, len - sizeof(rejectpad));
+        if (M_CheckParm("-reject_pad_with_ff"))
+        {
+            padvalue = 0xff;
+        }
+        else
+        {
+            padvalue = 0xf00;
+        }
+
+        memset(array + sizeof(rejectpad), padvalue, len - sizeof(rejectpad));
     }
 }
 
-- 
cgit v1.2.3