resolve the conflict in p_spec.c
This commit is contained in:
parent
96ad8dd81a
commit
9effa134d2
10
src/p_spec.c
10
src/p_spec.c
|
@ -169,20 +169,10 @@ void P_InitPicAnims(void)
|
||||||
// Find ANIMDEFS lump in the WAD
|
// Find ANIMDEFS lump in the WAD
|
||||||
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", w, 0);
|
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", w, 0);
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
while (animdefsLumpNum != INT16_MAX)
|
while (animdefsLumpNum != INT16_MAX)
|
||||||
{
|
{
|
||||||
P_ParseANIMDEFSLump(w, animdefsLumpNum);
|
P_ParseANIMDEFSLump(w, animdefsLumpNum);
|
||||||
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", (UINT16)w, animdefsLumpNum + 1);
|
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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue