From 9effa134d2696d19a718f80764b97f838b4de262 Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Mon, 7 Jan 2019 17:02:05 +0000 Subject: [PATCH] resolve the conflict in p_spec.c --- src/p_spec.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/p_spec.c b/src/p_spec.c index 44808a641..22de3db12 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -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 } }