OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Use new let syntax for multiple returns.

Browse source
This commit is contained in:
Mari the Deer 2023-01-14 19:14:39 +01:00
commit 525b9e33eb
46 changed files with 143 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

3
zscript/kbase/swwm_kbase_list.zsc
View file

@ -38,8 +38,7 @@ Class DemolitionistMenuList ui
void Drawer( Vector2 offset )
{
Vector2 pos, rpos, rsiz;
int cx, cy, cw, ch;
[cx, cy, cw, ch] = Screen.GetClipRect();
let [cx, cy, cw, ch] = Screen.GetClipRect();
for ( int i=0; i<items.Size(); i++ )
{
pos = (items[i].xpos,items[i].ypos)+offset;

18
zscript/kbase/swwm_kbasetab_inventory.zsc
View file

@ -30,11 +30,9 @@ Class DemolitionistInventoryTab : DemolitionistMenuTab
{
if ( a is 'Weapon' )
{
bool dummy;
int slota, slotb;
[dummy, slota] = players[consoleplayer].weapons.LocateWeapon(Weapon(a).GetClass());
let [dummya, slota] = players[consoleplayer].weapons.LocateWeapon(Weapon(a).GetClass());
if ( slota == 0 ) slota = 10;
[dummy, slotb] = players[consoleplayer].weapons.LocateWeapon(Weapon(b).GetClass());
let [dummyb, slotb] = players[consoleplayer].weapons.LocateWeapon(Weapon(b).GetClass());
if ( slotb == 0 ) slotb = 10;
if ( slota == slotb )
return (Weapon(a).SlotPriority <= Weapon(b).SlotPriority);
@ -67,11 +65,9 @@ Class DemolitionistInventoryTab : DemolitionistMenuTab
}
if ( usesa && usesb )
{
bool dummy;
int slota, slotb;
[dummy, slota] = players[consoleplayer].weapons.LocateWeapon(usesa);
let [dummya, slota] = players[consoleplayer].weapons.LocateWeapon(usesa);
if ( slota == 0 ) slota = 10;
[dummy, slotb] = players[consoleplayer].weapons.LocateWeapon(usesb);
let [dummyb, slotb] = players[consoleplayer].weapons.LocateWeapon(usesb);
if ( slotb == 0 ) slotb = 10;
if ( slota == slotb )
{
@ -119,11 +115,9 @@ Class DemolitionistInventoryTab : DemolitionistMenuTab
}
if ( usesa && usesb )
{
bool dummy;
int slota, slotb;
[dummy, slota] = players[consoleplayer].weapons.LocateWeapon(usesa);
let [dummya, slota] = players[consoleplayer].weapons.LocateWeapon(usesa);
if ( slota == 0 ) slota = 10;
[dummy, slotb] = players[consoleplayer].weapons.LocateWeapon(usesb);
let [dummyb, slotb] = players[consoleplayer].weapons.LocateWeapon(usesb);
if ( slotb == 0 ) slotb = 10;
if ( slota == slotb )
{

6
zscript/kbase/swwm_kbasetab_store.zsc
View file

@ -532,8 +532,7 @@ Class DemolitionistMenuStoreItem : DemolitionistMenuListItem
// formatted name
private void UpdateLabel()
{
int price, amt;
[price, amt] = GetPriceUnits();
let [price, amt] = GetPriceUnits();
let def = GetDefaultByType(inv);
if ( bSell )
{
@ -564,8 +563,7 @@ Class DemolitionistMenuStoreItem : DemolitionistMenuListItem
void BuySellItem()
{
int price, amt;
[price, amt] = GetPriceUnits();
let [price, amt] = GetPriceUnits();
if ( bSell )
{
EventHandler.SendNetworkEvent(String.Format("swwmstoretake.%s",inv.GetClassName()),consoleplayer,price,amt);