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
ec530323
Commit
ec530323
authored
Dec 23, 2018
by
Marco Z
Browse files
Options
Downloads
Patches
Plain Diff
Fix mainwads check in d_main
parent
b958f00f
Branches
Branches containing commit
Tags
Tags containing commit
3 merge requests
!488
Merge in next and don't billboard papersprites in GL
,
!402
Update code versions to 2.1.22
,
!384
Addons Menu backport to vanilla
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/d_main.c
+14
-10
14 additions, 10 deletions
src/d_main.c
with
14 additions
and
10 deletions
src/d_main.c
+
14
−
10
View file @
ec530323
...
...
@@ -1148,24 +1148,28 @@ void D_SRB2Main(void)
#ifndef DEVELOP // md5s last updated 12/14/14
// Check MD5s of autoloaded files
W_VerifyFileMD5
(
0
,
ASSET_HASH_SRB2_SRB
);
// srb2.srb/srb2.wad
W_VerifyFileMD5
(
1
,
ASSET_HASH_ZONES_DTA
);
// zones.dta
W_VerifyFileMD5
(
2
,
ASSET_HASH_PLAYER_DTA
);
// player.dta
W_VerifyFileMD5
(
3
,
ASSET_HASH_RINGS_DTA
);
// rings.dta
W_VerifyFileMD5
(
mainwads
++
,
ASSET_HASH_SRB2_SRB
);
// srb2.srb/srb2.wad
W_VerifyFileMD5
(
mainwads
++
,
ASSET_HASH_ZONES_DTA
);
// zones.dta
W_VerifyFileMD5
(
mainwads
++
,
ASSET_HASH_PLAYER_DTA
);
// player.dta
W_VerifyFileMD5
(
mainwads
++
,
ASSET_HASH_RINGS_DTA
);
// rings.dta
#ifdef USE_PATCH_DTA
W_VerifyFileMD5
(
4
,
ASSET_HASH_PATCH_DTA
);
// patch.dta
W_VerifyFileMD5
(
mainwads
++
,
ASSET_HASH_PATCH_DTA
);
// patch.dta
#endif
mainwads
++
;
// srb2.srb
mainwads
++
;
// zones.dta
mainwads
++
;
// player.dta
mainwads
++
;
// rings.dta
// don't check music.dta because people like to modify it, and it doesn't matter if they do
// ...except it does if they slip maps in there, and that's what W_VerifyNMUSlumps is for.
mainwads
++
;
// music.dta
#else
mainwads
++
;
// srb2.srb/srb2.wad
mainwads
++
;
// zones.dta
mainwads
++
;
// player.dta
mainwads
++
;
// rings.dta
#ifdef USE_PATCH_DTA
mainwads
++
;
// patch.dta
#endif
mainwads
++
;
// music.dta
#endif //ifndef DEVELOP
mainwadstally
=
packetsizetally
;
...
...
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