diff options
Diffstat (limited to 'code/ui/weapon')
| -rw-r--r-- | code/ui/weapon/Crosshair.razor | 8 | ||||
| -rw-r--r-- | code/ui/weapon/Reload.razor | 65 |
2 files changed, 34 insertions, 39 deletions
diff --git a/code/ui/weapon/Crosshair.razor b/code/ui/weapon/Crosshair.razor index 92cdcd3..f2196db 100644 --- a/code/ui/weapon/Crosshair.razor +++ b/code/ui/weapon/Crosshair.razor @@ -1,8 +1,5 @@ -@using Sandbox;
-@using Sandbox.UI;
-
@namespace MurderGame
-@inherits Panel
+@inherits Sandbox.UI.Panel
<style>
crosshair {
@@ -19,5 +16,4 @@ crosshair { }
</style>
-<div class="dot"></div>
-
+<div class="dot"></div>
\ No newline at end of file diff --git a/code/ui/weapon/Reload.razor b/code/ui/weapon/Reload.razor index 190a84c..22609e3 100644 --- a/code/ui/weapon/Reload.razor +++ b/code/ui/weapon/Reload.razor @@ -1,9 +1,7 @@ -@using Sandbox;
-@using Sandbox.UI;
-@using System;
-
@namespace MurderGame
-@inherits Panel
+@using System
+@using Sandbox
+@inherits Sandbox.UI.Panel
<style>
@@keyframes blink {
@@ -46,37 +44,38 @@ reload { }
</style>
-@if (ReloadNeeded) {
-<!--<div class="box @(@Blink ? "blink" : "")">-->
-<div class="box blink">
- <div>Reload</div>
-</div>
+@if (ReloadNeeded)
+{
+ <!--<div class="box @(Blink ? "blink" : "")">-->
+ <div class="box blink">
+ <div>Reload</div>
+ </div>
}
@code
{
- public bool ReloadNeeded { get; set; }
- public bool Blink { get; set; }
+ public bool ReloadNeeded { get; set; }
+ public bool Blink { get; set; }
- protected override int BuildHash()
- {
- var clientPawn = Game.LocalPawn;
+ protected override int BuildHash()
+ {
+ var clientPawn = Game.LocalPawn;
if (clientPawn is Player {Camera: not null } player)
- {
- var inventory = player.Camera.GetObservedInventory();
- if (inventory?.GetCurrentWeapon() != null)
- {
- var weapon = inventory.GetCurrentWeapon();
- var ammo = weapon.Ammo;
- ReloadNeeded = ammo == 0 && !weapon.Reloading;
- Blink = !weapon.Reloading;
- return HashCode.Combine(ReloadNeeded.GetHashCode(), Blink.GetHashCode());
- }
- }
- if (ReloadNeeded)
- {
- ReloadNeeded = false;
- }
- return ReloadNeeded.GetHashCode();
- }
-}
+ {
+ var inventory = player.Camera.GetObservedInventory();
+ if (inventory?.GetCurrentWeapon() != null)
+ {
+ var weapon = inventory.GetCurrentWeapon();
+ var ammo = weapon.Ammo;
+ ReloadNeeded = ammo == 0 && !weapon.Reloading;
+ Blink = !weapon.Reloading;
+ return HashCode.Combine(ReloadNeeded.GetHashCode(), Blink.GetHashCode());
+ }
+ }
+ if (ReloadNeeded)
+ {
+ ReloadNeeded = false;
+ }
+ return ReloadNeeded.GetHashCode();
+ }
+}
\ No newline at end of file |