zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 06:42:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: It was not possible to set the ammo type of a weapon explicitly to

Browse source 
'none'.


SVN r2033 (trunk)
This commit is contained in:
Christoph Oelckers 2009-12-19 07:44:04 +00:00
parent d8a2387c39
commit bdd1203aca
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/rh-log.txt
View file

@ -1,3 +1,7 @@
December 19, 2009 (Changes by Graf Zahl)
- Fixed: It was not possible to set the ammo type of a weapon explicitly to
'none'.
December 18, 2009
- A_FreezeDeath() now removes fuzz effects.
- In mus2midi.cpp, added range checking to MUS_SYSEVENT and MUS_CTRLCHANGE,

9
src/thingdef/thingdef_properties.cpp
View file

@ -1421,7 +1421,8 @@ DEFINE_CLASS_PROPERTY(ammogive2, I, Weapon)
DEFINE_CLASS_PROPERTY(ammotype, S, Weapon)
{
PROP_STRING_PARM(str, 0);
defaults->AmmoType1 = FindClassTentative(str, "Ammo");
if (!stricmp(str, "none") || *str == 0) defaults->AmmoType1 = NULL;
else defaults->AmmoType1 = FindClassTentative(str, "Ammo");
}
//==========================================================================
@ -1430,7 +1431,8 @@ DEFINE_CLASS_PROPERTY(ammotype, S, Weapon)
DEFINE_CLASS_PROPERTY(ammotype1, S, Weapon)
{
PROP_STRING_PARM(str, 0);
defaults->AmmoType1 = FindClassTentative(str, "Ammo");
if (!stricmp(str, "none") || *str == 0) defaults->AmmoType1 = NULL;
else defaults->AmmoType1 = FindClassTentative(str, "Ammo");
}
//==========================================================================
@ -1439,7 +1441,8 @@ DEFINE_CLASS_PROPERTY(ammotype1, S, Weapon)
DEFINE_CLASS_PROPERTY(ammotype2, S, Weapon)
{
PROP_STRING_PARM(str, 0);
defaults->AmmoType2 = FindClassTentative(str, "Ammo");
if (!stricmp(str, "none") || *str == 0) defaults->AmmoType1 = NULL;
else defaults->AmmoType2 = FindClassTentative(str, "Ammo");
}
//==========================================================================