zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 05:51:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed MBF21's A_SeekTracer.

Browse source 
This cannot directly call A_SeekerMissile because that has more parameters. It now maps to a wrapper that takes care of these.
This commit is contained in:
Christoph Oelckers 2022-01-07 00:33:56 +01:00
parent 49ab6612cb
commit 32de663210
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sound/s_advsound.cpp
View file

@ -416,7 +416,7 @@ static int S_AddSound (const char *logicalname, int lumpnum, FScanner *sc)
sfxid = soundEngine->FindSoundNoHash (logicalname); sfxid = soundEngine->FindSoundNoHash (logicalname);
if ((unsigned int)sfxid < S_sfx.Size()) if (sfxid > 0 && (unsigned int)sfxid < S_sfx.Size())
{ // If the sound has already been defined, change the old definition { // If the sound has already been defined, change the old definition
sfxinfo_t *sfx = &S_sfx[sfxid]; sfxinfo_t *sfx = &S_sfx[sfxid];
@ -483,7 +483,9 @@ int S_AddPlayerSound (const char *pclass, int gender, int refid,
int S_AddPlayerSound (const char *pclass, int gender, int refid, int lumpnum, bool fromskin) int S_AddPlayerSound (const char *pclass, int gender, int refid, int lumpnum, bool fromskin)
{ {
auto &S_sfx = soundEngine->GetSounds(); auto &S_sfx = soundEngine->GetSounds();
FString fakename; FString fakename;
int id; int id;

2
wadsrc/static/dehsupp.txt
View file

@ -1199,7 +1199,7 @@ Aliases
A_MonsterMeleeAttack, MBF21_MonsterMeleeAttack, A_MonsterMeleeAttack, MBF21_MonsterMeleeAttack,
A_RadiusDamage, A_RadiusDamage, A_RadiusDamage, A_RadiusDamage,
A_HealChase, MBF21_HealChase, A_HealChase, MBF21_HealChase,
A_SeekTracer, A_SeekerMissile, A_SeekTracer, MBF21_SeekTracer,
A_FindTracer, A_FindTracer, A_FindTracer, A_FindTracer,
A_JumpIfHealthBelow, MBF21_JumpIfHealthBelow, A_JumpIfHealthBelow, MBF21_JumpIfHealthBelow,
A_JumpIfTargetInSight, MBF21_JumpIfTargetInSight, A_JumpIfTargetInSight, MBF21_JumpIfTargetInSight,

6
wadsrc/static/zscript/actors/mbf21.zs
View file

@ -503,5 +503,11 @@ extend class Weapon
player.SetPsprite(PSP_FLASH, tstate); player.SetPsprite(PSP_FLASH, tstate);
} }
// needed to call A_SeekerMissile with proper defaults.
deprecated("2.3", "for Dehacked use only")
void MBF21_SeekTracer(int threshold, int turnmax)
{
A_SeekerMissile(threshold, turnmax);
}
} }