OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed ABossEye::Serialize because it didn't do anything.

Browse source 
- Fixed the issues with .96x's railgun code and added it to the current
  version.
- Fixed: Setting of the friendly Minotaur's angle was inconsistent and
  could cause it to move backwards in a féw situation.
- Fixed: The minotaur did checks for type by checking for the MF_FRIENDLY
  flag, not by checking for the actor class. That made it impossible to
  spawn friendly 'normal' minotaurs.
- Moved a few virtual methods which are only applicable to the friendly
  minotaur to AMinotaurFriend.
- Fixed: The friendly minotaur checked the master's health instead of
  the target's when deciding whether to switch targets. Replaced with
  MF4_NOTARGETSWITCH.
- Fixed: maybedrawnow must not draw the console unless the background
  texture has been set up.

SVN r66 (trunk)
This commit is contained in:
Christoph Oelckers 2006-04-23 20:12:27 +00:00
commit 790ff69f52
20 changed files with 280 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/thingdef_codeptr.cpp
View file

@ -874,14 +874,7 @@ void A_RailAttack (AActor * self)
if (!weapon->DepleteAmmo(weapon->bAltFire, true)) return; // out of ammo
}
// Need to keep the default colors
if (Color1==0) Color1 = ColorMatcher.Pick (0, 0, 255);
else if (Color1>0) Color1--;
if (Color2==0) Color2 = ColorMatcher.Pick (255, 255, 255);
else if (Color2>0) Color2--;
P_RailAttack (self, Damage, Spawnofs_XY/*, Color1, Color2, MaxDiff, Silent*/);
P_RailAttack (self, Damage, Spawnofs_XY, Color1, Color2, MaxDiff, Silent);
}
//==========================================================================
@ -938,14 +931,7 @@ void A_CustomRailgun (AActor *actor)
}
}
// Need to keep the default colors
if (Color1==0) Color1 = ColorMatcher.Pick (0, 0, 255);
else if (Color1>0) Color1--;
if (Color2==0) Color2 = ColorMatcher.Pick (255, 255, 255);
else if (Color2>0) Color2--;
P_RailAttack (actor, Damage, Spawnofs_XY/*, Color1, Color2, MaxDiff, Silent*/);
P_RailAttack (actor, Damage, Spawnofs_XY, Color1, Color2, MaxDiff, Silent);
}
//===========================================================================