zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 22:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added a new WIF_NO_AUTO_SWITCH flag for weapons that should never be

Browse source 
switched to automatically when the player picks them up.


SVN r457 (trunk)
This commit is contained in:
Randy Heit 2007-01-22 22:15:50 +00:00
parent d0c910fca6
commit b4390308df
5 changed files with 143 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/rh-log.txt
View file

@ -1,3 +1,7 @@
January 22, 2007
- Added a new WIF_NO_AUTO_SWITCH flag for weapons that should never be
switched to automatically when the player picks them up.
January 18, 2007
- Added D3DCREATE_FPU_PRESERVE to the IDirect3D9::CreateDevice() call.
Normally Direct3D sets the FPU to single precision. We don't want that,

2
src/g_shared/a_pickups.h
View file

@ -264,7 +264,7 @@ enum
WIF_WIMPY_WEAPON = 0x00000200, // change away when ammo for another weapon is replenished
WIF_POWERED_UP = 0x00000400, // this is a tome-of-power'ed version of its sister
WIF_EXTREME_DEATH = 0x00000800, // weapon always causes an extreme death
WIF_NO_AUTO_SWITCH = 0x00001000, // never switch to this weapon when it's picked up
WIF_STAFF2_KICKBACK = 0x00002000, // the powered-up Heretic staff has special kickback
WIF_CHEATNOTWEAPON = 1<<27, // Give cheat considers this not a weapon (used by Sigil)

2
src/g_shared/a_weapons.cpp
View file

@ -221,7 +221,7 @@ void AWeapon::AttachToOwner (AActor *other)
SisterWeapon = AddWeapon (SisterWeaponType);
if (Owner->player != NULL)
{
if (!Owner->player->userinfo.neverswitch)
if (!Owner->player->userinfo.neverswitch && !(WeaponFlags & WIF_NO_AUTO_SWITCH))
{
Owner->player->PendingWeapon = this;
}

1
src/thingdef.cpp
View file

@ -268,6 +268,7 @@ static flagdef WeaponFlags[] =
DEFINE_FLAG2(WIF_BOT_MELEE, MELEEWEAPON, AWeapon, WeaponFlags),
DEFINE_FLAG(WIF_BOT, BFG, AWeapon, WeaponFlags),
DEFINE_FLAG(WIF, CHEATNOTWEAPON, AWeapon, WeaponFlags),
DEFINE_FLAG(WIF, NO_AUTO_SWITCH, AWeapon, WeaponFlags),
//WIF_BOT_REACTION_SKILL_THING = 1<<31, // I don't understand this
};

136
wadsrc/wadsrc.vcproj
View file

@ -375,10 +375,34 @@
<Filter
Name="Doom"
>
<File
RelativePath=".\decorate\doom\arachnotron.txt"
>
</File>
<File
RelativePath=".\decorate\doom\archvile.txt"
>
</File>
<File
RelativePath=".\decorate\doom\bruiser.txt"
>
</File>
<File
RelativePath=".\decorate\doom\cacodemon.txt"
>
</File>
<File
RelativePath=".\decorate\doom\cyberdemon.txt"
>
</File>
<File
RelativePath=".\decorate\doom\deadthings.txt"
>
</File>
<File
RelativePath=".\decorate\doom\demon.txt"
>
</File>
<File
RelativePath=".\decorate\doom\doomammo.txt"
>
@ -399,10 +423,50 @@
RelativePath=".\decorate\doom\doomhealth.txt"
>
</File>
<File
RelativePath=".\decorate\doom\doomimp.txt"
>
</File>
<File
RelativePath=".\decorate\doom\doomkeys.txt"
>
</File>
<File
RelativePath=".\decorate\doom\doommisc.txt"
>
</File>
<File
RelativePath=".\decorate\doom\doomplayer.txt"
>
</File>
<File
RelativePath=".\decorate\doom\fatso.txt"
>
</File>
<File
RelativePath=".\decorate\doom\keen.txt"
>
</File>
<File
RelativePath=".\decorate\doom\lostsoul.txt"
>
</File>
<File
RelativePath=".\decorate\doom\painelemental.txt"
>
</File>
<File
RelativePath=".\decorate\doom\possessed.txt"
>
</File>
<File
RelativePath=".\decorate\doom\revenant.txt"
>
</File>
<File
RelativePath=".\decorate\doom\spidermaster.txt"
>
</File>
<File
RelativePath=".\decorate\doom\stealthmonsters.txt"
>
@ -411,6 +475,14 @@
<Filter
Name="Heretic"
>
<File
RelativePath=".\decorate\heretic\beast.txt"
>
</File>
<File
RelativePath=".\decorate\heretic\clink.txt"
>
</File>
<File
RelativePath=".\decorate\heretic\hereticammo.txt"
>
@ -431,10 +503,42 @@
RelativePath=".\decorate\heretic\heretickeys.txt"
>
</File>
<File
RelativePath=".\decorate\heretic\hereticplayer.txt"
>
</File>
<File
RelativePath=".\decorate\heretic\mummy.txt"
>
</File>
<File
RelativePath=".\decorate\heretic\snake.txt"
>
</File>
</Filter>
<Filter
Name="Hexen"
>
<File
RelativePath=".\decorate\hexen\centaur.txt"
>
</File>
<File
RelativePath=".\decorate\hexen\clericplayer.txt"
>
</File>
<File
RelativePath=".\decorate\hexen\demons.txt"
>
</File>
<File
RelativePath=".\decorate\hexen\ettin.txt"
>
</File>
<File
RelativePath=".\decorate\hexen\fighterplayer.txt"
>
</File>
<File
RelativePath=".\decorate\hexen\flame.txt"
>
@ -455,6 +559,10 @@
RelativePath=".\decorate\hexen\hexenspecialdecs.txt"
>
</File>
<File
RelativePath=".\decorate\hexen\mageplayer.txt"
>
</File>
<File
RelativePath=".\decorate\hexen\mana.txt"
>
@ -503,6 +611,10 @@
RelativePath=".\decorate\strife\strifearmor.txt"
>
</File>
<File
RelativePath=".\decorate\strife\strifebishop.txt"
>
</File>
<File
RelativePath=".\decorate\strife\strifeitems.txt"
>
@ -511,6 +623,10 @@
RelativePath=".\decorate\strife\strifekeys.txt"
>
</File>
<File
RelativePath=".\decorate\strife\strifeplayer.txt"
>
</File>
<File
RelativePath=".\decorate\strife\strifestuff.txt"
>
@ -523,6 +639,14 @@
<Filter
Name="Raven"
>
<File
RelativePath=".\decorate\raven\artiegg.txt"
>
</File>
<File
RelativePath=".\decorate\raven\ravenambient.txt"
>
</File>
<File
RelativePath=".\decorate\raven\ravenartifacts.txt"
>
@ -547,10 +671,22 @@
RelativePath=".\decorate\shared\debris.txt"
>
</File>
<File
RelativePath=".\decorate\shared\fountain.txt"
>
</File>
<File
RelativePath=".\decorate\shared\pickups.txt"
>
</File>
<File
RelativePath=".\decorate\shared\sharedmisc.txt"
>
</File>
<File
RelativePath=".\decorate\shared\soundsequence.txt"
>
</File>
<File
RelativePath=".\decorate\shared\splashes.txt"
>