From 6b821afa64b4c7ae605d96ea5735ed7f9f385b61 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 7 Jun 2006 20:53:40 +0000 Subject: [PATCH] SVN r179 (trunk) --- Makefile.linux | 2 +- docs/rh-log.txt | 3 +++ src/thingdef_codeptr.cpp | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.linux b/Makefile.linux index 8e6cd5a70..9571c8a26 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -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 diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 0b7d0e267..452fabfda 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -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 diff --git a/src/thingdef_codeptr.cpp b/src/thingdef_codeptr.cpp index 2a578ba0f..e1832f896 100644 --- a/src/thingdef_codeptr.cpp +++ b/src/thingdef_codeptr.cpp @@ -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