zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SVN r179 (trunk)

This commit is contained in:
Christoph Oelckers 2006-06-07 20:53:40 +00:00
parent 7a601515df
commit 6b821afa64
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.linux
View File

@ -113,7 +113,7 @@ $(OBJDIR)/%.o:
# Hi, you Linux people. This works with Makefile.mingw, so i assume it works here too.
# This file needs special handling so that it actually gets compiled with SSE2 support.
$(OBJDIR)/nodebuild_classify_sse2.o: nodebuild_classify_sse2.cpp
$(OBJDIR)/nodebuild_classify_sse2.o: src/nodebuild_classify_sse2.cpp
$(CXX) $(CXXFLAGS) -msse2 -mfpmath=sse -c -o $@ $<
# start a new instance of make after dependency files have been made

3
docs/rh-log.txt
View File

@ -1,3 +1,6 @@
June 7, 2006 (Changes by Graf Zahl)
- Fixed: A_CustomPunch didn't use the range parameter correctly.
June 6, 2006
- Integrated recent ZDBSP improvements into the internal nodebuilder:
- ClassifyLine now chooses either SSE2 or regular x87 math depending on whether

4
src/thingdef_codeptr.cpp
View File

@ -868,7 +868,8 @@ void A_CustomPunch (AActor *self)
if (!norandom) Damage *= (pr_cwpunch()%8+1);
angle = self->angle + (pr_cwpunch.Random2() << 18);
pitch = P_AimLineAttack (self, angle, MELEERANGE);
if (Range == 0) Range = MELEERANGE;
pitch = P_AimLineAttack (self, angle, Range);
// only use ammo when actually hitting something!
if (UseAmmo && linetarget && weapon)
@ -879,7 +880,6 @@ void A_CustomPunch (AActor *self)
PuffType = PClass::FindClass(PuffTypeName);
if (!PuffType) PuffType=RUNTIME_CLASS(ABulletPuff);
if (Range == 0) Range = MELEERANGE;
P_LineAttack (self, angle, Range, pitch, Damage, GetDefaultByType(PuffType)->DamageType, PuffType);
// turn to face target