OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix scroll jitter in demolitionist menu.

Browse source
This commit is contained in:
Mari the Deer 2022-07-21 12:50:22 +02:00
commit 1f7e50de81
9 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r191 \cu(Wed 20 Jul 20:55:47 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r191 \cu(2022-07-20 20:55:47)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r191 \cu(Thu 21 Jul 12:50:22 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r191 \cu(2022-07-21 12:50:22)\c-";

2
zscript/kbase/swwm_kbase_textbox.zsc
View file

@ -95,7 +95,7 @@ Class DemolitionistMenuTextBox ui
void Drawer( double fractic, bool dark = false )
{
double ssmofs = smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic;
double ssmofs = (smofs~==ofs)?smofs:(smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic);
double xx = x+6;
double yy = 17-ssmofs;
Screen.SetClipRect(int((master.origin.x+xx)*master.hs),int((master.origin.y+17)*master.hs),int(w*master.hs),int((master.ws.y-34)*master.hs));

2
zscript/kbase/swwm_kbasetab_chat.zsc
View file

@ -156,7 +156,7 @@ Class DemolitionistChatTab : DemolitionistMenuTab
Screen.DrawText(master.mSmallFont,Font.CR_FIRE,master.origin.x+xx,master.origin.y+yy,str,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true);
return;
}
double ssmofs = smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic;
double ssmofs = (smofs~==ofs)?smofs:(smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic);
double xx = 3;
double yy = 23;
Screen.SetClipRect(int((master.origin.x+3)*master.hs),int((master.origin.y+23)*master.hs),int((master.ws.x-12)*master.hs),int((master.ws.y-46)*master.hs));

2
zscript/kbase/swwm_kbasetab_inventory.zsc
View file

@ -459,7 +459,7 @@ Class DemolitionistInventoryTab : DemolitionistMenuTab
Screen.DrawText(master.mSmallFont,Font.CR_FIRE,master.origin.x+xx,master.origin.y+yy,str,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true);
return;
}
double ssmofs = smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic;
double ssmofs = (smofs~==ofs)?smofs:(smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic);
double xx = 9;
double yy = 23;
Screen.SetClipRect(int((master.origin.x+9)*master.hs),int((master.origin.y+23)*master.hs),int((master.ws.x-18)*master.hs),int((master.ws.y-46)*master.hs));

2
zscript/kbase/swwm_kbasetab_keychain.zsc
View file

@ -302,7 +302,7 @@ Class DemolitionistKeychainTab : DemolitionistMenuTab
Screen.DrawText(master.mSmallFont,Font.CR_FIRE,master.origin.x+xx,master.origin.y+yy,str,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true);
return;
}
double ssmofs = smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic;
double ssmofs = (smofs~==ofs)?smofs:(smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic);
double xx = 9;
double yy = 23;
Screen.SetClipRect(int((master.origin.x+9)*master.hs),int((master.origin.y+23)*master.hs),int((master.ws.x-18)*master.hs),int((master.ws.y-46)*master.hs));

2
zscript/kbase/swwm_kbasetab_library.zsc
View file

@ -398,7 +398,7 @@ Class DemolitionistLibraryTab : DemolitionistMenuTab
Screen.DrawText(master.mSmallFont,Font.CR_GOLD,master.origin.x+lwidth-15,master.origin.y+yy,"‼",DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true);
xx = 3;
yy = 32;
double ssmofs = smofs[section]*(1.-fractic)+((smofs[section]*.6)+(ofs[section]*.4))*fractic;
double ssmofs = (smofs[section]~==ofs[section])?smofs[section]:(smofs[section]*(1.-fractic)+((smofs[section]*.6)+(ofs[section]*.4))*fractic);
Screen.SetClipRect(int((master.origin.x+3)*master.hs),int((master.origin.y+32)*master.hs),int((lwidth-6)*master.hs),int((master.ws.y-50)*master.hs));
lists[section].Drawer((xx,yy-ssmofs));
Screen.ClearClipRect();

2
zscript/kbase/swwm_kbasetab_secret.zsc
View file

@ -122,7 +122,7 @@ Class DemolitionistSecretTab : DemolitionistMenuTab
override void Drawer( double fractic )
{
double ssmofs = smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic;
double ssmofs = (smofs~==ofs)?smofs:(smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic);
double xx = 20;
double yy;
if ( maxofs <= 0 ) yy = master.ws.y/2-160;

2
zscript/kbase/swwm_kbasetab_stats.zsc
View file

@ -553,7 +553,7 @@ Class DemolitionistStatsTab : DemolitionistMenuTab
Screen.DrawText(master.mSmallFont,Font.CR_FIRE,master.origin.x+xx,master.origin.y+yy,str,DTA_VirtualWidthF,master.ss.x,DTA_VirtualHeightF,master.ss.y,DTA_KeepRatio,true);
return;
}
double ssmofs = smofs[section]*(1.-fractic)+((smofs[section]*.6)+(ofs[section]*.4))*fractic;
double ssmofs = (smofs[section]~==ofs[section])?smofs[section]:(smofs[section]*(1.-fractic)+((smofs[section]*.6)+(ofs[section]*.4))*fractic);
if ( section == 3 )
{
// achievement drawer has different margins

2
zscript/kbase/swwm_kbasetab_store.zsc
View file

@ -391,7 +391,7 @@ Class DemolitionistStoreTab : DemolitionistMenuTab
double xx = 9;
double yy = 23;
Screen.SetClipRect(int((master.origin.x+9)*master.hs),int((master.origin.y+23)*master.hs),int((master.ws.x-18)*master.hs),int((master.ws.y-46)*master.hs));
double ssmofs = smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic;
double ssmofs = (smofs~==ofs)?smofs:(smofs*(1.-fractic)+((smofs*.6)+(ofs*.4))*fractic);
invlist[bSell].Drawer((xx-ssmofs,yy));
Screen.ClearClipRect();
if ( maxofs <= 0 ) return;