replace class'DXRando'.default.dxr.player with player()

Die4Ever · May 26, 2024 · 38e7c36 · 38e7c36
1 parent 1ee9daf
commit 38e7c36
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/DXRModules/DeusEx/Classes/DXRCameraModes.uc b/DXRModules/DeusEx/Classes/DXRCameraModes.uc
@@ -60,45 +60,45 @@ function bool IsFixedCamGame()
 
 function EnableTempThirdPerson(optional bool noLaser)
 {
-    local #var(PlayerPawn) player;
+    local #var(PlayerPawn) p;
 
     tempCameraMode=CM_ThirdPerson;
     SetCameraMode(tempCameraMode);
 
     if (noLaser) {
-        player = class'DXRando'.default.dxr.player;
-        if (player != None) {
-            player.CreateAimLaser();
-            player.aimLaser.bForcedOff = true;
+        p = player();
+        if (p != None) {
+            p.CreateAimLaser();
+            p.aimLaser.bForcedOff = true;
         }
     }
 }
 
 function EnableTempFixedCamera(optional bool noLaser)
 {
-    local #var(PlayerPawn) player;
+    local #var(PlayerPawn) p;
 
     tempCameraMode=CM_FixedCamera;
     SetCameraMode(tempCameraMode);
 
     if (noLaser) {
-        player = class'DXRando'.default.dxr.player;
-        if (player != None) {
-            player.CreateAimLaser();
-            player.aimLaser.bForcedOff = true;
+        p = player();
+        if (p != None) {
+            p.CreateAimLaser();
+            p.aimLaser.bForcedOff = true;
         }
     }
 }
 
 function DisableTempCamera()
 {
-    local #var(PlayerPawn) player;
+    local #var(PlayerPawn) p;
 
     tempCameraMode=CM_Disabled;
     SetCameraMode(GetExpectedCameraMode());
-    player = class'DXRando'.default.dxr.player;
-    if (player != None && player.aimLaser != None)
-        player.aimLaser.bForcedOff = false;
+    p = player();
+    if (p != None && p.aimLaser != None)
+        p.aimLaser.bForcedOff = false;
 }
 
 function SetFirstPersonCamera()

diff --git a/DXRVanilla/DeusEx/Classes/Player.uc b/DXRVanilla/DeusEx/Classes/Player.uc
@@ -862,9 +862,9 @@ function CreateAimLaser()
 {
     if (aimLaser == None) {
         aimLaser = Spawn(class'DXRAimLaserEmitter', Self, , Location, Pawn(Owner).ViewRotation);
-            if (aimLaser == None) {
-                ClientMessage("Failed to spawn aim laser?");
-            }
+        if (aimLaser == None) {
+            ClientMessage("Failed to spawn aim laser?");
+        }
     }
 }