zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 07:57:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed Dehacked parsing issues with weapon properties.

Browse source 
Due to a badly used string length check this code didn't really do what it was supposed to.
This commit is contained in:
Christoph Oelckers 2022-01-07 00:31:57 +01:00
parent 64ef03428d
commit 49ab6612cb
1 changed files with 34 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/gamedata/d_dehacked.cpp
View file

@ -2059,60 +2059,54 @@ static int PatchWeapon (int weapNum)
{ {
int val = atoi (Line2); int val = atoi (Line2);
if (strlen (Line1) >= 9) size_t len = strlen(Line1);
if (len > 6 && stricmp (Line1 + len - 6, " frame") == 0)
{ {
if (stricmp (Line1 + strlen (Line1) - 6, " frame") == 0) FState *state = FindState (val);
if (type != nullptr && !patchedStates)
{ {
FState *state = FindState (val); statedef.MakeStateDefines(type);
patchedStates = true;
if (type != NULL && !patchedStates)
{
statedef.MakeStateDefines(type);
patchedStates = true;
}
if (strnicmp (Line1, "Deselect", 8) == 0)
statedef.SetStateLabel("Select", state);
else if (strnicmp (Line1, "Select", 6) == 0)
statedef.SetStateLabel("Deselect", state);
else if (strnicmp (Line1, "Bobbing", 7) == 0)
statedef.SetStateLabel("Ready", state);
else if (strnicmp (Line1, "Shooting", 8) == 0)
statedef.SetStateLabel("Fire", state);
else if (strnicmp (Line1, "Firing", 6) == 0)
statedef.SetStateLabel("Flash", state);
} }
else if (stricmp (Line1, "Ammo type") == 0)
if (strnicmp (Line1, "Deselect", 8) == 0)
statedef.SetStateLabel("Select", state);
else if (strnicmp (Line1, "Select", 6) == 0)
statedef.SetStateLabel("Deselect", state);
else if (strnicmp (Line1, "Bobbing", 7) == 0)
statedef.SetStateLabel("Ready", state);
else if (strnicmp (Line1, "Shooting", 8) == 0)
statedef.SetStateLabel("Fire", state);
else if (strnicmp (Line1, "Firing", 6) == 0)
statedef.SetStateLabel("Flash", state);
}
else if (stricmp (Line1, "Ammo type") == 0)
{
if (val < 0 || val >= 12 || (unsigned)val >= AmmoNames.Size())
{ {
if (val < 0 || val >= 12 || (unsigned)val >= AmmoNames.Size()) val = 5;
}
if (info)
{
auto &AmmoType = info->PointerVar<PClassActor>(NAME_AmmoType1);
AmmoType = AmmoNames[val];
if (AmmoType != nullptr)
{ {
val = 5; info->IntVar(NAME_AmmoGive1) = GetDefaultByType(AmmoType)->IntVar(NAME_Amount) * 2;
} auto &AmmoUse = info->IntVar(NAME_AmmoUse1);
if (info) if (AmmoUse == 0)
{
auto &AmmoType = info->PointerVar<PClassActor>(NAME_AmmoType1);
AmmoType = AmmoNames[val];
if (AmmoType != nullptr)
{ {
info->IntVar(NAME_AmmoGive1) = GetDefaultByType(AmmoType)->IntVar(NAME_Amount) * 2; AmmoUse = 1;
auto &AmmoUse = info->IntVar(NAME_AmmoUse1);
if (AmmoUse == 0)
{
AmmoUse = 1;
}
} }
} }
} }
else
{
Printf (unknown_str, Line1, "Weapon", weapNum);
}
} }
else if (stricmp (Line1, "Decal") == 0) else if (stricmp (Line1, "Decal") == 0)
{ {
stripwhite (Line2); stripwhite (Line2);
const FDecalTemplate *decal = DecalLibrary.GetDecalByName (Line2); const FDecalTemplate *decal = DecalLibrary.GetDecalByName (Line2);
if (decal != NULL) if (decal != nullptr)
{ {
if (info) info->DecalGenerator = const_cast <FDecalTemplate *>(decal); if (info) info->DecalGenerator = const_cast <FDecalTemplate *>(decal);
} }