diff --git a/edge_base/freedoom1/scripts/things.ddf b/edge_base/freedoom1/scripts/things.ddf index ec8bf4964..52c0ed12c 100644 --- a/edge_base/freedoom1/scripts/things.ddf +++ b/edge_base/freedoom1/scripts/things.ddf @@ -340,7 +340,20 @@ STATES(SPAWN) = SPECIAL = NOBLOCKMAP,NOGRAVITY,DROPOFF,MISSILE; +[BURNING_BARREL:70] +RADIUS=16; +HEIGHT=42; +DLIGHT.TYPE=MODULATE; +DLIGHT.RADIUS=100; +DLIGHT.COLOUR=#3535FF; + +SPECIAL=SOLID,PASS_MISSILE,CLIMBABLE,NOSHADOW; + +STATES(IDLE)=FCAN:A:4:BRIGHT:NOTHING, + FCAN:B:4:BRIGHT:NOTHING, + FCAN:C:4:BRIGHT:NOTHING; + diff --git a/edge_base/freedoom2/scripts/things.ddf b/edge_base/freedoom2/scripts/things.ddf index db45a9221..cbe39c20f 100644 --- a/edge_base/freedoom2/scripts/things.ddf +++ b/edge_base/freedoom2/scripts/things.ddf @@ -341,5 +341,17 @@ STATES(SPAWN) = SPECIAL = NOBLOCKMAP,NOGRAVITY,DROPOFF,MISSILE; - +[BURNING_BARREL:70] +RADIUS=16; +HEIGHT=42; + +DLIGHT.TYPE=MODULATE; +DLIGHT.RADIUS=100; +DLIGHT.COLOUR=#3535FF; + +SPECIAL=SOLID,PASS_MISSILE,CLIMBABLE,NOSHADOW; + +STATES(IDLE)=FCAN:A:4:BRIGHT:NOTHING, + FCAN:B:4:BRIGHT:NOTHING, + FCAN:C:4:BRIGHT:NOTHING; diff --git a/source_files/edge/f_interm.cc b/source_files/edge/f_interm.cc index f449d14b6..b310a9272 100644 --- a/source_files/edge/f_interm.cc +++ b/source_files/edge/f_interm.cc @@ -784,13 +784,15 @@ static float TimeWidth(int t, bool drawText = false) if(drawText == true) { + float txtscale =wi_sp_style->def->text[styledef_c::T_ALT].scale; + if (t > 3599) { - return wi_sp_style->fonts[styledef_c::T_ALT]->StringWidth("Sucks"); + return wi_sp_style->fonts[styledef_c::T_ALT]->StringWidth("Sucks") * txtscale; } else { - return wi_sp_style->fonts[styledef_c::T_ALT]->StringWidth(s.c_str()); + return wi_sp_style->fonts[styledef_c::T_ALT]->StringWidth(s.c_str()) * txtscale; } } else