Commit Graph

1227 Commits (bb79755efd62489f98f69c0401645d1b019f2ad5)

Author SHA1 Message Date
lethosor 40bfb6b8ff
Hack to force GCC to invoke cancel_job() through DF's vtable
GCC appears to be optimizing the call to `cancel_job()` to use the stub in
*DFHack's* job_handler vtable, which is a no-op. Lua was unaffected because it
invokes vmethods through method pointers (without knowing the target instance at
compile time), so use a similar approach here for now.

As mentioned by @ab9rf on Discord, we should pursue an alternative like asking
Bay12 to expose the relevant code through a global `std::function` instead of a
vmethod.
2023-08-31 17:42:16 -04:00
Myk 5d7649837c
Merge pull request #3704 from shevernitskiy/create-delete-textures
create and delete textures
2023-08-30 03:42:27 -07:00
shevernitskiy 8a015f7f87 review 2023-08-30 07:38:21 +03:00
Myk Taylor a8bf8a04ae
add in value for units contained in cages 2023-08-28 15:42:56 -07:00
Myk Taylor 423bba2c24
pass getAnyStockpile and getAnyCivZone through ZScreens 2023-08-28 13:27:46 -07:00
shevernitskiy 4b0219e225 fix stupid linux build again 2023-08-28 10:56:08 +03:00
shevernitskiy 51baa0d674 fix linux build 2023-08-28 10:46:59 +03:00
shevernitskiy 6f11812729 create and delete textures 2023-08-28 10:00:39 +03:00
Myk a740c6628e
Merge pull request #3663 from shevernitskiy/dynamic-texture-loading
feat: dynamic texture loading
2023-08-27 22:45:52 -07:00
shevernitskiy 6c5163af9e adjust adopt region reset step 2023-08-27 22:28:03 +03:00
Myk Taylor 1763a16831
add training check functions to Units 2023-08-20 10:08:25 -07:00
shevernitskiy c1945f7b54 fix build err in gcc 2023-08-17 06:32:26 +03:00
Myk Taylor fa3c2222e6
higher granularity for unit viewsheet focus strings 2023-08-13 23:54:18 -07:00
shevernitskiy 91f4c3d561 mirgate preloaded assets to lua 2023-08-14 08:17:57 +03:00
shevernitskiy 1409af67de expose api to lua 2023-08-13 20:09:12 +03:00
Myk 71e5901214
Merge pull request #3672 from myk002/myk_gui
[orders] prevent overlay from appearing on the new workorder page
2023-08-12 23:21:13 -07:00
shevernitskiy 22b0671038 review 2 2023-08-13 08:33:31 +03:00
Myk Taylor b787c2bb1e
make creating a workorder a subscreen instead of a top-level 2023-08-12 22:02:17 -07:00
Myk Taylor c37dce7c33
detect extended tile properties and communicate them back to lua 2023-08-12 15:53:22 -07:00
shevernitskiy 687bd82542 pathable & unsuspend specific tile size 2023-08-12 20:05:15 +03:00
shevernitskiy fe8bd4fa78 assets use dynamic texture loading 2023-08-12 16:11:42 +03:00
Myk Taylor 8d8c139ccb
don't add keys as text when ctrl or alt are pressed 2023-08-11 12:54:49 -07:00
shevernitskiy e81a90821a review 2023-08-11 21:40:41 +03:00
shevernitskiy 4bbcc7b05d eof fix 2023-08-11 09:48:03 +03:00
shevernitskiy e21f0f2b69 dynamic texture loading 2023-08-11 09:14:05 +03:00
Myk Taylor 03edea8257
add focus string support for legends mode 2023-08-07 02:50:37 -07:00
Myk Taylor db48e0eba0
remove caravan_buying param from getValue call
the identity of the selling party doesn't actually affect the value!
2023-08-06 17:38:34 -07:00
lethosor eb12ff17f6
Refactor: move static identity_traits to their own file, simplify field defs
DataStaticsFields.cpp used to contain identity_traits specializations for
primitive and opaque STL types, as well as macros used for the generated struct
field definitions. Only one of these were actually used in any compilation unit,
and the identity_traits definitions were hidden behind a guard to prevent them
from being compiled at all when building the struct field definitions.

Now, the identity_traits specializations live in their own file,
DataIdentity.cpp (matching their declarations, which live in DataIdentity.h).
This speeds up build times because modifying these specializations no longer
requires rebuilding all of the field definitions unnecessarily.
2023-08-02 00:15:26 -04:00
lethosor 9f168214dd
Merge remote-tracking branch 'lethosor/fix-textures-cleanup-segfault' into develop 2023-08-01 00:35:19 -04:00
lethosor e2ca506e23
Fix off-by-one error in Textures::cleanup()
In a ASCII-only configuration, I was seeing `textures.raws.size() == 164` and
`texpos_end == 164`. This resulted in reading one item past the end of the
vector.

This may not be occurring in configurations with graphics enabled, or
Windows/WINE may be more permissive.
2023-08-01 00:13:09 -04:00
lethosor e55984c529
Fix startup crashes when global addresses are missing
Useful for initial research. Can be tested with `DFHACK_NO_GLOBALS=1`
2023-08-01 00:05:02 -04:00
Myk Taylor 77d0fb297c
convert tabs to spaces when getting clipboard text
this avoids tab characters being translated to "?" when converted to
cp437
2023-07-21 15:03:06 -07:00
Myk Taylor dff4816287
update dwarfvet 2023-07-21 04:12:56 -07:00
Myk Taylor 0d81f5ce6e
don't include dead citizens in the citizens list 2023-07-18 23:09:19 -07:00
Myk 2cd226d879
Merge pull request #3566 from myk002/myk_pasture
[zone] initial implementation of pasture assignment screen
2023-07-16 14:36:57 -07:00
Myk Taylor 5fb299c6df
expand egg-laying filter to the entire race, not just the unit 2023-07-16 12:30:12 -07:00
Myk Taylor 39612f0d5a
trade a bin if any contents can be traded
the new trade screens will make it easy to filter out unwanted items
later
2023-07-16 12:15:51 -07:00
Kelly Kinkade 1fba8b16f5 replace `dts:make_unique` with `std::make_unique`
2014 here we come!
2023-07-07 21:38:15 -05:00
Myk Taylor 6a8522ab5e
generalize dfhack.items.isRequestedTradeGood 2023-07-06 03:27:05 -07:00
Myk Taylor b938891e11
add dfhack.items.isRequestedTradeGood 2023-07-06 03:24:36 -07:00
Myk Taylor c45dcdd7b0
implement sell_prices adjustments 2023-07-06 03:24:16 -07:00
Myk Taylor 2aeb86ba8f
implement trade agreement buy prices 2023-07-06 03:24:16 -07:00
Myk Taylor c2e647b79b
fix item prices and algorithm
adjust prices according to race WAR affinity
2023-07-06 03:24:15 -07:00
Myk Taylor 9849885df6
Revert "generalize dfhack.items.isRequestedTradeGood"
This reverts commit aa6d28bab6.
2023-07-06 03:23:17 -07:00
Myk Taylor aa6d28bab6
generalize dfhack.items.isRequestedTradeGood 2023-07-06 03:21:36 -07:00
Myk 79dbcf0461
Merge pull request #3524 from myk002/myk_copypaste
support copy/paste from system clipboard
2023-07-05 23:09:08 -07:00
Myk 785405b281
Update DFSDL.cpp 2023-07-05 22:34:25 -07:00
Myk 50b3cecfcf
Merge pull request #3481 from myk002/myk_cpp20
get compiling with c++-20
2023-07-05 22:28:59 -07:00
Myk c25b6e642e
Merge pull request #3533 from myk002/myk_noble
port API for unit lookup by noble role from quickfort
2023-07-05 19:34:29 -07:00
Myk Taylor c587cad471
generalize to civ roles as well 2023-07-05 17:37:49 -07:00