mirror of
https://github.com/LostArtefacts/TRX.git
synced 2025-05-09 20:17:50 +03:00
misc: fix assigning position to auxiliary items
Regression since 51fc83f9f3
This commit is contained in:
parent
120b9cac3e
commit
4a431aa200
4 changed files with 4 additions and 0 deletions
|
@ -286,6 +286,7 @@ static void Carrier_AnimateDrop(CARRIED_ITEM *item)
|
||||||
|
|
||||||
// Track animating status in the carrier for saving/loading.
|
// Track animating status in the carrier for saving/loading.
|
||||||
item->pos = pickup->pos;
|
item->pos = pickup->pos;
|
||||||
|
item->rot = pickup->rot;
|
||||||
item->room_number = pickup->room_number;
|
item->room_number = pickup->room_number;
|
||||||
item->fall_speed = pickup->fall_speed;
|
item->fall_speed = pickup->fall_speed;
|
||||||
}
|
}
|
||||||
|
|
|
@ -313,6 +313,7 @@ int16_t Item_Spawn(ITEM_INFO *item, int16_t object_num)
|
||||||
spawn->object_number = object_num;
|
spawn->object_number = object_num;
|
||||||
spawn->room_number = item->room_number;
|
spawn->room_number = item->room_number;
|
||||||
spawn->pos = item->pos;
|
spawn->pos = item->pos;
|
||||||
|
spawn->rot = item->rot;
|
||||||
Item_Initialise(spawn_num);
|
Item_Initialise(spawn_num);
|
||||||
spawn->status = IS_NOT_ACTIVE;
|
spawn->status = IS_NOT_ACTIVE;
|
||||||
spawn->shade = 4096;
|
spawn->shade = 4096;
|
||||||
|
|
|
@ -143,6 +143,7 @@ void DartEmitter_Control(int16_t item_num)
|
||||||
if (fx_num != NO_ITEM) {
|
if (fx_num != NO_ITEM) {
|
||||||
FX_INFO *fx = &g_Effects[fx_num];
|
FX_INFO *fx = &g_Effects[fx_num];
|
||||||
fx->pos = dart->pos;
|
fx->pos = dart->pos;
|
||||||
|
fx->rot = dart->rot;
|
||||||
fx->speed = 0;
|
fx->speed = 0;
|
||||||
fx->frame_number = 0;
|
fx->frame_number = 0;
|
||||||
fx->counter = 0;
|
fx->counter = 0;
|
||||||
|
|
|
@ -42,6 +42,7 @@ void ThorsHandle_Initialise(int16_t item_num)
|
||||||
head_item->object_number = O_THORS_HEAD;
|
head_item->object_number = O_THORS_HEAD;
|
||||||
head_item->room_number = hand_item->room_number;
|
head_item->room_number = hand_item->room_number;
|
||||||
head_item->pos = hand_item->pos;
|
head_item->pos = hand_item->pos;
|
||||||
|
head_item->rot = hand_item->rot;
|
||||||
head_item->shade = hand_item->shade;
|
head_item->shade = hand_item->shade;
|
||||||
Item_Initialise(head_item_num);
|
Item_Initialise(head_item_num);
|
||||||
hand_item->data = head_item;
|
hand_item->data = head_item;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue