AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-27 06:54:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

do not override numerical values already set for MBF21 Bits fields (#237)

Browse Source 
* do not override numerical values already set for MBF21 Bits fields

* setting Args3 to 0 for A_MonsterMeleeAttack() means to play no sound at all

* Revert "setting Args3 to 0 for A_MonsterMeleeAttack() means to play no sound at all"

This reverts commit ada1849337ddf07dba81418d6a70387592620dc4.
This commit is contained in:
Fabian Greffrath 2021-07-07 08:56:50 +02:00 committed by GitHub
parent e0167fa81d
commit d48dee0fc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/d_deh.c
View File

@ -1829,7 +1829,9 @@ void deh_procThing(DEHFILE *fpin, FILE* fpout, char *line)
if (!strcasecmp(key,deh_mobjinfo[ix])) // killough 8/98 if (!strcasecmp(key,deh_mobjinfo[ix])) // killough 8/98
{ {
// mbf21: process thing flags // mbf21: process thing flags
if (!strcasecmp(key, "MBF21 Bits") && !value) if (!strcasecmp(key, "MBF21 Bits"))
{
if (!value)
{ {
for (value = 0; (strval = strtok(strval, ",+| \t\f\r")); strval = NULL) for (value = 0; (strval = strtok(strval, ",+| \t\f\r")); strval = NULL)
{ {
@ -1849,6 +1851,7 @@ void deh_procThing(DEHFILE *fpin, FILE* fpout, char *line)
fprintf(fpout, "Could not find MBF21 bit mnemonic %s\n", strval); fprintf(fpout, "Could not find MBF21 bit mnemonic %s\n", strval);
} }
} }
}
mobjinfo[indexnum].flags2 = value; mobjinfo[indexnum].flags2 = value;
} }
@ -2067,6 +2070,8 @@ void deh_procFrame(DEHFILE *fpin, FILE* fpout, char *line)
else else
// mbf21: process state flags // mbf21: process state flags
if (!strcasecmp(key,deh_state[15])) // MBF21 Bits if (!strcasecmp(key,deh_state[15])) // MBF21 Bits
{
if (!value)
{ {
for (value = 0; (strval = strtok(strval, ",+| \t\f\r")); strval = NULL) for (value = 0; (strval = strtok(strval, ",+| \t\f\r")); strval = NULL)
{ {
@ -2086,6 +2091,7 @@ void deh_procFrame(DEHFILE *fpin, FILE* fpout, char *line)
fprintf(fpout, "Could not find MBF21 frame bit mnemonic %s\n", strval); fprintf(fpout, "Could not find MBF21 frame bit mnemonic %s\n", strval);
} }
} }
}
states[indexnum].flags = value; states[indexnum].flags = value;
} }
@ -2345,6 +2351,8 @@ void deh_procWeapon(DEHFILE *fpin, FILE* fpout, char *line)
else else
// mbf21: process weapon flags // mbf21: process weapon flags
if (!strcasecmp(key,deh_weapon[7])) // MBF21 Bits if (!strcasecmp(key,deh_weapon[7])) // MBF21 Bits
{
if (!value)
{ {
for (value = 0; (strval = strtok(strval, ",+| \t\f\r")); strval = NULL) for (value = 0; (strval = strtok(strval, ",+| \t\f\r")); strval = NULL)
{ {
@ -2361,6 +2369,7 @@ void deh_procWeapon(DEHFILE *fpin, FILE* fpout, char *line)
if (!flag->name && fpout) if (!flag->name && fpout)
fprintf(fpout, "Could not find MBF21 weapon bit mnemonic %s\n", strval); fprintf(fpout, "Could not find MBF21 weapon bit mnemonic %s\n", strval);
} }
}
weaponinfo[indexnum].flags = value; weaponinfo[indexnum].flags = value;
} }