Missed this in p_setup.c

This commit is contained in:
Sally Coolatta 2020-08-06 17:55:36 -04:00
parent 438743ce97
commit 337db54965

View file

@ -4152,19 +4152,14 @@ boolean P_AddWadFile(const char *wadfilename)
} }
else if (name[1] == '_') else if (name[1] == '_')
{ {
CONS_Debug(DBG_SETUP, "Music %.8s replaced\n", name); CONS_Debug(DBG_SETUP, "Music %.8s ignored\n", name);
mreplaces++; mreplaces++;
} }
} }
else if (name[0] == 'O' && name[1] == '_') else if (name[0] == 'O' && name[1] == '_')
{ {
<<<<<<< HEAD
CONS_Debug(DBG_SETUP, "Music %.8s ignored\n", name);
mreplaces++;
=======
CONS_Debug(DBG_SETUP, "Music %.8s replaced\n", name); CONS_Debug(DBG_SETUP, "Music %.8s replaced\n", name);
digmreplaces++; digmreplaces++;
>>>>>>> srb2/next
} }
} }
break; break;