zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-25 21:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added a 'default' setting to all color selection menu items that leaves

Browse source 
the font untranslated.
- Fixed: Heretic's monsters were missing the MF2_MCROSS flag.


SVN r232 (trunk)
This commit is contained in:
Christoph Oelckers 2006-06-29 14:21:56 +00:00
parent 81ee5b4942
commit 38b0230253
12 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/rh-log.txt
View file

@ -1,3 +1,8 @@
June 29, 2006 (Changes by Graf Zahl)
- Added a 'default' setting to all color selection menu items that leaves
the font untranslated.
- Fixed: Heretic's monsters were missing the MF2_MCROSS flag.
June 28, 2006 (Changes by Graf Zahl) June 28, 2006 (Changes by Graf Zahl)
- Fixed: Bouncing projectiles should not bounce off horizon lines. Now they - Fixed: Bouncing projectiles should not bounce off horizon lines. Now they
vanish instead. vanish instead.

2
src/g_heretic/a_beast.cpp
View file

@ -74,7 +74,7 @@ IMPLEMENT_ACTOR (ABeast, Heretic, 70, 3)
PROP_SpeedFixed (14) PROP_SpeedFixed (14)
PROP_PainChance (100) PROP_PainChance (100)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL) PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL)
PROP_Flags2 (MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL) PROP_Flags2 (MF2_MCROSS|MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL)
PROP_SpawnState (S_BEAST_LOOK) PROP_SpawnState (S_BEAST_LOOK)
PROP_SeeState (S_BEAST_WALK) PROP_SeeState (S_BEAST_WALK)

2
src/g_heretic/a_chicken.cpp
View file

@ -260,7 +260,7 @@ IMPLEMENT_ACTOR (AChicken, Heretic, -1, 122)
PROP_SpeedFixed (4) PROP_SpeedFixed (4)
PROP_PainChance (200) PROP_PainChance (200)
PROP_Flags (MF_SOLID|MF_SHOOTABLE) PROP_Flags (MF_SOLID|MF_SHOOTABLE)
PROP_Flags2 (MF2_WINDTHRUST|MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL) PROP_Flags2 (MF2_MCROSS|MF2_WINDTHRUST|MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL)
PROP_Flags3 (MF3_DONTMORPH|MF3_ISMONSTER) PROP_Flags3 (MF3_DONTMORPH|MF3_ISMONSTER)
PROP_SpawnState (S_CHICKEN_LOOK) PROP_SpawnState (S_CHICKEN_LOOK)

2
src/g_heretic/a_clink.cpp
View file

@ -59,7 +59,7 @@ IMPLEMENT_ACTOR (AClink, Heretic, 90, 1)
PROP_SpeedFixed (14) PROP_SpeedFixed (14)
PROP_PainChance (32) PROP_PainChance (32)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_NOBLOOD) PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_NOBLOOD)
PROP_Flags2 (MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL) PROP_Flags2 (MF2_MCROSS|MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL)
PROP_SpawnState (S_CLINK_LOOK) PROP_SpawnState (S_CLINK_LOOK)
PROP_SeeState (S_CLINK_WALK) PROP_SeeState (S_CLINK_WALK)

4
src/g_heretic/a_dsparil.cpp
View file

@ -119,7 +119,7 @@ IMPLEMENT_ACTOR (ASorcerer1, Heretic, 7, 142)
PROP_SpeedFixed (16) PROP_SpeedFixed (16)
PROP_PainChance (56) PROP_PainChance (56)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL) PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL)
PROP_Flags2 (MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL|MF2_BOSS) PROP_Flags2 (MF2_MCROSS|MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL|MF2_BOSS)
PROP_Flags3 (MF3_DONTMORPH|MF3_NORADIUSDMG|MF3_NOTARGET) PROP_Flags3 (MF3_DONTMORPH|MF3_NORADIUSDMG|MF3_NOTARGET)
PROP_Flags4 (MF4_NOICEDEATH) PROP_Flags4 (MF4_NOICEDEATH)
@ -245,7 +245,7 @@ IMPLEMENT_ACTOR (ASorcerer2, Heretic, -1, 143)
PROP_SpeedFixed (14) PROP_SpeedFixed (14)
PROP_PainChance (32) PROP_PainChance (32)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_DROPOFF) PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_DROPOFF)
PROP_Flags2 (MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL|MF2_BOSS) PROP_Flags2 (MF2_MCROSS|MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL|MF2_BOSS)
PROP_Flags3 (MF3_DONTMORPH|MF3_FULLVOLACTIVE|MF3_NORADIUSDMG|MF3_NOTARGET) PROP_Flags3 (MF3_DONTMORPH|MF3_FULLVOLACTIVE|MF3_NORADIUSDMG|MF3_NOTARGET)
PROP_Flags4 (MF4_NOICEDEATH) PROP_Flags4 (MF4_NOICEDEATH)

2
src/g_heretic/a_hereticimp.cpp
View file

@ -93,7 +93,7 @@ IMPLEMENT_ACTOR (AHereticImp, Heretic, 66, 5)
PROP_SpeedFixed (10) PROP_SpeedFixed (10)
PROP_PainChance (200) PROP_PainChance (200)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY|MF_COUNTKILL) PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY|MF_COUNTKILL)
PROP_Flags2 (MF2_SPAWNFLOAT|MF2_PASSMOBJ|MF2_PUSHWALL) PROP_Flags2 (MF2_MCROSS|MF2_SPAWNFLOAT|MF2_PASSMOBJ|MF2_PUSHWALL)
PROP_Flags3 (MF3_DONTOVERLAP) PROP_Flags3 (MF3_DONTOVERLAP)
PROP_Flags4 (MF4_MISSILEMORE) PROP_Flags4 (MF4_MISSILEMORE)

2
src/g_heretic/a_ironlich.cpp
View file

@ -59,7 +59,7 @@ IMPLEMENT_ACTOR (AIronlich, Heretic, 6, 20)
PROP_SpeedFixed (6) PROP_SpeedFixed (6)
PROP_PainChance (32) PROP_PainChance (32)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_NOBLOOD) PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_NOBLOOD)
PROP_Flags2 (MF2_PASSMOBJ|MF2_PUSHWALL) PROP_Flags2 (MF2_MCROSS|MF2_PASSMOBJ|MF2_PUSHWALL)
PROP_Flags3 (MF3_DONTMORPH|MF3_DONTSQUASH) PROP_Flags3 (MF3_DONTMORPH|MF3_DONTSQUASH)
PROP_Flags4 (MF4_BOSSDEATH) PROP_Flags4 (MF4_BOSSDEATH)

2
src/g_heretic/a_knight.cpp
View file

@ -66,7 +66,7 @@ IMPLEMENT_ACTOR (AKnight, Heretic, 64, 6)
PROP_SpeedFixed (12) PROP_SpeedFixed (12)
PROP_PainChance (100) PROP_PainChance (100)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL) PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL)
PROP_Flags2 (MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL) PROP_Flags2 (MF2_MCROSS|MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL)
PROP_SpawnState (S_KNIGHT_STND) PROP_SpawnState (S_KNIGHT_STND)
PROP_SeeState (S_KNIGHT_WALK) PROP_SeeState (S_KNIGHT_WALK)

2
src/g_heretic/a_mummy.cpp
View file

@ -65,7 +65,7 @@ IMPLEMENT_ACTOR (AMummy, Heretic, 68, 4)
PROP_SpeedFixed (12) PROP_SpeedFixed (12)
PROP_PainChance (128) PROP_PainChance (128)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL) PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL)
PROP_Flags2 (MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL) PROP_Flags2 (MF2_MCROSS|MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL)
PROP_SpawnState (S_MUMMY_LOOK) PROP_SpawnState (S_MUMMY_LOOK)
PROP_SeeState (S_MUMMY_WALK) PROP_SeeState (S_MUMMY_WALK)

2
src/g_heretic/a_snake.cpp
View file

@ -66,7 +66,7 @@ IMPLEMENT_ACTOR (ASnake, Heretic, 92, 132)
PROP_SpeedFixed (10) PROP_SpeedFixed (10)
PROP_PainChance (48) PROP_PainChance (48)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL) PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL)
PROP_Flags2 (MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL) PROP_Flags2 (MF2_MCROSS|MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL)
PROP_SpawnState (S_SNAKE_LOOK) PROP_SpawnState (S_SNAKE_LOOK)
PROP_SeeState (S_SNAKE_WALK) PROP_SeeState (S_SNAKE_WALK)

2
src/g_heretic/a_wizard.cpp
View file

@ -67,7 +67,7 @@ IMPLEMENT_ACTOR (AWizard, Heretic, 15, 19)
PROP_SpeedFixed (12) PROP_SpeedFixed (12)
PROP_PainChance (64) PROP_PainChance (64)
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_FLOAT|MF_NOGRAVITY) PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_FLOAT|MF_NOGRAVITY)
PROP_Flags2 (MF2_PASSMOBJ|MF2_PUSHWALL) PROP_Flags2 (MF2_MCROSS|MF2_PASSMOBJ|MF2_PUSHWALL)
PROP_Flags3 (MF3_DONTOVERLAP) PROP_Flags3 (MF3_DONTOVERLAP)
PROP_SpawnState (S_WIZARD_LOOK) PROP_SpawnState (S_WIZARD_LOOK)

13
src/m_options.cpp
View file

@ -754,6 +754,7 @@ static value_t TextColors[] =
{ 8.0, "orange" }, { 8.0, "orange" },
{ 9.0, "white" }, { 9.0, "white" },
{ 10.0, "yellow" } { 10.0, "yellow" }
{ 11.0, "default" }
}; };
static value_t MessageLevels[] = { static value_t MessageLevels[] = {
@ -771,12 +772,12 @@ static menuitem_t MessagesItems[] = {
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} }, { redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
{ whitetext, "Message Colors", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} }, { whitetext, "Message Colors", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
{ redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} }, { redtext, " ", {NULL}, {0.0}, {0.0}, {0.0}, {NULL} },
{ cdiscrete, "Item Pickup", {&msg0color}, {11.0}, {0.0}, {0.0}, {TextColors} }, { cdiscrete, "Item Pickup", {&msg0color}, {12.0}, {0.0}, {0.0}, {TextColors} },
{ cdiscrete, "Obituaries", {&msg1color}, {11.0}, {0.0}, {0.0}, {TextColors} }, { cdiscrete, "Obituaries", {&msg1color}, {12.0}, {0.0}, {0.0}, {TextColors} },
{ cdiscrete, "Critical Messages", {&msg2color}, {11.0}, {0.0}, {0.0}, {TextColors} }, { cdiscrete, "Critical Messages", {&msg2color}, {12.0}, {0.0}, {0.0}, {TextColors} },
{ cdiscrete, "Chat Messages", {&msg3color}, {11.0}, {0.0}, {0.0}, {TextColors} }, { cdiscrete, "Chat Messages", {&msg3color}, {12.0}, {0.0}, {0.0}, {TextColors} },
{ cdiscrete, "Team Messages", {&msg4color}, {11.0}, {0.0}, {0.0}, {TextColors} }, { cdiscrete, "Team Messages", {&msg4color}, {12.0}, {0.0}, {0.0}, {TextColors} },
{ cdiscrete, "Centered Messages", {&msgmidcolor}, {11.0}, {0.0}, {0.0}, {TextColors} } { cdiscrete, "Centered Messages", {&msgmidcolor}, {12.0}, {0.0}, {0.0}, {TextColors} }
}; };
menu_t MessagesMenu = menu_t MessagesMenu =