Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

object/names: move name management to libtrx #1545

Closed
wants to merge 4 commits into from
Closed

object/names: move name management to libtrx #1545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc12f81
object/names: move name management to libtrx
rr- Sep 27, 2024
50e97e3
libtrx: use new enum maps
rr- Sep 27, 2024
9af5ec5
lara/cheat: fix killing Lara herself
rr- Sep 27, 2024
626fdac
console: fix first input sometimes being lost
rr- Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
- fixed crash in the `/set` console command (regression from 4.4)
- fixed toggling fullscreen not always saving (regression from 4.4)
- fixed main menu music volume when exiting while underwater with certain music settings (#1540, regression from 4.4)
- fixed `/kill` command unable to target a special object
- fixed really fast typing in console sometimes losing the first input (regression from 4.4)
- improved object name matching in console commands to work like TR2X

## [4.4](https://github.com/LostArtefacts/TR1X/compare/4.3-102-g458cd96...4.4) - 2024-09-20
- added `/exit` command (#1462)
Expand Down
3 changes: 1 addition & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ sources = [
'src/game/objects/general/switch.c',
'src/game/objects/general/trapdoor.c',
'src/game/objects/general/waterfall.c',
'src/game/objects/names.c',
'src/game/objects/setup.c',
'src/game/objects/traps/damocles_sword.c',
'src/game/objects/traps/dart.c',
Expand Down Expand Up @@ -279,7 +278,7 @@ sources = [
'src/game/stats.c',
'src/game/text.c',
'src/game/viewport.c',
'src/global/enum_str.c',
'src/global/enum_map.c',
'src/global/vars.c',
'src/math/math.c',
'src/math/math_misc.c',
Expand Down
8 changes: 4 additions & 4 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
#include "game/requester.h"
#include "game/sound.h"
#include "global/const.h"
#include "global/enum_str.h"
#include "global/types.h"
#include "global/vars.h"

#include <libtrx/config/file.h>
#include <libtrx/enum_map.h>
#include <libtrx/filesystem.h>
#include <libtrx/game/console/common.h>
#include <libtrx/game/ui/events.h>
Expand Down Expand Up @@ -156,13 +156,13 @@ static void M_LoadLegacyOptions(JSON_OBJECT *const parent_obj)
{
g_Config.healthbar_show_mode = ConfigFile_ReadEnum(
parent_obj, "healthbar_showing_mode", g_Config.healthbar_show_mode,
ENUM_STRING_MAP(BAR_SHOW_MODE));
ENUM_MAP_NAME(BAR_SHOW_MODE));
g_Config.airbar_show_mode = ConfigFile_ReadEnum(
parent_obj, "airbar_showing_mode", g_Config.airbar_show_mode,
ENUM_STRING_MAP(BAR_SHOW_MODE));
ENUM_MAP_NAME(BAR_SHOW_MODE));
g_Config.enemy_healthbar_show_mode = ConfigFile_ReadEnum(
parent_obj, "enemy_healthbar_showing_mode",
g_Config.enemy_healthbar_show_mode, ENUM_STRING_MAP(BAR_SHOW_MODE));
g_Config.enemy_healthbar_show_mode, ENUM_MAP_NAME(BAR_SHOW_MODE));
}
}

Expand Down
1 change: 0 additions & 1 deletion src/config_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <libtrx/config/map.h>
// import order guard

#include "global/enum_str.h"
#include "global/types.h"

const CONFIG_OPTION g_ConfigOptionMap[] = {
Expand Down
Loading