equal
deleted
inserted
replaced
394 target.y:= frame.y; |
394 target.y:= frame.y; |
395 source.x:= frame.x; |
395 source.x:= frame.x; |
396 source.y:= frame.y; |
396 source.y:= frame.y; |
397 end; |
397 end; |
398 end; |
398 end; |
|
399 |
|
400 with utilityWidget2 do |
|
401 begin |
|
402 show:= false; |
|
403 sprite:= sprBounceButton; |
|
404 frame.w:= Round(spritesData[sprite].Texture^.w * buttonScale); |
|
405 frame.h:= Round(spritesData[sprite].Texture^.h * buttonScale); |
|
406 frame.x:= utilityWidget.frame.x + Round(frame.w * 1.25); |
|
407 frame.y:= arrowLeft.frame.y - Round(frame.h * 1.25); |
|
408 active.x:= frame.x; |
|
409 active.y:= frame.y; |
|
410 active.w:= frame.w; |
|
411 active.h:= frame.h; |
|
412 with moveAnim do |
|
413 begin |
|
414 target.x:= frame.x; |
|
415 target.y:= frame.y; |
|
416 source.x:= frame.x; |
|
417 source.y:= frame.y; |
|
418 end; |
|
419 end; |
|
420 |
399 {$ENDIF} |
421 {$ENDIF} |
400 end; |
422 end; |
401 |
423 |
402 // for uStore texture resetting |
424 // for uStore texture resetting |
403 procedure ResetWorldTex; |
425 procedure ResetWorldTex; |
1619 |
1641 |
1620 DrawScreenWidget(@fireButton); |
1642 DrawScreenWidget(@fireButton); |
1621 DrawScreenWidget(@jumpWidget); |
1643 DrawScreenWidget(@jumpWidget); |
1622 DrawScreenWidget(@AMWidget); |
1644 DrawScreenWidget(@AMWidget); |
1623 DrawScreenWidget(@utilityWidget); |
1645 DrawScreenWidget(@utilityWidget); |
|
1646 DrawScreenWidget(@utilityWidget2); |
1624 DrawScreenWidget(@pauseButton); |
1647 DrawScreenWidget(@pauseButton); |
1625 {$ENDIF} |
1648 {$ENDIF} |
1626 |
1649 |
1627 // Captions |
1650 // Captions |
1628 if UIDisplay <> uiNone then |
1651 if UIDisplay <> uiNone then |
2128 utilityWidget.sprite:= sprSwitchButton; |
2151 utilityWidget.sprite:= sprSwitchButton; |
2129 animateWidget(@utilityWidget, true, true); |
2152 animateWidget(@utilityWidget, true, true); |
2130 end |
2153 end |
2131 else if utilityWidget.show then |
2154 else if utilityWidget.show then |
2132 animateWidget(@utilityWidget, true, false); |
2155 animateWidget(@utilityWidget, true, false); |
|
2156 |
|
2157 if ((Ammoz[ammoType].Ammo.Propz and ammoprop_SetBounce) <> 0) then |
|
2158 begin |
|
2159 utilityWidget2.sprite:= sprBounceButton; |
|
2160 animateWidget(@utilityWidget2, true, true); |
|
2161 end |
|
2162 else if utilityWidget2.show then |
|
2163 animateWidget(@utilityWidget2, true, false); |
2133 {$ELSE} |
2164 {$ELSE} |
2134 ammoType:= ammoType; // avoid hint |
2165 ammoType:= ammoType; // avoid hint |
2135 {$ENDIF} |
2166 {$ENDIF} |
2136 end; |
2167 end; |
2137 |
2168 |