Undid bad merge of rh-log.txt

SVN r405 (trunk)
This commit is contained in:
Christoph Oelckers 2006-12-06 14:12:26 +00:00
parent b599eda17d
commit b8bb3479c8
2 changed files with 0 additions and 5 deletions

View file

@ -9,10 +9,6 @@ December 5, 2006 (Changes by Graf Zahl)
- Converted Strife's Bishop to DECORATE. - Converted Strife's Bishop to DECORATE.
- Added momx, momy and momz variables to the DECORATE expression evaluator. - 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 December 3, 2006
- Modified the trustInfo for updaterevision.exe so that it should be - Modified the trustInfo for updaterevision.exe so that it should be
fine even with the buggy mt.exe that comes with Visual C++ 2005. fine even with the buggy mt.exe that comes with Visual C++ 2005.

View file

@ -269,7 +269,6 @@ static flagdef WeaponFlags[] =
DEFINE_FLAG(WIF_BOT, BFG, AWeapon, WeaponFlags), DEFINE_FLAG(WIF_BOT, BFG, AWeapon, WeaponFlags),
DEFINE_FLAG(WIF, CHEATNOTWEAPON, AWeapon, WeaponFlags), DEFINE_FLAG(WIF, CHEATNOTWEAPON, AWeapon, WeaponFlags),
//WIF_BOT_REACTION_SKILL_THING = 1<<31, // I don't understand this //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[] = static const struct { const PClass *Type; flagdef *Defs; int NumDefs; } FlagLists[] =