Skip to content

Commit

Permalink
#4449: Fix CAM_STUDIO_ANG not being used
Browse files Browse the repository at this point in the history
  • Loading branch information
TeamSpen210 committed Sep 30, 2024
1 parent 78fe167 commit 8c52f72
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* Make P1 Track Platform 'bottom grate' match the shape of the platform.
* #4446: Fix piston movement sounds looping forever.
* #4448: Futbols will now respawn if falling into goo.
* #4449: Monitors not showing GLaDOS/Wheatley in them correctly.

------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
// Cycles through active cameras.
// Values set by generated entity script called
// before this executes:
// Values injected by comp_scriptvar_setter:
// CAM_NUM = int (Number of cameras in the map)
// CAM_ACTIVE = [bool] (For each camera, if it starts on/is on)
// CAM_ACTIVE_NUM = int (Total number of enabled cams)
// CAM_LOC = [Vector] (For each camera, the location it is at)
// CAM_ANGLES = [Vector] (For each camera, the pitch, yaw, and zero roll)
// CAM_STUDIO_CHANCE = float (If -1, other studio values are undefined..)
// CAM_STUDIO_LOC = Vector (Location of studio, for the voiceline)
// CAM_STUDIO_PITCH = float
// CAM_STUDIO_YAW = float
// CAM_STUDIO_ANG = Vector (pitch/yaw/roll for the studio)
// This is also always defined
// CAM_STUDIO_TURRET = bool (If true, an ai_relationship should make turrets shoot.)

Expand Down Expand Up @@ -102,7 +100,7 @@ function set_camera() {

function set_camera_studio() {
self.SetAbsOrigin(CAM_STUDIO_LOC);
self.SetAngles(CAM_STUDIO_PITCH, CAM_STUDIO_YAW, 0);
self.SetAngles(CAM_STUDIO_ANG.x, CAM_STUDIO_ANG.y, CAM_STUDIO_ANG.z);
is_studio = 1;
if (CAM_STUDIO_TURRET) {
EntFire("@monitor_turr_hate", "ApplyRelationship", "", 0);
Expand Down

0 comments on commit 8c52f72

Please sign in to comment.