diff options
Diffstat (limited to 'src/serialization-input.cpp')
| -rw-r--r-- | src/serialization-input.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/serialization-input.cpp b/src/serialization-input.cpp index d8a2f86..0fc2d63 100644 --- a/src/serialization-input.cpp +++ b/src/serialization-input.cpp @@ -140,7 +140,7 @@ pk_handle pke_serialize_input_set(srlztn_serialize_helper *h, pke_input_set *inp pk_arr_append_t(&kvec.child_handles, child_handle); } - compt_a<32==sizeof(pke_input_set)>(); + compt_a<40==sizeof(pke_input_set)>(); { kve.key = SRLZTN_INPUT_SET_TITLE; len = strlen(input_set->title)+1; @@ -174,12 +174,13 @@ void pke_deserialize_input_set(srlztn_deserialize_helper *h, pke_kve_container * // TODO specific bucket set.actionCount = kvec->children.next; - set.actions = pk_new_arr<pke_input_action>(kvec->children.next, NULL); + set.bkt = pkeSettings.mem_bkt.game; + set.actions = pk_new_arr<pke_input_action>(kvec->children.next, set.bkt); for (k = 0; k < set.actionCount; ++k) { pke_deserialize_input_action(h, kvec->children[k], set.actions[k]); } - compt_a<40==sizeof(pke_input_action)>(); + compt_a<40==sizeof(pke_input_set)>(); for (i = 0; i < kvec->arr.next; ++i) { kve = &kvec->arr[i]; if (strncmp(kve->key, SRLZTN_INPUT_SET_TITLE, strlen(SRLZTN_INPUT_SET_TITLE)) == 0) { @@ -201,7 +202,7 @@ void pke_deserialize_input_set(srlztn_deserialize_helper *h, pke_kve_container * } } - pke_input_action_set_handle action_set_handle = pke_input_register_set(set); + pke_input_action_set_handle action_set_handle = pke_input_register_set(std::move(set)); if (pkeSettings.rt.activeLevel != nullptr) { pke_level_register_input_action_set(pkeSettings.rt.activeLevel, action_set_handle); } |