4983 Commits

Author SHA1 Message Date
Artem Argus Gusakov
820d57db30 general diagnostic finishAction crash fix 2025-06-04 14:19:24 +03:00
Alberth
c759341994 Reformat 2025-06-03 22:48:24 +02:00
Alberth289346
e4c6bf0cd8 Provide a frame number for the vomit sound of animation 4792
Co-authored-by: lewri <lewri@users.noreply.github.com>
2025-06-03 22:37:23 +02:00
Toby
ef2694123a Fix map editor load and save (#2893)
* Fix mapeditor loading

* Improve map editor pathfinding check
2025-06-03 23:12:22 +03:00
Alberth
58b133c031 Fix vomit sound indices 2025-06-03 06:58:28 +02:00
Stephen E. Baker
8315897938 Update changelog.txt
WITH_FONT is an option not a flag - pedantic
2025-06-02 18:39:19 -04:00
lewri
0c1fed898d Changelog.txt update 2025-06-02 21:47:30 +01:00
Alberth289346
613f8b3701 Merge pull request #2887 from ARGAMX/machine-menu-crash-on-get-marker
Fix machine menu crash on get marker
2025-06-02 14:35:35 +02:00
Artem Argus Gusakov
c03543d0ab machine menu crash on get marker. review improvements. 2025-06-02 12:09:38 +03:00
Artem Argus Gusakov
e26b34e8a9 machine menu crash on get marker 2025-06-02 12:09:38 +03:00
Stephen E. Baker
5bfb9e241d Merge pull request #2890 from Alberth289346/drop-warnings-nonexistent-callbacks
Drop log warnings about trying to remove nonexistent room callbacks.
2025-06-01 22:40:19 -04:00
Stephen E. Baker
35a71d9412 Merge pull request #2888 from TheCycoONE/license_069
Add new contributors to LICENSE.txt
2025-06-01 19:30:52 -04:00
Alberth
25ec2dcc83 Drop log warnings about trying to remove nonexistent room callbacks. 2025-06-01 21:40:35 +02:00
Stephen E. Baker
91c4ee455c Merge pull request #2886 from TheCycoONE/font_ub_fix
Fix font cache and lua bind casting
2025-06-01 14:34:28 -04:00
Stephen E. Baker
df042bc173 Add new contributors to LICENSE.txt 2025-06-01 14:30:21 -04:00
Stephen E. Baker
8a2276d0a3 Fix font cache and lua bind casting
Fixes #2885

Fixing the cache eliminated the problem. The cache being
broken was a regression in my code for allowing font colors.

For correctness and because I wrote the code already this patch also
fixes the chain of pointer casting when the base font class is desired,
the same way animation_base was solved.
2025-05-31 23:05:21 -04:00
Stephen E. Baker
7b3107a50d Fix place staff regression (#2883)
Fixes #2881
2025-05-31 12:01:29 +03:00
Stephen E. Baker
c5daa239a3 Merge pull request #2880 from Alberth289346/refactor-th-map-cpp
Refactor th map cpp
2025-05-30 21:38:21 -04:00
Stephen E. Baker
c42dd1d8d2 Merge pull request #2882 from TheCycoONE/fix_win_workflow
Fix windows workflow
2025-05-30 21:18:56 -04:00
Stephen E. Baker
3e3aa87939 Fix windows workflow 2025-05-30 20:07:51 -04:00
Alberth
9b60edb0db Reformat 2025-05-30 10:06:58 +02:00
Alberth
f12e313bb3 '_num_tile_layers' -> 'num_tile_layers' 2025-05-30 10:01:30 +02:00
Alberth
40d0ebd4b0 Manual 'part' -> 'layer' changes 2025-05-30 10:00:09 +02:00
Alberth
328af5bab2 tile_part[s] -> tile_layer[s] 2025-05-30 09:22:27 +02:00
Stephen E. Baker
712f2a9d68 Merge pull request #2878 from tobylane/actionswincache
Fix Windows Actions caching
2025-05-29 18:45:35 -04:00
Alberth
bb93279b4b Add sound class with one or two sounds. 2025-05-29 21:37:23 +02:00
Alberth
a18e9f61ec Reformat 2025-05-29 17:55:38 +02:00
Alberth
e00c8f86e9 Replace some C-style casts to static_cast<> 2025-05-29 17:41:48 +02:00
Alberth
687a43c1d1 Fix remaining cases + some local variable renaming. 2025-05-29 17:32:04 +02:00
Alberth
b43065d1a7 Add names for the tile parts, apply for the simple cases. 2025-05-29 16:29:51 +02:00
Alberth
366c03a1b3 'iBlocks[]' -> 'tileparts[]' 2025-05-29 15:56:31 +02:00
Alberth
3e03cc1bb5 Rename 'blocks' -> 'wall_blocks'. 2025-05-29 15:42:42 +02:00
Toby Lane
96bb60c505 Fix Windows Actions caching 2025-05-29 13:56:05 +01:00
Artem Argus
916587050d Dont play drop sound on cancel hire (#2877)
* dont play drop sound on cancel hire
2025-05-27 18:13:52 -04:00
Stephen E. Baker
6a3ca20cb8 Merge pull request #2876 from Alberth289346/fix-rnc-cli
Check file handle of output file as well.
2025-05-26 19:40:33 -04:00
Alberth
230726ae6b Check file handle of output file as well. 2025-05-26 21:34:04 +02:00
Toby
c01dde15c7 Kill staff returned to crashed rooms (#2843) 2025-05-25 22:37:31 +03:00
Artem Argus
9dc5794a69 Unicode font colour fix (#2875)
Fixes #2819
Fixes #2744

Describe what the proposed change does

    For Unicode fonts:
    fixed text color for the calendar in the bottom panel,
    fixed text color on the statue in the annual report,
    fixed text color of the pause inscription have been fixed,
    fixed text color of selected item in build or furnish menu.
2025-05-25 14:28:41 -04:00
Stephen E. Baker
d62b97cb93 Merge pull request #2874 from TheCycoONE/font_color
Unicode font colour support (lua side)
2025-05-25 12:11:55 -04:00
Stephen E. Baker
a5c3fc7fae Fix loading older saves after colour fix 2025-05-25 11:17:29 -04:00
Stephen E. Baker
46ac2e3238 Fix loading older saves after colour fix 2025-05-25 10:50:39 -04:00
Stephen E. Baker
c198b2d6f3 Add Lua side support for ttf font colour selection
The biggest change here was separating loadFont with an exisiting
sprite_sheet from the shortcut method that loaded a spritesheet as well
as the font, which I now call loadFontAndSpriteSheet.

varargs have been removed from the font loading process as well as
parameter overloading making it much easier to follow the code.

A ttf_col parameter takes a red/green/blue colour table and passes it to
setSheet when loading a language font.

The Main Menu font is turned slight off white as a demonstration.
2025-05-25 10:28:41 -04:00
Alberth289346
ede4566a23 Merge pull request #2856 from lewri/fix_op_and_screen_markers
Fix operating theatre and screen markers
2025-05-25 12:38:35 +02:00
Stephen E. Baker
34db824004 Fix overflow drawing fonts
When drawing non-wrapped text a width of INT_MAX is passed in to the
regular draw_text_wrapped function, along with a left align. This was
overflowing in the alignment offset calculation even though the end
result should be 0. This raised alarms when undefined behaviour
sanitizer was enabled.

Add a conditional to avoid the overflow.
2025-05-24 22:22:08 -04:00
Stephen E. Baker
2bfa631b31 Bump api version for font color 2025-05-24 20:29:15 -04:00
Stephen E. Baker
98f0368dee Merge pull request #2873 from Alberth289346/avoid-false-corrupt-reports-on-missing-optional-files
Allow missing video files.
2025-05-24 12:20:45 -04:00
Alberth289346
2c68ab6151 Allow colour override for unicode fonts. (#2871)
* Allow colour override for unicode fonts.

- Can be set with R,G,B parameters of the 'setSheet' Lua call.
- The colour is ignored by the bitmap fonts.
- Fallback to average colour if not provided.
2025-05-24 12:06:33 -04:00
Alberth
e29e6184b8 Allow missing video files. 2025-05-24 16:58:33 +02:00
Stephen E. Baker
daf591522e Merge pull request #2870 from TheCycoONE/bump_vcpkg_may_2025
Bump vcpkg for May 2025
2025-05-23 22:44:18 -04:00
Artem Argus
4157c7457b Staff Management. Press on staff window interferes world. (#2858)
* Staff Management. Press on staff window interferes world.
2025-05-23 21:25:20 +01:00