Skip to content

Commit

Permalink
room: make trigger command parameter generic
Browse files Browse the repository at this point in the history 
Rather than storing redundant camera data in every command, we now
store a void *, which either has the regular int16_t parameter, or the
full additional camera data.
  • Loading branch information
@lahm86
lahm86 committed Aug 10, 2024
1 parent 2d81fbf commit 03a78a7
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 38 deletions.
8 changes: 5 additions & 3 deletions src/game/camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,8 +788,10 @@ void Camera_RefreshFromTrigger(const TRIGGER *const trigger)
for (int32_t i = 0; i < trigger->command_count; i++) {
const TRIGGER_CMD *const cmd = &trigger->commands[i];
if (cmd->type == TO_CAMERA) {
if (cmd->parameter == g_Camera.last) {
g_Camera.number = cmd->parameter;
const TRIGGER_CAMERA_DATA *const cam_data =
(TRIGGER_CAMERA_DATA *)cmd->parameter;
if (cam_data->camera_num == g_Camera.last) {
g_Camera.number = cam_data->camera_num;

if (g_Camera.timer < 0 || g_Camera.type == CAM_LOOK
|| g_Camera.type == CAM_COMBAT) {
Expand All @@ -804,7 +806,7 @@ void Camera_RefreshFromTrigger(const TRIGGER *const trigger)
}
} else if (cmd->type == TO_TARGET) {
if (g_Camera.type != CAM_LOOK && g_Camera.type != CAM_COMBAT) {
g_Camera.item = &g_Items[cmd->parameter];
g_Camera.item = &g_Items[(int16_t)(intptr_t)cmd->parameter];
}
}
}
Expand Down
19 changes: 16 additions & 3 deletions src/game/inject.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1178,9 +1178,22 @@ static void Inject_TriggerParameterChange(
// new parameter.
for (int32_t i = 0; i < sector->trigger->command_count; i++) {
TRIGGER_CMD *const cmd = &sector->trigger->commands[i];
if (cmd->type == cmd_type && cmd->parameter == old_param) {
cmd->parameter = new_param;
break;
if (cmd->type != cmd_type) {
continue;
}

if (cmd->type == TO_CAMERA) {
TRIGGER_CAMERA_DATA *const cam_data =
(TRIGGER_CAMERA_DATA *)cmd->parameter;
if (cam_data->camera_num == old_param) {
cam_data->camera_num = new_param;
break;
}
} else {
if ((int16_t)(intptr_t)cmd->parameter == old_param) {
cmd->parameter = (void *)(intptr_t)new_param;
break;
}
}
}
}
Expand Down
63 changes: 39 additions & 24 deletions src/game/room.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,8 @@ int16_t Room_GetCeiling(
continue;
}

const ITEM_INFO *const item = &g_Items[cmd->parameter];
const ITEM_INFO *const item =
&g_Items[(int16_t)(intptr_t)cmd->parameter];
const OBJECT_INFO *const object = &g_Objects[item->object_number];
if (object->ceiling_height_func) {
height = object->ceiling_height_func(item, x, y, z, height);
Expand Down Expand Up @@ -375,7 +376,8 @@ int16_t Room_GetHeight(
continue;
}

const ITEM_INFO *const item = &g_Items[cmd->parameter];
const ITEM_INFO *const item =
&g_Items[(int16_t)(intptr_t)cmd->parameter];
const OBJECT_INFO *const object = &g_Objects[item->object_number];
if (object->floor_height_func) {
height = object->floor_height_func(item, x, y, z, height);
Expand Down Expand Up @@ -707,13 +709,19 @@ void Room_PopulateSectorData(
int16_t command = *command_data++;
TRIGGER_CMD *const cmd = &trigger->commands[i];
cmd->type = TRIG_BITS(command);
cmd->parameter = command & VALUE_BITS;

if (cmd->type == TO_CAMERA) {
TRIGGER_CAMERA_DATA *const cam_data = GameBuf_Alloc(
sizeof(TRIGGER_CAMERA_DATA), GBUF_FLOOR_DATA);
cmd->parameter = (void *)cam_data;
cam_data->camera_num = command & VALUE_BITS;

command = *command_data++;
cmd->camera.timer = command & 0xFF;
cmd->camera.glide = (command & IF_CODE_BITS) >> 6;
cmd->camera.one_shot = command & IF_ONESHOT;
cam_data->timer = command & 0xFF;
cam_data->glide = (command & IF_CODE_BITS) >> 6;
cam_data->one_shot = command & IF_ONESHOT;
} else {
cmd->parameter = (void *)(intptr_t)(command & VALUE_BITS);
}
}

Expand Down Expand Up @@ -807,7 +815,7 @@ void Room_TestTriggers(const ITEM_INFO *const item)

switch (cmd->type) {
case TO_OBJECT: {
const int16_t item_num = cmd->parameter;
const int16_t item_num = (int16_t)(intptr_t)cmd->parameter;
ITEM_INFO *const item = &g_Items[item_num];
if (item->flags & IF_ONESHOT) {
break;
Expand Down Expand Up @@ -860,12 +868,13 @@ void Room_TestTriggers(const ITEM_INFO *const item)
}

case TO_CAMERA: {
const int16_t camera_num = cmd->parameter;
if (g_Camera.fixed[camera_num].flags & IF_ONESHOT) {
const TRIGGER_CAMERA_DATA *const cam_data =
(TRIGGER_CAMERA_DATA *)cmd->parameter;
if (g_Camera.fixed[cam_data->camera_num].flags & IF_ONESHOT) {
break;
}

g_Camera.number = camera_num;
g_Camera.number = cam_data->camera_num;

if (g_Camera.type == CAM_LOOK || g_Camera.type == CAM_COMBAT) {
break;
Expand All @@ -884,26 +893,27 @@ void Room_TestTriggers(const ITEM_INFO *const item)
break;
}

g_Camera.timer = cmd->camera.timer;
g_Camera.timer = cam_data->timer;
if (g_Camera.timer != 1) {
g_Camera.timer *= LOGIC_FPS;
}

if (cmd->camera.one_shot) {
if (cam_data->one_shot) {
g_Camera.fixed[g_Camera.number].flags |= IF_ONESHOT;
}

g_Camera.speed = cmd->camera.glide + 1;
g_Camera.speed = cam_data->glide + 1;
g_Camera.type = is_heavy ? CAM_HEAVY : CAM_FIXED;
break;
}

case TO_TARGET:
camera_item = &g_Items[cmd->parameter];
camera_item = &g_Items[(int16_t)(intptr_t)cmd->parameter];
break;

case TO_SINK: {
OBJECT_VECTOR *obvector = &g_Camera.fixed[cmd->parameter];
const OBJECT_VECTOR *const obvector =
&g_Camera.fixed[(int16_t)(intptr_t)cmd->parameter];

if (g_Lara.LOT.required_box != obvector->flags) {
g_Lara.LOT.target.x = obvector->x;
Expand All @@ -917,7 +927,7 @@ void Room_TestTriggers(const ITEM_INFO *const item)
}

case TO_FLIPMAP: {
const int16_t flip_slot = cmd->parameter;
const int16_t flip_slot = (int16_t)(intptr_t)cmd->parameter;
if (g_FlipMapTable[flip_slot] & IF_ONESHOT) {
break;
}
Expand All @@ -942,34 +952,38 @@ void Room_TestTriggers(const ITEM_INFO *const item)
break;
}

case TO_FLIPON:
if ((g_FlipMapTable[cmd->parameter] & IF_CODE_BITS) == IF_CODE_BITS
case TO_FLIPON: {
const int16_t flip_slot = (int16_t)(intptr_t)cmd->parameter;
if ((g_FlipMapTable[flip_slot] & IF_CODE_BITS) == IF_CODE_BITS
&& !g_FlipStatus) {
flip_map = true;
}
break;
}

case TO_FLIPOFF:
if ((g_FlipMapTable[cmd->parameter] & IF_CODE_BITS) == IF_CODE_BITS
case TO_FLIPOFF: {
const int16_t flip_slot = (int16_t)(intptr_t)cmd->parameter;
if ((g_FlipMapTable[flip_slot] & IF_CODE_BITS) == IF_CODE_BITS
&& g_FlipStatus) {
flip_map = true;
}
break;
}

case TO_FLIPEFFECT:
new_effect = cmd->parameter;
new_effect = (int16_t)(intptr_t)cmd->parameter;
break;

case TO_FINISH:
g_LevelComplete = true;
break;

case TO_CD:
Room_TriggerMusicTrack(cmd->parameter, trigger);
Room_TriggerMusicTrack((int16_t)(intptr_t)cmd->parameter, trigger);
break;

case TO_SECRET: {
const int16_t secret_num = 1 << cmd->parameter;
const int16_t secret_num = 1 << (int16_t)(intptr_t)cmd->parameter;
if (g_GameInfo.current[g_CurrentLevel].stats.secret_flags
& secret_num) {
break;
Expand Down Expand Up @@ -1013,7 +1027,8 @@ bool Room_IsOnWalkable(
continue;
}

const ITEM_INFO *const item = &g_Items[cmd->parameter];
const int16_t item_num = (int16_t)(intptr_t)cmd->parameter;
const ITEM_INFO *const item = &g_Items[item_num];
const OBJECT_INFO *const object = &g_Objects[item->object_number];
if (object->floor_height_func) {
height = object->floor_height_func(item, x, y, z, height);
Expand Down
4 changes: 2 additions & 2 deletions src/game/stats.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ static void Stats_CheckTriggers(
const TRIGGER_CMD *const cmd = &sector->trigger->commands[i];

if (cmd->type == TO_SECRET) {
const int16_t secret_num = 1 << cmd->parameter;
const int16_t secret_num = 1 << (int16_t)(intptr_t)cmd->parameter;
if (!(m_SecretRoom & secret_num)) {
m_SecretRoom |= secret_num;
m_LevelSecrets++;
}
} else if (cmd->type == TO_OBJECT) {
const int16_t item_num = cmd->parameter;
const int16_t item_num = (int16_t)(intptr_t)cmd->parameter;
if (m_KillableItems[item_num]) {
continue;
}
Expand Down
14 changes: 8 additions & 6 deletions src/global/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1162,14 +1162,16 @@ typedef struct DOOR_INFOS {

typedef struct TRIGGER_CMD {
TRIGGER_OBJECT type;
int16_t parameter;
struct {
int8_t timer;
int8_t glide;
bool one_shot;
} camera;
void *parameter;
} TRIGGER_CMD;

typedef struct TRIGGER_CAMERA_DATA {
int16_t camera_num;
int8_t timer;
int8_t glide;
bool one_shot;
} TRIGGER_CAMERA_DATA;

typedef struct TRIGGER {
TRIGGER_TYPE type;
int8_t timer;
Expand Down

0 comments on commit 03a78a7

Please sign in to comment.