Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
15f976a0
Commit
15f976a0
authored
11 years ago
by
Alam Ed Arias
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into next
parents
05c3315f
b5112947
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/hardware/hw_main.c
+1
-4
1 addition, 4 deletions
src/hardware/hw_main.c
with
1 addition
and
4 deletions
src/hardware/hw_main.c
+
1
−
4
View file @
15f976a0
...
@@ -1080,7 +1080,7 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum,
...
@@ -1080,7 +1080,7 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum,
if
(
list
[
i
].
caster
)
if
(
list
[
i
].
caster
)
{
{
if (sector->lightlist[i].caster->flags & FF_SOLID && !(cutflag & FF_EXTRA))
if
(
sector
->
lightlist
[
i
].
caster
->
flags
&
FF_
CUT
SOLID
S
&&
!
(
cutflag
&
FF_EXTRA
))
solid
=
true
;
solid
=
true
;
else
if
(
sector
->
lightlist
[
i
].
caster
->
flags
&
FF_CUTEXTRA
&&
cutflag
&
FF_EXTRA
)
else
if
(
sector
->
lightlist
[
i
].
caster
->
flags
&
FF_CUTEXTRA
&&
cutflag
&
FF_EXTRA
)
{
{
...
@@ -1101,9 +1101,6 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum,
...
@@ -1101,9 +1101,6 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum,
if
(
cutflag
==
FF_CUTSOLIDS
)
// These are regular walls sent in from StoreWallRange, they shouldn't be cut from this
if
(
cutflag
==
FF_CUTSOLIDS
)
// These are regular walls sent in from StoreWallRange, they shouldn't be cut from this
solid
=
false
;
solid
=
false
;
if (cutflag & FF_SOLID) // these weren't being cut before anyway, although they probably should be in the right conditions
solid = false;
height
=
FIXED_TO_FLOAT
(
list
[
i
].
height
);
height
=
FIXED_TO_FLOAT
(
list
[
i
].
height
);
if
(
solid
)
if
(
solid
)
bheight
=
FIXED_TO_FLOAT
(
*
list
[
i
].
caster
->
bottomheight
);
bheight
=
FIXED_TO_FLOAT
(
*
list
[
i
].
caster
->
bottomheight
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment