thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-11 18:42:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve the conflict in p_spec.c

Browse source
This commit is contained in:
Monster Iestyn 2019-01-07 17:02:05 +00:00
parent d4d30e9e9c
commit 69d7927ee8
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 // 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
} }
} }