amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-22 10:39:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: replace char * with std::string_view

Browse Source
This commit is contained in:
Rubidium
2025-04-27 21:10:02 +02:00
committed by rubidium42
parent c6ea0ce961
commit 9116f96e2e
6 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/network_command.cpp
+5 -5
View File
@@ -358,22 +358,22 @@ void NetworkDistributeCommands()
* Receives a command from the network.
* @param p the packet to read from.
* @param cp the struct to write the data to.
* @return an error message. When nullptr there has been no error.
* @return An error message, or std::nullopt there has been no error.
*/
const char *NetworkGameSocketHandler::ReceiveCommand(Packet &p, CommandPacket &cp)
std::optional<std::string_view> NetworkGameSocketHandler::ReceiveCommand(Packet &p, CommandPacket &cp)
{
cp.company = (CompanyID)p.Recv_uint8();
cp.cmd = static_cast<Commands>(p.Recv_uint16());
if (!IsValidCommand(cp.cmd)) return "invalid command";
if (!IsValidCommand(cp.cmd)) return "invalid command";
if (GetCommandFlags(cp.cmd).Test(CommandFlag::Offline)) return "single-player only command";
cp.err_msg = p.Recv_uint16();
cp.data = _cmd_dispatch[cp.cmd].Sanitize(p.Recv_buffer());
uint8_t callback = p.Recv_uint8();
if (callback >= _callback_table.size() || _cmd_dispatch[cp.cmd].Unpack[callback] == nullptr) return "invalid callback";
if (callback >= _callback_table.size() || _cmd_dispatch[cp.cmd].Unpack[callback] == nullptr) return "invalid callback";
cp.callback = _callback_table[callback];
return nullptr;
return std::nullopt;
}
/**