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

- Fixed: DF_NO_COOP_WEAPON_SPAWN was handled backwardly.

Browse source 
SVN r212 (trunk)
This commit is contained in:
Randy Heit 2006-06-22 02:19:43 +00:00
parent 9eb0aa1a02
commit e6268bf0a2
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/rh-log.txt
View file

@ -1,4 +1,5 @@
June 21, 2006 June 21, 2006
- Fixed: DF_NO_COOP_WEAPON_SPAWN was handled backwardly.
- Fixed: G_InitLevelLocals() needs to OR in the crouching bits, otherwise it - Fixed: G_InitLevelLocals() needs to OR in the crouching bits, otherwise it
discards the jumping bits. discards the jumping bits.
- ProcessActor() now sets C mode before retrieving the actor's name. - ProcessActor() now sets C mode before retrieving the actor's name.

2
src/m_options.cpp
View file

@ -945,7 +945,7 @@ static menuitem_t DMFlagsItems[] = {
{ bitflag, "Allow BFG aiming", {&dmflags2}, {1}, {0}, {0}, {(value_t *)DF2_NO_FREEAIMBFG} }, { bitflag, "Allow BFG aiming", {&dmflags2}, {1}, {0}, {0}, {(value_t *)DF2_NO_FREEAIMBFG} },
{ redtext, " ", {NULL}, {0}, {0}, {0}, {NULL} }, { redtext, " ", {NULL}, {0}, {0}, {0}, {NULL} },
{ whitetext,"Cooperative Settings", {NULL}, {0}, {0}, {0}, {NULL} }, { whitetext,"Cooperative Settings", {NULL}, {0}, {0}, {0}, {NULL} },
{ bitflag, "Spawn multi. weapons", {&dmflags},{1}, {0}, {0}, {(value_t *)DF_NO_COOP_WEAPON_SPAWN} }, { bitflag, "Spawn multi. weapons", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_NO_COOP_WEAPON_SPAWN} },
{ bitflag, "Lose entire inventory",{&dmflags}, {0}, {0}, {0}, {(value_t *)DF_COOP_LOSE_INVENTORY} }, { bitflag, "Lose entire inventory",{&dmflags}, {0}, {0}, {0}, {(value_t *)DF_COOP_LOSE_INVENTORY} },
{ bitflag, "Keep keys", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_COOP_LOSE_KEYS} }, { bitflag, "Keep keys", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_COOP_LOSE_KEYS} },
{ bitflag, "Keep weapons", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_COOP_LOSE_WEAPONS} }, { bitflag, "Keep weapons", {&dmflags}, {1}, {0}, {0}, {(value_t *)DF_COOP_LOSE_WEAPONS} },

2
src/p_mobj.cpp
View file

@ -3725,7 +3725,7 @@ void P_SpawnMapThing (mapthing2_t *mthing, int position)
return; return;
// [RH] don't spawn extra weapons in coop if so desired // [RH] don't spawn extra weapons in coop if so desired
if (multiplayer && !deathmatch && !(dmflags&DF_NO_COOP_WEAPON_SPAWN)) if (multiplayer && !deathmatch && (dmflags & DF_NO_COOP_WEAPON_SPAWN))
{ {
if (i->IsDescendantOf (RUNTIME_CLASS(AWeapon))) if (i->IsDescendantOf (RUNTIME_CLASS(AWeapon)))
{ {