- Fixed: FWadCollection::MergeLumps() did not initialize the flags for any
marker lumps it inserted. - Fixes to placate GCC. SVN r963 (trunk)
This commit is contained in:
parent
6f7c6e4dac
commit
8ffd79eeca
5 changed files with 69 additions and 69 deletions
|
|
@ -1335,7 +1335,7 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
|
|||
else
|
||||
{
|
||||
int lumpnum = -1;
|
||||
int offset, length;
|
||||
int offset = 0, length = 0;
|
||||
int device = MDEV_DEFAULT;
|
||||
void *handle = NULL;
|
||||
|
||||
|
|
@ -1398,11 +1398,6 @@ bool S_ChangeMusic (const char *musicname, int order, bool looping, bool force)
|
|||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
offset = 0;
|
||||
length = 0;
|
||||
}
|
||||
|
||||
// shutdown old music
|
||||
S_StopMusic (true);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue