Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

object/names: move name management to libtrx #274

Merged
merged 3 commits into from
Sep 29, 2024
Merged

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented Sep 27, 2024

LostArtefacts/libtrx#39

Affects all item strings in the inventory – keys, passport etc., and all console commands targeting (/tp dog etc.).

@rr- rr- added the Internal The invisible stuff label Sep 27, 2024
@rr- rr- added this to the 0.4 milestone Sep 27, 2024
@rr- rr- requested review from a team as code owners September 27, 2024 22:11
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team September 27, 2024 22:11
@rr- rr- self-assigned this Sep 27, 2024
@aredfan
Copy link

aredfan commented Sep 28, 2024

I found one small issue - Flare is now called Flare Option in the inventory.

{ O_COMPASS_ITEM, GF_S_GAME_INV_ITEM_STATISTICS },
{ O_PISTOL_ITEM, GF_S_GAME_INV_ITEM_PISTOLS },
{ O_PISTOL_OPTION, GF_S_GAME_INV_ITEM_PISTOLS },
{ O_FLARE_ITEM, GF_S_GAME_INV_ITEM_FLARE },
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you forgot an entry for: { O_FLARE_OPTION, ...}, so it falls back to OBJ_NAME_DEFINE(O_FLARES_OPTION, "Flare Option") in libtrx include/libtrx/game/objects/names_tr2.def

@rr-
Copy link
Collaborator Author

rr- commented Sep 29, 2024

@aredfan @walkawayy fixed

@rr- rr- merged commit 397a7bc into develop Sep 29, 2024
3 checks passed
@rr- rr- deleted the libtrx-object-names branch September 29, 2024 18:44
@rr- rr- added the TR2 label Oct 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Internal The invisible stuff TR2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants