diff options
author | Benoit Germain <benoit.germain@ubisoft.com> | 2024-04-11 15:56:04 +0200 |
---|---|---|
committer | Benoit Germain <benoit.germain@ubisoft.com> | 2024-04-11 15:56:04 +0200 |
commit | 00970610dc8fbd00a11d3b69e4702933a592ce9f (patch) | |
tree | c746e91de27fe7ce036242e4667074b4597b77dd /src | |
parent | 21e881fd6c085e615c438ceb6eb438712f5c5075 (diff) | |
parent | adaa36dbec1ce9aaafd61873b9d3d898a8c240cf (diff) | |
download | lanes-00970610dc8fbd00a11d3b69e4702933a592ce9f.tar.gz lanes-00970610dc8fbd00a11d3b69e4702933a592ce9f.tar.bz2 lanes-00970610dc8fbd00a11d3b69e4702933a592ce9f.zip |
Merge branch 'C-Implementation'
Since almost everything in C-implementation comes from manual cherry-picking stuff in master, the merge essentially consist in a pure git tree operation to reconnect stuff properly.
Diffstat (limited to '')
-rw-r--r-- | src/tools.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools.cpp b/src/tools.cpp index 4a6f2a2..a0a3018 100644 --- a/src/tools.cpp +++ b/src/tools.cpp | |||
@@ -1446,7 +1446,7 @@ static void copy_cached_func(Universe* U, Dest L2, int L2_cache_i, Source L, int | |||
1446 | int key_i = val_i - 1; | 1446 | int key_i = val_i - 1; |
1447 | 1447 | ||
1448 | // Only basic key types are copied over; others ignored | 1448 | // Only basic key types are copied over; others ignored |
1449 | if (inter_copy_one(U, L2, 0 /*key*/, L, key_i, VT::KEY, mode_, upName_)) | 1449 | if (inter_copy_one(U, L2, L2_cache_i, L, key_i, VT::KEY, mode_, upName_)) |
1450 | { | 1450 | { |
1451 | char* valPath = (char*) upName_; | 1451 | char* valPath = (char*) upName_; |
1452 | if( U->verboseErrors) | 1452 | if( U->verboseErrors) |