spacebar/malamar
Watch
14
0
Fork
You've already forked malamar
 0
forked from PretendoNetwork/Inkay
Code Pull requests Releases 1 Activity Actions

fix(p2p): Fix compilation error in multiplayer port text

Browse source 
GCC complains about std::make_format_args using non-const references, so
we can't pass along the `get_console_peertopeer_port` directly.

Also replace `unsigned short` with `uint16_t` for clarity.
This commit is contained in:
Daniel López Guimaraes 2024-11-21 20:39:51 +00:00
commit 06847b21e5
No known key found for this signature in database
GPG key ID: 6AC74DE3DEF050E0
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/sysconfig.cpp
View file

@ -102,14 +102,14 @@ static inline int digit(char a) {
return a - '0';
}
unsigned short get_console_peertopeer_port() {
uint16_t get_console_peertopeer_port() {
const char * serial = get_console_serial();
unsigned short port = 50000 +
(digit(serial[4]) * 1000) +
(digit(serial[5]) * 100 ) +
(digit(serial[6]) * 10 ) +
(digit(serial[7]) * 1 );
uint16_t port = 50000 +
(digit(serial[4]) * 1000) +
(digit(serial[5]) * 100 ) +
(digit(serial[6]) * 10 ) +
(digit(serial[7]) * 1 );
return port;
}