diff --git a/docs/rh-log.txt b/docs/rh-log.txt index df1e54a38..968ee717a 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -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) - Fixed: Bouncing projectiles should not bounce off horizon lines. Now they vanish instead. diff --git a/src/g_heretic/a_beast.cpp b/src/g_heretic/a_beast.cpp index 55275d716..90c3953fb 100644 --- a/src/g_heretic/a_beast.cpp +++ b/src/g_heretic/a_beast.cpp @@ -74,7 +74,7 @@ IMPLEMENT_ACTOR (ABeast, Heretic, 70, 3) PROP_SpeedFixed (14) PROP_PainChance (100) 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_SeeState (S_BEAST_WALK) diff --git a/src/g_heretic/a_chicken.cpp b/src/g_heretic/a_chicken.cpp index 087ea31a1..812eb6263 100644 --- a/src/g_heretic/a_chicken.cpp +++ b/src/g_heretic/a_chicken.cpp @@ -260,7 +260,7 @@ IMPLEMENT_ACTOR (AChicken, Heretic, -1, 122) PROP_SpeedFixed (4) PROP_PainChance (200) 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_SpawnState (S_CHICKEN_LOOK) diff --git a/src/g_heretic/a_clink.cpp b/src/g_heretic/a_clink.cpp index 6a3db3cd2..5e1bd9271 100644 --- a/src/g_heretic/a_clink.cpp +++ b/src/g_heretic/a_clink.cpp @@ -59,7 +59,7 @@ IMPLEMENT_ACTOR (AClink, Heretic, 90, 1) PROP_SpeedFixed (14) PROP_PainChance (32) 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_SeeState (S_CLINK_WALK) diff --git a/src/g_heretic/a_dsparil.cpp b/src/g_heretic/a_dsparil.cpp index 06eab4139..aa181b751 100644 --- a/src/g_heretic/a_dsparil.cpp +++ b/src/g_heretic/a_dsparil.cpp @@ -119,7 +119,7 @@ IMPLEMENT_ACTOR (ASorcerer1, Heretic, 7, 142) PROP_SpeedFixed (16) PROP_PainChance (56) 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_Flags4 (MF4_NOICEDEATH) @@ -245,7 +245,7 @@ IMPLEMENT_ACTOR (ASorcerer2, Heretic, -1, 143) PROP_SpeedFixed (14) PROP_PainChance (32) 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_Flags4 (MF4_NOICEDEATH) diff --git a/src/g_heretic/a_hereticimp.cpp b/src/g_heretic/a_hereticimp.cpp index 26b9d15b2..1a7510ed1 100644 --- a/src/g_heretic/a_hereticimp.cpp +++ b/src/g_heretic/a_hereticimp.cpp @@ -93,7 +93,7 @@ IMPLEMENT_ACTOR (AHereticImp, Heretic, 66, 5) PROP_SpeedFixed (10) PROP_PainChance (200) 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_Flags4 (MF4_MISSILEMORE) diff --git a/src/g_heretic/a_ironlich.cpp b/src/g_heretic/a_ironlich.cpp index ef507b90f..09ae13b99 100644 --- a/src/g_heretic/a_ironlich.cpp +++ b/src/g_heretic/a_ironlich.cpp @@ -59,7 +59,7 @@ IMPLEMENT_ACTOR (AIronlich, Heretic, 6, 20) PROP_SpeedFixed (6) PROP_PainChance (32) 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_Flags4 (MF4_BOSSDEATH) diff --git a/src/g_heretic/a_knight.cpp b/src/g_heretic/a_knight.cpp index 3c887d8b1..bca328fdf 100644 --- a/src/g_heretic/a_knight.cpp +++ b/src/g_heretic/a_knight.cpp @@ -66,7 +66,7 @@ IMPLEMENT_ACTOR (AKnight, Heretic, 64, 6) PROP_SpeedFixed (12) PROP_PainChance (100) 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_SeeState (S_KNIGHT_WALK) diff --git a/src/g_heretic/a_mummy.cpp b/src/g_heretic/a_mummy.cpp index 4688f627c..f401cc969 100644 --- a/src/g_heretic/a_mummy.cpp +++ b/src/g_heretic/a_mummy.cpp @@ -65,7 +65,7 @@ IMPLEMENT_ACTOR (AMummy, Heretic, 68, 4) PROP_SpeedFixed (12) PROP_PainChance (128) 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_SeeState (S_MUMMY_WALK) diff --git a/src/g_heretic/a_snake.cpp b/src/g_heretic/a_snake.cpp index 1c9f7b146..e8d3b043e 100644 --- a/src/g_heretic/a_snake.cpp +++ b/src/g_heretic/a_snake.cpp @@ -66,7 +66,7 @@ IMPLEMENT_ACTOR (ASnake, Heretic, 92, 132) PROP_SpeedFixed (10) PROP_PainChance (48) 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_SeeState (S_SNAKE_WALK) diff --git a/src/g_heretic/a_wizard.cpp b/src/g_heretic/a_wizard.cpp index 8cc2d1f32..19894a4cd 100644 --- a/src/g_heretic/a_wizard.cpp +++ b/src/g_heretic/a_wizard.cpp @@ -67,7 +67,7 @@ IMPLEMENT_ACTOR (AWizard, Heretic, 15, 19) PROP_SpeedFixed (12) PROP_PainChance (64) 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_SpawnState (S_WIZARD_LOOK) diff --git a/src/m_options.cpp b/src/m_options.cpp index 96f2da567..322769acf 100644 --- a/src/m_options.cpp +++ b/src/m_options.cpp @@ -754,6 +754,7 @@ static value_t TextColors[] = { 8.0, "orange" }, { 9.0, "white" }, { 10.0, "yellow" } + { 11.0, "default" } }; static value_t MessageLevels[] = { @@ -771,12 +772,12 @@ static menuitem_t MessagesItems[] = { { redtext, " ", {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} }, - { cdiscrete, "Item Pickup", {&msg0color}, {11.0}, {0.0}, {0.0}, {TextColors} }, - { cdiscrete, "Obituaries", {&msg1color}, {11.0}, {0.0}, {0.0}, {TextColors} }, - { cdiscrete, "Critical Messages", {&msg2color}, {11.0}, {0.0}, {0.0}, {TextColors} }, - { cdiscrete, "Chat Messages", {&msg3color}, {11.0}, {0.0}, {0.0}, {TextColors} }, - { cdiscrete, "Team Messages", {&msg4color}, {11.0}, {0.0}, {0.0}, {TextColors} }, - { cdiscrete, "Centered Messages", {&msgmidcolor}, {11.0}, {0.0}, {0.0}, {TextColors} } + { cdiscrete, "Item Pickup", {&msg0color}, {12.0}, {0.0}, {0.0}, {TextColors} }, + { cdiscrete, "Obituaries", {&msg1color}, {12.0}, {0.0}, {0.0}, {TextColors} }, + { cdiscrete, "Critical Messages", {&msg2color}, {12.0}, {0.0}, {0.0}, {TextColors} }, + { cdiscrete, "Chat Messages", {&msg3color}, {12.0}, {0.0}, {0.0}, {TextColors} }, + { cdiscrete, "Team Messages", {&msg4color}, {12.0}, {0.0}, {0.0}, {TextColors} }, + { cdiscrete, "Centered Messages", {&msgmidcolor}, {12.0}, {0.0}, {0.0}, {TextColors} } }; menu_t MessagesMenu =