cpp/openttd-patchpack/source Changeset - r26134:f8d1848ac6b3

Changeset - r26134:f8d1848ac6b3

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Michael Lutz - 2 years ago 2021-12-20 15:59:07
michi@icosahedron.de

Fix #9756: Network command unpack proc was not generated in all cases.

The case where the callback proc takes all command results but not any of
the command parameters was not handled properly.

2 files changed with 7 insertions and 1 deletions:

src/command_type.h

src/network/network_command.cpp

0 comments (0 inline, 0 general)

src/command_type.h

➞

Show inline comments

@@ @@ -409,12 +409,14 @@ template <typename T> struct CommandFunc @@
 template <typename... Targs>
 struct CommandFunctionTraitHelper<CommandCost(*)(DoCommandFlag, Targs...)> {
 	using Args = std::tuple<std::decay_t<Targs>...>;
 	using RetTypes = void;
 	using CbArgs = Args;
 	using CbProcType = void(*)(Commands, const CommandCost &);
 };
 template <template <typename...> typename Tret, typename... Tretargs, typename... Targs>
 struct CommandFunctionTraitHelper<Tret<CommandCost, Tretargs...>(*)(DoCommandFlag, Targs...)> {
 	using Args = std::tuple<std::decay_t<Targs>...>;
 	using RetTypes = std::tuple<std::decay_t<Tretargs>...>;
 	using CbArgs = std::tuple<std::decay_t<Tretargs>..., std::decay_t<Targs>...>;
 	using CbProcType = void(*)(Commands, const CommandCost &, Tretargs...);
 };
@@ @@ -426,6 +428,7 @@ template <Commands Tcmd> struct CommandT @@
 	template<> struct CommandTraits<cmd_> { \
 		using ProcType = decltype(&proc_); \
 		using Args = typename CommandFunctionTraitHelper<ProcType>::Args; \
 		using RetTypes = typename CommandFunctionTraitHelper<ProcType>::RetTypes; \
 		using CbArgs = typename CommandFunctionTraitHelper<ProcType>::CbArgs; \
 		using RetCallbackProc = typename CommandFunctionTraitHelper<ProcType>::CbProcType; \
 		static constexpr Commands cmd = cmd_; \

src/network/network_command.cpp

➞

Show inline comments

@@ @@ -136,7 +136,10 @@ constexpr UnpackNetworkCommandProc MakeU @@
+{
 	/* Check if the callback matches with the command arguments. If not, don't generate an Unpack proc. */
 	using Tcallback = std::tuple_element_t<Tcb, decltype(_callback_tuple)>;
 	if constexpr (std::is_same_v<Tcallback, CommandCallback * const> || std::is_same_v<Tcallback, CommandCallbackData * const> || std::is_same_v<typename CommandTraits<Tcmd>::CbArgs, typename CallbackArgsHelper<Tcallback>::Args>) {
 	if constexpr (std::is_same_v<Tcallback, CommandCallback * const> || // Callback type is CommandCallback.
 			std::is_same_v<Tcallback, CommandCallbackData * const> || // Callback type is CommandCallbackData.
 			std::is_same_v<typename CommandTraits<Tcmd>::CbArgs, typename CallbackArgsHelper<Tcallback>::Args> || // Callback proc takes all command return values and parameters.
 			(!std::is_void_v<typename CommandTraits<Tcmd>::RetTypes> && std::is_same_v<typename CallbackArgsHelper<typename CommandTraits<Tcmd>::RetCallbackProc const>::Args, typename CallbackArgsHelper<Tcallback>::Args>)) { // Callback return is more than CommandCost and the proc takes all return values.
 		return &UnpackNetworkCommand<Tcmd, Tcb>;
 	} else {
 		return nullptr;

0 comments (0 inline, 0 general)