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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
b68d1ebd
Commit
b68d1ebd
authored
Apr 4, 2017
by
Luna
Browse files
Options
Downloads
Patches
Plain Diff
titlemap - fix game crash with skybox point
game crash on skybox object use fix
parent
eea7dc42
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/f_finale.c
+35
-3
35 additions, 3 deletions
src/f_finale.c
src/r_main.c
+1
-1
1 addition, 1 deletion
src/r_main.c
with
36 additions
and
4 deletions
src/f_finale.c
+
35
−
3
View file @
b68d1ebd
...
...
@@ -1436,9 +1436,42 @@ void F_StartTitleScreen(void)
if
(
!
mapheaderinfo
[
gamemap
-
1
])
P_AllocMapHeader
(
gamemap
-
1
);
maptol
=
mapheaderinfo
[
gamemap
-
1
]
->
typeoflevel
;
globalweather
=
mapheaderinfo
[
gamemap
-
1
]
->
weather
;
G_DoLoadLevel
(
true
);
players
[
displayplayer
].
playerstate
=
PST_DEAD
;
// Don't spawn the player in dummy (I'm still a filthy cheater)
//camera.subsector = NULL; // toast is filthy too
// Set Default Position
mapthing_t
*
startpos
;
if
(
playerstarts
[
0
])
startpos
=
playerstarts
[
0
];
else
if
(
deathmatchstarts
[
0
])
startpos
=
deathmatchstarts
[
0
];
else
startpos
=
NULL
;
if
(
startpos
)
{
camera
.
x
=
startpos
->
x
<<
FRACBITS
;
camera
.
y
=
startpos
->
y
<<
FRACBITS
;
camera
.
subsector
=
R_PointInSubsector
(
camera
.
x
,
camera
.
y
);
camera
.
z
=
camera
.
subsector
->
sector
->
floorheight
+
((
startpos
->
options
>>
ZSHIFT
)
<<
FRACBITS
);
camera
.
angle
=
(
startpos
->
angle
%
360
)
*
ANG1
;
camera
.
aiming
=
0
;
}
else
{
camera
.
x
=
camera
.
y
=
camera
.
z
=
camera
.
angle
=
camera
.
aiming
=
0
;
camera
.
subsector
=
NULL
;
// toast is filthy too
}
camera
.
chase
=
true
;
camera
.
height
=
0
;
//camera.x = camera.y = camera.height = camera.aiming = 0;
//camera.z = 128*FRACUNIT;
//CON_ClearHUD();
wipegamestate
=
prevwipegamestate
;
...
...
@@ -1545,8 +1578,7 @@ void F_TitleScreenTicker(boolean run)
// Do a lil' camera spin if a title map is loaded.
if
(
titlemapinaction
)
{
camera
.
x
=
camera
.
y
=
camera
.
height
=
camera
.
aiming
=
0
;
camera
.
z
=
128
*
FRACUNIT
;
// Default behavior
camera
.
angle
+=
titlescrollspeed
;
}
...
...
This diff is collapsed.
Click to expand it.
src/r_main.c
+
1
−
1
View file @
b68d1ebd
...
...
@@ -1000,7 +1000,7 @@ void R_SetupFrame(player_t *player, boolean skybox)
chasecam
=
(
cv_chasecam
.
value
!=
0
);
}
if
(
player
->
climbing
||
(
player
->
pflags
&
PF_NIGHTSMODE
)
||
player
->
playerstate
==
PST_DEAD
)
if
(
player
->
climbing
||
(
player
->
pflags
&
PF_NIGHTSMODE
)
||
player
->
playerstate
==
PST_DEAD
||
gamestate
==
GS_TITLESCREEN
)
chasecam
=
true
;
// force chasecam on
else
if
(
player
->
spectator
)
// no spectator chasecam
chasecam
=
false
;
// force chasecam off
...
...
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