More changes from master.

This commit is contained in:
Mari the Deer 2021-09-29 18:47:23 +02:00
commit 5dea5ab4d6
21 changed files with 892 additions and 42 deletions

View file

@ -184,18 +184,15 @@ Class SWWMCreditsMenu : GenericMenu
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Dac"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Pietro Gagliardi"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Ryan Weatherman"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Valerie Thiessen"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Xada Xephron"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Zard1084"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"John"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"VoanHead"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"NekoMithos"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Artem Bashev"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Ceyne Taikato"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"bouncytem"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Brett Saltzer"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Clint Walker"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Figo"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Holly_Rook"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"m8f"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Namsan"));
cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"YaGirlJuniper"));
@ -203,6 +200,7 @@ Class SWWMCreditsMenu : GenericMenu
cthanks.Push(new("SWWMCreditsEntry").Init(sfnt,"KynikossDragonn","$SWWM_CDRAGON2"));
cthanks.Push(new("SWWMCreditsEntry").Init(sfnt,"Lucy","$SWWM_CLUCY2"));
cthanks.Push(new("SWWMCreditsEntry").Init(sfnt,"Gutawer","$SWWM_CGUTA2"));
cthanks.Push(new("SWWMCreditsEntry").Init(sfnt,"Mikolah","$SWWM_CMIKO2"));
cthanks.Push(new("SWWMCreditsEntry").Init(sfnt,"KeksDose","$SWWM_CKEKS2"));
cthanks.Push(new("SWWMCreditsEntry").Init(sfnt,"ZZYZX & Nash","$SWWM_CZN2"));
cthanks.Push(new("SWWMCreditsEntry").Init(sfnt,"Val Pal","$SWWM_CVAL2"));

View file

@ -145,6 +145,7 @@ Class SWWMStatScreen : StatusScreen abstract
whichtip = ents[Random[InterArt](0,ents.Size()-1)];
pdata.lasttip.Push(whichtip);
}
if ( swwm_nointertips ) return;
String tipstr = "\cd"..String.Format(StringTable.Localize("$SWWM_INTERTIP"),whichtip).."\c-\n"..StringTable.Localize(String.Format("$SWWM_INTERTIP%d",whichtip));
BrokenLines l = fnt.BreakLines(tipstr,400);
int lw = 0;