summaryrefslogtreecommitdiff
path: root/src/heretic
diff options
context:
space:
mode:
authorSimon Howard2011-10-23 13:29:09 +0000
committerSimon Howard2011-10-23 13:29:09 +0000
commit1ec21c92ed4c3f792e642524c5cd5bc30b6d7457 (patch)
tree1263f68ae3736eef7cfd40c2c60b1b0ace40e3c5 /src/heretic
parentd64626ff417323e05a479caeee02168c1eafd798 (diff)
downloadchocolate-doom-1ec21c92ed4c3f792e642524c5cd5bc30b6d7457.tar.gz
chocolate-doom-1ec21c92ed4c3f792e642524c5cd5bc30b6d7457.tar.bz2
chocolate-doom-1ec21c92ed4c3f792e642524c5cd5bc30b6d7457.zip
Fix compiler warnings (thanks Edward-San).
Subversion-branch: /branches/v2-branch Subversion-revision: 2459
Diffstat (limited to 'src/heretic')
-rw-r--r--src/heretic/mn_menu.c2
-rw-r--r--src/heretic/p_spec.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/src/heretic/mn_menu.c b/src/heretic/mn_menu.c
index 75728427..6c7e425d 100644
--- a/src/heretic/mn_menu.c
+++ b/src/heretic/mn_menu.c
@@ -145,7 +145,7 @@ static int MenuTime;
static boolean soundchanged;
boolean askforquit;
-boolean typeofask;
+static int typeofask;
static boolean FileMenuKeySteal;
static boolean slottextloaded;
static char SlotText[6][SLOTTEXTLEN + 2];
diff --git a/src/heretic/p_spec.c b/src/heretic/p_spec.c
index 49c067fa..20fb950b 100644
--- a/src/heretic/p_spec.c
+++ b/src/heretic/p_spec.c
@@ -1065,8 +1065,12 @@ int EV_DoDonut(line_t * line)
s2 = getNextSector(s1->lines[0], s1);
for (i = 0; i < s2->linecount; i++)
{
- if ((!s2->lines[i]->flags & ML_TWOSIDED) ||
- (s2->lines[i]->backsector == s1))
+ // Note: This was originally part of the following test:
+ // (!s2->lines[i]->flags & ML_TWOSIDED) ||
+ // Due to the apparent mistaken formatting, this can never be
+ // true.
+
+ if (s2->lines[i]->backsector == s1)
continue;
s3 = s2->lines[i]->backsector;