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
e39c6b47
Commit
e39c6b47
authored
6 years ago
by
Monster Iestyn
Browse files
Options
Downloads
Plain Diff
Merge branch 'vanilia-savegame-fix' into 'master'
Fix saving game progress on a unmodified game See merge request
!433
parents
98e46f5b
4f18ec60
Loading
Loading
2 merge requests
!488
Merge in next and don't billboard papersprites in GL
,
!433
Fix saving game progress on a unmodified game
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/p_setup.c
+1
-1
1 addition, 1 deletion
src/p_setup.c
with
1 addition
and
1 deletion
src/p_setup.c
+
1
−
1
View file @
e39c6b47
...
...
@@ -2630,7 +2630,7 @@ static boolean P_CanSave(void)
{
// Saving is completely ignored under these conditions:
if
((
cursaveslot
<
0
)
// Playing without saving
||
(
!
modifiedgame
||
savemoddata
)
// Game is modified
||
(
modifiedgame
&&
!
savemoddata
)
// Game is modified
||
(
netgame
||
multiplayer
)
// Not in single-player
||
(
demoplayback
||
demorecording
||
metalrecording
)
// Currently in demo
||
(
players
[
consoleplayer
].
lives
<=
0
)
// Completely dead
...
...
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