From b8bb3479c8f1617b9019a39b112e8d6008bf62e3 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 6 Dec 2006 14:12:26 +0000 Subject: [PATCH] Undid bad merge of rh-log.txt SVN r405 (trunk) --- docs/rh-log.txt | 4 ---- src/thingdef.cpp | 1 - 2 files changed, 5 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 19916de39..94f7e6b12 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -9,10 +9,6 @@ December 5, 2006 (Changes by Graf Zahl) - Converted Strife's Bishop to DECORATE. - Added momx, momy and momz variables to the DECORATE expression evaluator. -December 5, 2006 -- Finished the framework for specifying all action functions externally, - including restricting them to particular classes. - December 3, 2006 - Modified the trustInfo for updaterevision.exe so that it should be fine even with the buggy mt.exe that comes with Visual C++ 2005. diff --git a/src/thingdef.cpp b/src/thingdef.cpp index b585515b5..7f1296f23 100644 --- a/src/thingdef.cpp +++ b/src/thingdef.cpp @@ -269,7 +269,6 @@ static flagdef WeaponFlags[] = DEFINE_FLAG(WIF_BOT, BFG, AWeapon, WeaponFlags), DEFINE_FLAG(WIF, CHEATNOTWEAPON, AWeapon, WeaponFlags), //WIF_BOT_REACTION_SKILL_THING = 1<<31, // I don't understand this - //DEFINE_FLAG(WIF , HITS_GHOSTS, WeaponFlags), // I think it would be smarter to remap the THRUGHOST flag to this }; static const struct { const PClass *Type; flagdef *Defs; int NumDefs; } FlagLists[] =