Fix local camera snapping to position when exiting possession (#4410)

rainlizard · web-flow · commit bb4fb83c5213 · 2025-12-12T12:27:39.000+01:00
Plus some code refactor
diff --git a/src/engine_redraw.c b/src/engine_redraw.c
@@ -526,7 +526,7 @@ void set_engine_view(struct PlayerInfo *player, long val)
         // fall through
     case PVM_CreatureView:
         player->acamera = &player->cameras[CamIV_FirstPerson];
-        sync_local_camera(player->acamera);
+        sync_local_camera(player);
         if (!is_my_player(player))
             break;
         lens_mode = 2;
@@ -539,7 +539,7 @@ void set_engine_view(struct PlayerInfo *player, long val)
     case PVM_IsoStraightView:
         player->acamera = &player->cameras[CamIV_Isometric];
         player->acamera->view_mode = val;
-        sync_local_camera(player->acamera);
+        sync_local_camera(player);
         if (!is_my_player(player))
             break;
         lens_mode = 0;
@@ -550,7 +550,7 @@ void set_engine_view(struct PlayerInfo *player, long val)
         break;
     case PVM_ParchmentView:
         player->acamera = &player->cameras[CamIV_Parchment];
-        sync_local_camera(player->acamera);
+        sync_local_camera(player);
         if (!is_my_player(player))
             break;
         S3DSetLineOfSightFunction(dummy_sound_line_of_sight);
@@ -562,7 +562,7 @@ void set_engine_view(struct PlayerInfo *player, long val)
         break;
     case PVM_FrontView:
         player->acamera = &player->cameras[CamIV_FrontView];
-        sync_local_camera(player->acamera);
+        sync_local_camera(player);
         if (!is_my_player(player))
             break;
         lens_mode = 0;
diff --git a/src/local_camera.c b/src/local_camera.c
@@ -41,7 +41,7 @@ extern "C" {
 /******************************************************************************/
 struct Camera local_cameras[4];
 struct Camera previous_local_cameras[4];
-struct Camera desired_local_cameras[4];
+struct Camera destination_local_cameras[4];
 float interpolated_cam_mappos_x[4];
 float interpolated_cam_mappos_y[4];
 float interpolated_cam_mappos_z[4];
@@ -55,7 +55,7 @@ TbBool local_camera_ready;
 void sync_camera_state(int cam_idx, struct Camera *cam)
 {
     local_cameras[cam_idx] = *cam;
-    desired_local_cameras[cam_idx] = *cam;
+    destination_local_cameras[cam_idx] = *cam;
     previous_local_cameras[cam_idx] = *cam;
     interpolated_cam_mappos_x[cam_idx] = cam->mappos.x.val;
     interpolated_cam_mappos_y[cam_idx] = cam->mappos.y.val;
@@ -100,21 +100,21 @@ void process_local_minimap_click(struct Packet* packet) {
         long pos_y = subtile_coord_center(packet->actn_par2);
         for (int i = CamIV_Isometric; i <= CamIV_FrontView; i++) {
             if (i != CamIV_FirstPerson) {
-                desired_local_cameras[i].mappos.x.val = pos_x;
-                desired_local_cameras[i].mappos.y.val = pos_y;
+                destination_local_cameras[i].mappos.x.val = pos_x;
+                destination_local_cameras[i].mappos.y.val = pos_y;
             }
         }
     }
 }
 
 void update_local_first_person_camera(struct Thing *ctrltng)
 {
-    struct Camera* cam = &desired_local_cameras[CamIV_FirstPerson];
+    struct Camera* cam = &destination_local_cameras[CamIV_FirstPerson];
     int eye_height = get_creature_eye_height(ctrltng);
     update_first_person_position(cam, ctrltng, eye_height);
 
-    long current_horizontal = desired_local_cameras[CamIV_FirstPerson].rotation_angle_x;
-    long current_vertical = desired_local_cameras[CamIV_FirstPerson].rotation_angle_y;
+    long current_horizontal = destination_local_cameras[CamIV_FirstPerson].rotation_angle_x;
+    long current_vertical = destination_local_cameras[CamIV_FirstPerson].rotation_angle_y;
     struct Packet* latest_packet = get_local_input_lag_packet_for_turn(CURRENT_TURN_FOR_CAMERA);
     if (latest_packet != NULL) {
         long new_horizontal, new_vertical, new_roll;
@@ -135,7 +135,7 @@ void update_local_cameras(void)
         return;
     }
     for (int i = 0; i < 4; i++) {
-        previous_local_cameras[i] = desired_local_cameras[i];
+        previous_local_cameras[i] = destination_local_cameras[i];
     }
     struct PlayerInfo* my_player = get_my_player();
     struct Thing *ctrltng = thing_get(my_player->controlled_thing_idx);
@@ -152,8 +152,8 @@ void update_local_cameras(void)
             if (cam_idx == CamIV_FirstPerson || cam_idx == CamIV_Parchment) {
                 continue;
             }
-            process_camera_controls(&desired_local_cameras[cam_idx], local_packet, my_player);
-            view_process_camera_inertia(&desired_local_cameras[cam_idx]);
+            process_camera_controls(&destination_local_cameras[cam_idx], local_packet, my_player);
+            view_process_camera_inertia(&destination_local_cameras[cam_idx]);
         }
     }
 }
@@ -165,7 +165,7 @@ void interpolate_local_cameras(void)
     }
     for (int i = 0; i < 4; i++) {
         struct Camera* prev = &previous_local_cameras[i];
-        struct Camera* desired = &desired_local_cameras[i];
+        struct Camera* desired = &destination_local_cameras[i];
         struct Camera* out = &local_cameras[i];
         interpolated_cam_mappos_x[i] = interpolate(interpolated_cam_mappos_x[i], prev->mappos.x.val, desired->mappos.x.val);
         interpolated_cam_mappos_y[i] = interpolate(interpolated_cam_mappos_y[i], prev->mappos.y.val, desired->mappos.y.val);
@@ -184,40 +184,30 @@ void interpolate_local_cameras(void)
     }
 }
 
-void sync_local_camera(struct Camera *cam)
+void sync_local_camera(struct PlayerInfo *player)
 {
-    if (!local_camera_ready) {
+    if (!is_my_player(player) || !local_camera_ready) {
         return;
     }
-    struct PlayerInfo *player = get_my_player();
-    if (cam == &player->cameras[CamIV_FirstPerson]) {
-        sync_first_person_camera(cam, player);
+    if (player->acamera == &player->cameras[CamIV_FirstPerson]) {
+        sync_first_person_camera(player->acamera, player);
         return;
     }
     for (int cam_idx = CamIV_Isometric; cam_idx <= CamIV_FrontView; cam_idx++) {
-        if (cam == &player->cameras[cam_idx]) {
-            sync_camera_state(cam_idx, cam);
-            if (cam_idx != CamIV_Parchment) {
-                if (player->view_mode == PVM_ParchmentView) {
-                    reset_all_minimap_interpolation = true;
-                }
-            }
-            return;
-        }
+        sync_camera_state(cam_idx, &player->cameras[cam_idx]);
+    }
+    if (player->view_mode == PVM_ParchmentView) {
+        reset_all_minimap_interpolation = true;
     }
 }
 
-void set_local_desired_camera(struct Camera *cam)
+void set_local_camera_destination(struct PlayerInfo *player)
 {
-    if (!local_camera_ready) {
+    if (!is_my_player(player) || !local_camera_ready) {
         return;
     }
-    struct PlayerInfo *player = get_my_player();
     for (int cam_idx = CamIV_Isometric; cam_idx <= CamIV_FrontView; cam_idx++) {
-        if (cam == &player->cameras[cam_idx]) {
-            desired_local_cameras[cam_idx] = *cam;
-            break;
-        }
+        destination_local_cameras[cam_idx] = player->cameras[cam_idx];
     }
 }
 
@@ -227,9 +217,6 @@ struct Camera* get_local_camera(struct Camera* cam)
         return cam;
     }
     struct PlayerInfo *player = get_my_player();
-    if ((player->allocflags & PlaF_CompCtrl) != 0) {
-        return cam;
-    }
     for (int cam_idx = CamIV_Isometric; cam_idx <= CamIV_FrontView; cam_idx++) {
         if (cam == &player->cameras[cam_idx]) {
             return &local_cameras[cam_idx];
diff --git a/src/local_camera.h b/src/local_camera.h
@@ -35,7 +35,7 @@ struct PlayerInfo;
 /******************************************************************************/
 extern struct Camera local_cameras[4];
 extern struct Camera previous_local_cameras[4];
-extern struct Camera desired_local_cameras[4];
+extern struct Camera destination_local_cameras[4];
 extern float interpolated_cam_mappos_x[4];
 extern float interpolated_cam_mappos_y[4];
 extern float interpolated_cam_mappos_z[4];
@@ -48,8 +48,8 @@ extern TbBool local_camera_ready;
 void init_local_cameras(struct PlayerInfo *player);
 void update_local_cameras(void);
 void interpolate_local_cameras(void);
-void sync_local_camera(struct Camera *cam);
-void set_local_desired_camera(struct Camera *cam);
+void sync_local_camera(struct PlayerInfo *player);
+void set_local_camera_destination(struct PlayerInfo *player);
 struct Camera* get_local_camera(struct Camera* cam);
 
 /******************************************************************************/
diff --git a/src/packets.c b/src/packets.c
@@ -815,11 +815,7 @@ TbBool process_players_global_packet_action(PlayerNumber plyr_idx)
       player->cameras[CamIV_Parchment].rotation_angle_x = pckt->actn_par1;
       player->cameras[CamIV_FrontView].rotation_angle_x = pckt->actn_par1;
       player->cameras[CamIV_Isometric].rotation_angle_x = pckt->actn_par1;
-      if (is_my_player(player)) {
-          set_local_desired_camera(&player->cameras[CamIV_Parchment]);
-          set_local_desired_camera(&player->cameras[CamIV_FrontView]);
-          set_local_desired_camera(&player->cameras[CamIV_Isometric]);
-      }
+      set_local_camera_destination(player);
       return 0;
   case PckA_SetPlyrState:
       set_player_state(player, pckt->actn_par1, pckt->actn_par2);
diff --git a/src/player_instances.c b/src/player_instances.c
@@ -410,7 +410,7 @@ long pinstfm_control_creature(struct PlayerInfo *player, int32_t *n)
         {
           cam->rotation_angle_x -= DEGREES_360;
         }
-        set_local_desired_camera(cam);
+        set_local_camera_destination(player);
     }
     return 0;
 }
@@ -512,7 +512,7 @@ long pinstfm_leave_creature(struct PlayerInfo *player, int32_t *n)
         if (get_camera_zoom(player->acamera) < player->dungeon_camera_zoom) {
             set_camera_zoom(player->acamera, player->dungeon_camera_zoom);
         }
-        set_local_desired_camera(player->acamera);
+        set_local_camera_destination(player);
     }
     return 0;
 }
@@ -551,8 +551,6 @@ long pinstfe_leave_creature(struct PlayerInfo *player, int32_t *n)
   set_camera_zoom(player->acamera, player->dungeon_camera_zoom);
   if (is_my_player(player)) {
     PaletteSetPlayerPalette(player, engine_palette);
-    sync_local_camera(&player->cameras[CamIV_Isometric]);
-    sync_local_camera(&player->cameras[CamIV_FrontView]);
   }
   player->allocflags &= ~PlaF_KeyboardInputDisabled;
   player->allocflags &= ~PlaF_MouseInputDisabled;
@@ -693,8 +691,7 @@ long pinstfm_zoom_out_of_heart(struct PlayerInfo *player, int32_t *n)
         dstcam = &player->cameras[CamIV_FrontView];
         dstcam->mappos.x.val = thing->mappos.x.val + deltax;
         dstcam->mappos.y.val = thing->mappos.y.val + deltay;
-        set_local_desired_camera(&player->cameras[CamIV_Isometric]);
-        set_local_desired_camera(&player->cameras[CamIV_FrontView]);
+        set_local_camera_destination(player);
     }
     if (is_my_player_number(player->id_number) && (player->instance_remain_turns >= 8))
         LbPaletteFade(engine_palette, 8, Lb_PALETTE_FADE_OPEN);
@@ -711,7 +708,7 @@ long pinstfe_zoom_out_of_heart(struct PlayerInfo *player, int32_t *n)
   {
     cam->zoom = player->isometric_view_zoom_level;
     cam->rotation_angle_x = DEGREES_45;
-    sync_local_camera(cam);
+    set_local_camera_destination(player);
   }
   light_turn_light_on(player->cursor_light_idx);
   player->allocflags &= ~PlaF_KeyboardInputDisabled;
@@ -884,7 +881,7 @@ long pinstfm_zoom_to_position(struct PlayerInfo *player, int32_t *n)
         player->instance_remain_turns = 0;
     cam->mappos.x.val = x;
     cam->mappos.y.val = y;
-    set_local_desired_camera(cam);
+    set_local_camera_destination(player);
     return 0;
 }
 
@@ -969,6 +966,7 @@ void leave_creature_as_controller(struct PlayerInfo *player, struct Thing *thing
         player->cameras[CamIV_Isometric].mappos.y.val = subtile_coord_center(game.map_subtiles_y/2);
         player->cameras[CamIV_FrontView].mappos.x.val = subtile_coord_center(game.map_subtiles_x/2);
         player->cameras[CamIV_FrontView].mappos.y.val = subtile_coord_center(game.map_subtiles_y/2);
+        sync_local_camera(player);
         clear_selected_thing(player);
         return;
     }
@@ -986,6 +984,7 @@ void leave_creature_as_controller(struct PlayerInfo *player, struct Thing *thing
     player->cameras[CamIV_Isometric].mappos.y.val = thing->mappos.y.val + distance_with_angle_to_coord_y(k,i);
     player->cameras[CamIV_FrontView].mappos.x.val = thing->mappos.x.val + distance_with_angle_to_coord_x(k,i);
     player->cameras[CamIV_FrontView].mappos.y.val = thing->mappos.y.val + distance_with_angle_to_coord_y(k,i);
+    sync_local_camera(player);
     if (thing->class_id == TCls_Creature)
     {
         set_start_state(thing);
@@ -1017,6 +1016,7 @@ void leave_creature_as_passenger(struct PlayerInfo *player, struct Thing *thing)
     player->cameras[CamIV_Isometric].mappos.y.val = subtile_coord_center(game.map_subtiles_y/2);
     player->cameras[CamIV_FrontView].mappos.x.val = subtile_coord_center(game.map_subtiles_x/2);
     player->cameras[CamIV_FrontView].mappos.y.val = subtile_coord_center(game.map_subtiles_y/2);
+    sync_local_camera(player);
     clear_selected_thing(player);
     return;
   }
@@ -1030,6 +1030,7 @@ void leave_creature_as_passenger(struct PlayerInfo *player, struct Thing *thing)
   player->cameras[CamIV_Isometric].mappos.y.val = thing->mappos.y.val + distance_with_angle_to_coord_y(k,i);
   player->cameras[CamIV_FrontView].mappos.x.val = thing->mappos.x.val + distance_with_angle_to_coord_x(k,i);
   player->cameras[CamIV_FrontView].mappos.y.val = thing->mappos.y.val + distance_with_angle_to_coord_y(k,i);
+  sync_local_camera(player);
   clear_selected_thing(player);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ extern "C" {`
`41`	`41`	`/******************************************************************************/`
`42`	`42`	`struct Camera local_cameras[4];`
`43`	`43`	`struct Camera previous_local_cameras[4];`
`44`		`-struct Camera desired_local_cameras[4];`
	`44`	`+struct Camera destination_local_cameras[4];`
`45`	`45`	`float interpolated_cam_mappos_x[4];`
`46`	`46`	`float interpolated_cam_mappos_y[4];`
`47`	`47`	`float interpolated_cam_mappos_z[4];`
`@@ -55,7 +55,7 @@ TbBool local_camera_ready;`
`55`	`55`	`void sync_camera_state(int cam_idx, struct Camera *cam)`
`56`	`56`	`{`
`57`	`57`	`local_cameras[cam_idx] = *cam;`
`58`		`- desired_local_cameras[cam_idx] = *cam;`
	`58`	`+ destination_local_cameras[cam_idx] = *cam;`
`59`	`59`	`previous_local_cameras[cam_idx] = *cam;`
`60`	`60`	`interpolated_cam_mappos_x[cam_idx] = cam->mappos.x.val;`
`61`	`61`	`interpolated_cam_mappos_y[cam_idx] = cam->mappos.y.val;`
`@@ -100,21 +100,21 @@ void process_local_minimap_click(struct Packet* packet) {`
`100`	`100`	`long pos_y = subtile_coord_center(packet->actn_par2);`
`101`	`101`	`for (int i = CamIV_Isometric; i <= CamIV_FrontView; i++) {`
`102`	`102`	`if (i != CamIV_FirstPerson) {`
`103`		`- desired_local_cameras[i].mappos.x.val = pos_x;`
`104`		`- desired_local_cameras[i].mappos.y.val = pos_y;`
	`103`	`+ destination_local_cameras[i].mappos.x.val = pos_x;`
	`104`	`+ destination_local_cameras[i].mappos.y.val = pos_y;`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`void update_local_first_person_camera(struct Thing *ctrltng)`
`111`	`111`	`{`
`112`		`- struct Camera* cam = &desired_local_cameras[CamIV_FirstPerson];`
	`112`	`+ struct Camera* cam = &destination_local_cameras[CamIV_FirstPerson];`
`113`	`113`	`int eye_height = get_creature_eye_height(ctrltng);`
`114`	`114`	`update_first_person_position(cam, ctrltng, eye_height);`
`115`	`115`
`116`		`- long current_horizontal = desired_local_cameras[CamIV_FirstPerson].rotation_angle_x;`
`117`		`- long current_vertical = desired_local_cameras[CamIV_FirstPerson].rotation_angle_y;`
	`116`	`+ long current_horizontal = destination_local_cameras[CamIV_FirstPerson].rotation_angle_x;`
	`117`	`+ long current_vertical = destination_local_cameras[CamIV_FirstPerson].rotation_angle_y;`
`118`	`118`	`struct Packet* latest_packet = get_local_input_lag_packet_for_turn(CURRENT_TURN_FOR_CAMERA);`
`119`	`119`	`if (latest_packet != NULL) {`
`120`	`120`	`long new_horizontal, new_vertical, new_roll;`
`@@ -135,7 +135,7 @@ void update_local_cameras(void)`
`135`	`135`	`return;`
`136`	`136`	`}`
`137`	`137`	`for (int i = 0; i < 4; i++) {`
`138`		`- previous_local_cameras[i] = desired_local_cameras[i];`
	`138`	`+ previous_local_cameras[i] = destination_local_cameras[i];`
`139`	`139`	`}`
`140`	`140`	`struct PlayerInfo* my_player = get_my_player();`
`141`	`141`	`struct Thing *ctrltng = thing_get(my_player->controlled_thing_idx);`
`@@ -152,8 +152,8 @@ void update_local_cameras(void)`
`152`	`152`	`if (cam_idx == CamIV_FirstPerson \|\| cam_idx == CamIV_Parchment) {`
`153`	`153`	`continue;`
`154`	`154`	`}`
`155`		`- process_camera_controls(&desired_local_cameras[cam_idx], local_packet, my_player);`
`156`		`- view_process_camera_inertia(&desired_local_cameras[cam_idx]);`
	`155`	`+ process_camera_controls(&destination_local_cameras[cam_idx], local_packet, my_player);`
	`156`	`+ view_process_camera_inertia(&destination_local_cameras[cam_idx]);`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`}`
`@@ -165,7 +165,7 @@ void interpolate_local_cameras(void)`
`165`	`165`	`}`
`166`	`166`	`for (int i = 0; i < 4; i++) {`
`167`	`167`	`struct Camera* prev = &previous_local_cameras[i];`
`168`		`- struct Camera* desired = &desired_local_cameras[i];`
	`168`	`+ struct Camera* desired = &destination_local_cameras[i];`
`169`	`169`	`struct Camera* out = &local_cameras[i];`
`170`	`170`	`interpolated_cam_mappos_x[i] = interpolate(interpolated_cam_mappos_x[i], prev->mappos.x.val, desired->mappos.x.val);`
`171`	`171`	`interpolated_cam_mappos_y[i] = interpolate(interpolated_cam_mappos_y[i], prev->mappos.y.val, desired->mappos.y.val);`
`@@ -184,40 +184,30 @@ void interpolate_local_cameras(void)`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
`187`		`-void sync_local_camera(struct Camera *cam)`
	`187`	`+void sync_local_camera(struct PlayerInfo *player)`
`188`	`188`	`{`
`189`		`- if (!local_camera_ready) {`
	`189`	`+ if (!is_my_player(player) \|\| !local_camera_ready) {`
`190`	`190`	`return;`
`191`	`191`	`}`
`192`		`- struct PlayerInfo *player = get_my_player();`
`193`		`- if (cam == &player->cameras[CamIV_FirstPerson]) {`
`194`		`- sync_first_person_camera(cam, player);`
	`192`	`+ if (player->acamera == &player->cameras[CamIV_FirstPerson]) {`
	`193`	`+ sync_first_person_camera(player->acamera, player);`
`195`	`194`	`return;`
`196`	`195`	`}`
`197`	`196`	`for (int cam_idx = CamIV_Isometric; cam_idx <= CamIV_FrontView; cam_idx++) {`
`198`		`- if (cam == &player->cameras[cam_idx]) {`
`199`		`- sync_camera_state(cam_idx, cam);`
`200`		`- if (cam_idx != CamIV_Parchment) {`
`201`		`- if (player->view_mode == PVM_ParchmentView) {`
`202`		`- reset_all_minimap_interpolation = true;`
`203`		`- }`
`204`		`- }`
`205`		`- return;`
`206`		`- }`
	`197`	`+ sync_camera_state(cam_idx, &player->cameras[cam_idx]);`
	`198`	`+ }`
	`199`	`+ if (player->view_mode == PVM_ParchmentView) {`
	`200`	`+ reset_all_minimap_interpolation = true;`
`207`	`201`	`}`
`208`	`202`	`}`
`209`	`203`
`210`		`-void set_local_desired_camera(struct Camera *cam)`
	`204`	`+void set_local_camera_destination(struct PlayerInfo *player)`
`211`	`205`	`{`
`212`		`- if (!local_camera_ready) {`
	`206`	`+ if (!is_my_player(player) \|\| !local_camera_ready) {`
`213`	`207`	`return;`
`214`	`208`	`}`
`215`		`- struct PlayerInfo *player = get_my_player();`
`216`	`209`	`for (int cam_idx = CamIV_Isometric; cam_idx <= CamIV_FrontView; cam_idx++) {`
`217`		`- if (cam == &player->cameras[cam_idx]) {`
`218`		`- desired_local_cameras[cam_idx] = *cam;`
`219`		`- break;`
`220`		`- }`
	`210`	`+ destination_local_cameras[cam_idx] = player->cameras[cam_idx];`
`221`	`211`	`}`
`222`	`212`	`}`
`223`	`213`
`@@ -227,9 +217,6 @@ struct Camera* get_local_camera(struct Camera* cam)`
`227`	`217`	`return cam;`
`228`	`218`	`}`
`229`	`219`	`struct PlayerInfo *player = get_my_player();`
`230`		`- if ((player->allocflags & PlaF_CompCtrl) != 0) {`
`231`		`- return cam;`
`232`		`- }`
`233`	`220`	`for (int cam_idx = CamIV_Isometric; cam_idx <= CamIV_FrontView; cam_idx++) {`
`234`	`221`	`if (cam == &player->cameras[cam_idx]) {`
`235`	`222`	`return &local_cameras[cam_idx];`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ long pinstfm_control_creature(struct PlayerInfo player, int32_t n)`
`410`	`410`	`{`
`411`	`411`	`cam->rotation_angle_x -= DEGREES_360;`
`412`	`412`	`}`
`413`		`- set_local_desired_camera(cam);`
	`413`	`+ set_local_camera_destination(player);`
`414`	`414`	`}`
`415`	`415`	`return 0;`
`416`	`416`	`}`
`@@ -512,7 +512,7 @@ long pinstfm_leave_creature(struct PlayerInfo player, int32_t n)`
`512`	`512`	`if (get_camera_zoom(player->acamera) < player->dungeon_camera_zoom) {`
`513`	`513`	`set_camera_zoom(player->acamera, player->dungeon_camera_zoom);`
`514`	`514`	`}`
`515`		`- set_local_desired_camera(player->acamera);`
	`515`	`+ set_local_camera_destination(player);`
`516`	`516`	`}`
`517`	`517`	`return 0;`
`518`	`518`	`}`
`@@ -551,8 +551,6 @@ long pinstfe_leave_creature(struct PlayerInfo player, int32_t n)`
`551`	`551`	`set_camera_zoom(player->acamera, player->dungeon_camera_zoom);`
`552`	`552`	`if (is_my_player(player)) {`
`553`	`553`	`PaletteSetPlayerPalette(player, engine_palette);`
`554`		`- sync_local_camera(&player->cameras[CamIV_Isometric]);`
`555`		`- sync_local_camera(&player->cameras[CamIV_FrontView]);`
`556`	`554`	`}`
`557`	`555`	`player->allocflags &= ~PlaF_KeyboardInputDisabled;`
`558`	`556`	`player->allocflags &= ~PlaF_MouseInputDisabled;`
`@@ -693,8 +691,7 @@ long pinstfm_zoom_out_of_heart(struct PlayerInfo player, int32_t n)`
`693`	`691`	`dstcam = &player->cameras[CamIV_FrontView];`
`694`	`692`	`dstcam->mappos.x.val = thing->mappos.x.val + deltax;`
`695`	`693`	`dstcam->mappos.y.val = thing->mappos.y.val + deltay;`
`696`		`- set_local_desired_camera(&player->cameras[CamIV_Isometric]);`
`697`		`- set_local_desired_camera(&player->cameras[CamIV_FrontView]);`
	`694`	`+ set_local_camera_destination(player);`
`698`	`695`	`}`
`699`	`696`	`if (is_my_player_number(player->id_number) && (player->instance_remain_turns >= 8))`
`700`	`697`	`LbPaletteFade(engine_palette, 8, Lb_PALETTE_FADE_OPEN);`
`@@ -711,7 +708,7 @@ long pinstfe_zoom_out_of_heart(struct PlayerInfo player, int32_t n)`
`711`	`708`	`{`
`712`	`709`	`cam->zoom = player->isometric_view_zoom_level;`
`713`	`710`	`cam->rotation_angle_x = DEGREES_45;`
`714`		`- sync_local_camera(cam);`
	`711`	`+ set_local_camera_destination(player);`
`715`	`712`	`}`
`716`	`713`	`light_turn_light_on(player->cursor_light_idx);`
`717`	`714`	`player->allocflags &= ~PlaF_KeyboardInputDisabled;`
`@@ -884,7 +881,7 @@ long pinstfm_zoom_to_position(struct PlayerInfo player, int32_t n)`
`884`	`881`	`player->instance_remain_turns = 0;`
`885`	`882`	`cam->mappos.x.val = x;`
`886`	`883`	`cam->mappos.y.val = y;`
`887`		`- set_local_desired_camera(cam);`
	`884`	`+ set_local_camera_destination(player);`
`888`	`885`	`return 0;`
`889`	`886`	`}`
`890`	`887`
`@@ -969,6 +966,7 @@ void leave_creature_as_controller(struct PlayerInfo player, struct Thing thing`
`969`	`966`	`player->cameras[CamIV_Isometric].mappos.y.val = subtile_coord_center(game.map_subtiles_y/2);`
`970`	`967`	`player->cameras[CamIV_FrontView].mappos.x.val = subtile_coord_center(game.map_subtiles_x/2);`
`971`	`968`	`player->cameras[CamIV_FrontView].mappos.y.val = subtile_coord_center(game.map_subtiles_y/2);`
	`969`	`+ sync_local_camera(player);`
`972`	`970`	`clear_selected_thing(player);`
`973`	`971`	`return;`
`974`	`972`	`}`
`@@ -986,6 +984,7 @@ void leave_creature_as_controller(struct PlayerInfo player, struct Thing thing`
`986`	`984`	`player->cameras[CamIV_Isometric].mappos.y.val = thing->mappos.y.val + distance_with_angle_to_coord_y(k,i);`
`987`	`985`	`player->cameras[CamIV_FrontView].mappos.x.val = thing->mappos.x.val + distance_with_angle_to_coord_x(k,i);`
`988`	`986`	`player->cameras[CamIV_FrontView].mappos.y.val = thing->mappos.y.val + distance_with_angle_to_coord_y(k,i);`
	`987`	`+ sync_local_camera(player);`
`989`	`988`	`if (thing->class_id == TCls_Creature)`
`990`	`989`	`{`
`991`	`990`	`set_start_state(thing);`
`@@ -1017,6 +1016,7 @@ void leave_creature_as_passenger(struct PlayerInfo player, struct Thing thing)`
`1017`	`1016`	`player->cameras[CamIV_Isometric].mappos.y.val = subtile_coord_center(game.map_subtiles_y/2);`
`1018`	`1017`	`player->cameras[CamIV_FrontView].mappos.x.val = subtile_coord_center(game.map_subtiles_x/2);`
`1019`	`1018`	`player->cameras[CamIV_FrontView].mappos.y.val = subtile_coord_center(game.map_subtiles_y/2);`
	`1019`	`+ sync_local_camera(player);`
`1020`	`1020`	`clear_selected_thing(player);`
`1021`	`1021`	`return;`
`1022`	`1022`	`}`
`@@ -1030,6 +1030,7 @@ void leave_creature_as_passenger(struct PlayerInfo player, struct Thing thing)`
`1030`	`1030`	`player->cameras[CamIV_Isometric].mappos.y.val = thing->mappos.y.val + distance_with_angle_to_coord_y(k,i);`
`1031`	`1031`	`player->cameras[CamIV_FrontView].mappos.x.val = thing->mappos.x.val + distance_with_angle_to_coord_x(k,i);`
`1032`	`1032`	`player->cameras[CamIV_FrontView].mappos.y.val = thing->mappos.y.val + distance_with_angle_to_coord_y(k,i);`
	`1033`	`+ sync_local_camera(player);`
`1033`	`1034`	`clear_selected_thing(player);`
`1034`	`1035`	`}`
`1035`	`1036`