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
3e7be585
Commit
3e7be585
authored
5 years ago
by
Lactozilla
Browse files
Options
Downloads
Patches
Plain Diff
WORK!!
parent
3f1681e0
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!734
Rebase Keycodes only branch.
,
!548
Flats in walls
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/r_data.c
+12
-4
12 additions, 4 deletions
src/r_data.c
with
12 additions
and
4 deletions
src/r_data.c
+
12
−
4
View file @
3e7be585
...
@@ -752,7 +752,6 @@ void R_LoadTextures(void)
...
@@ -752,7 +752,6 @@ void R_LoadTextures(void)
for
(
w
=
0
,
numtextures
=
0
;
w
<
numwadfiles
;
w
++
)
for
(
w
=
0
,
numtextures
=
0
;
w
<
numwadfiles
;
w
++
)
{
{
// Count the textures from TEXTURES lumps
// Count the textures from TEXTURES lumps
texturesLumpPos
=
W_CheckNumForNamePwad
(
"TEXTURES"
,
(
UINT16
)
w
,
0
);
texturesLumpPos
=
W_CheckNumForNamePwad
(
"TEXTURES"
,
(
UINT16
)
w
,
0
);
while
(
texturesLumpPos
!=
INT16_MAX
)
while
(
texturesLumpPos
!=
INT16_MAX
)
{
{
...
@@ -761,7 +760,6 @@ void R_LoadTextures(void)
...
@@ -761,7 +760,6 @@ void R_LoadTextures(void)
}
}
// Count single-patch textures
// Count single-patch textures
if
(
wadfiles
[
w
]
->
type
==
RET_PK3
)
if
(
wadfiles
[
w
]
->
type
==
RET_PK3
)
{
{
texstart
=
W_CheckNumForFolderStartPK3
(
"textures/"
,
(
UINT16
)
w
,
0
);
texstart
=
W_CheckNumForFolderStartPK3
(
"textures/"
,
(
UINT16
)
w
,
0
);
...
@@ -774,7 +772,11 @@ void R_LoadTextures(void)
...
@@ -774,7 +772,11 @@ void R_LoadTextures(void)
}
}
if
(
texstart
==
INT16_MAX
||
texend
==
INT16_MAX
)
if
(
texstart
==
INT16_MAX
||
texend
==
INT16_MAX
)
#ifdef WALLFLATS
goto
countflats
;
#else
continue
;
continue
;
#endif
texstart
++
;
// Do not count the first marker
texstart
++
;
// Do not count the first marker
...
@@ -793,6 +795,7 @@ void R_LoadTextures(void)
...
@@ -793,6 +795,7 @@ void R_LoadTextures(void)
}
}
#ifdef WALLFLATS
#ifdef WALLFLATS
countflats:
// Count flats
// Count flats
if
(
wadfiles
[
w
]
->
type
==
RET_PK3
)
if
(
wadfiles
[
w
]
->
type
==
RET_PK3
)
{
{
...
@@ -802,7 +805,7 @@ void R_LoadTextures(void)
...
@@ -802,7 +805,7 @@ void R_LoadTextures(void)
else
else
{
{
texstart
=
W_CheckNumForNamePwad
(
"F_START"
,
(
UINT16
)
w
,
0
);
texstart
=
W_CheckNumForNamePwad
(
"F_START"
,
(
UINT16
)
w
,
0
);
texend
=
W_CheckNumForNamePwad
(
"F_END"
,
(
UINT16
)
w
,
0
);
texend
=
W_CheckNumForNamePwad
(
"F_END"
,
(
UINT16
)
w
,
texstart
);
}
}
if
(
texstart
==
INT16_MAX
||
texend
==
INT16_MAX
)
if
(
texstart
==
INT16_MAX
||
texend
==
INT16_MAX
)
...
@@ -873,7 +876,11 @@ void R_LoadTextures(void)
...
@@ -873,7 +876,11 @@ void R_LoadTextures(void)
}
}
if
(
texstart
==
INT16_MAX
||
texend
==
INT16_MAX
)
if
(
texstart
==
INT16_MAX
||
texend
==
INT16_MAX
)
#ifdef WALLFLATS
goto
checkflats
;
#else
continue
;
continue
;
#endif
texstart
++
;
// Do not count the first marker
texstart
++
;
// Do not count the first marker
...
@@ -939,6 +946,7 @@ void R_LoadTextures(void)
...
@@ -939,6 +946,7 @@ void R_LoadTextures(void)
}
}
#ifdef WALLFLATS
#ifdef WALLFLATS
checkflats:
// Yes
// Yes
if
(
wadfiles
[
w
]
->
type
==
RET_PK3
)
if
(
wadfiles
[
w
]
->
type
==
RET_PK3
)
{
{
...
@@ -948,7 +956,7 @@ void R_LoadTextures(void)
...
@@ -948,7 +956,7 @@ void R_LoadTextures(void)
else
else
{
{
texstart
=
W_CheckNumForNamePwad
(
"F_START"
,
(
UINT16
)
w
,
0
);
texstart
=
W_CheckNumForNamePwad
(
"F_START"
,
(
UINT16
)
w
,
0
);
texend
=
W_CheckNumForNamePwad
(
"F_END"
,
(
UINT16
)
w
,
0
);
texend
=
W_CheckNumForNamePwad
(
"F_END"
,
(
UINT16
)
w
,
texstart
);
}
}
if
(
texstart
==
INT16_MAX
||
texend
==
INT16_MAX
)
if
(
texstart
==
INT16_MAX
||
texend
==
INT16_MAX
)
...
...
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