lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolve the conflict in p_spec.c

This commit is contained in:
Monster Iestyn 2019-01-07 17:02:05 +00:00
parent 96ad8dd81a
commit 9effa134d2
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/p_spec.c
View File

@ -169,20 +169,10 @@ void P_InitPicAnims(void)
// Find ANIMDEFS lump in the WAD
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", w, 0);
<<<<<<< HEAD
while (animdefsLumpNum != INT16_MAX)
{
P_ParseANIMDEFSLump(w, animdefsLumpNum);
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", (UINT16)w, animdefsLumpNum + 1);
=======
// Find ANIMDEFS lump in the WAD
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", w, 0);
while (animdefsLumpNum != INT16_MAX)
{
P_ParseANIMDEFSLump(w, animdefsLumpNum);
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", (UINT16)w, animdefsLumpNum + 1);
}
>>>>>>> public_next-20190101
}
}