dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify CCLOG macros in CheckCaches

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-04-22 22:43:10 +01:00
parent 89959bf178
commit 08e43a0814
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/openttd.cpp
View File

@@ -1483,14 +1483,18 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log, CheckC
} }
char cclog_buffer[1024]; char cclog_buffer[1024];
auto cclog_common = [&]() {
DEBUG(desync, 0, "%s", cclog_buffer);
if (log) {
log(cclog_buffer);
} else {
LogDesyncMsg(cclog_buffer);
}
};
#define CCLOG(...) { \ #define CCLOG(...) { \
seprintf(cclog_buffer, lastof(cclog_buffer), __VA_ARGS__); \ seprintf(cclog_buffer, lastof(cclog_buffer), __VA_ARGS__); \
DEBUG(desync, 0, "%s", cclog_buffer); \ cclog_common(); \
if (log) { \
log(cclog_buffer); \
} else { \
LogDesyncMsg(cclog_buffer); \
} \
} }
auto output_veh_info = [&](char *&p, const Vehicle *u, const Vehicle *v, uint length) { auto output_veh_info = [&](char *&p, const Vehicle *u, const Vehicle *v, uint length) {
@@ -1500,12 +1504,7 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log, CheckC
#define CCLOGV(...) { \ #define CCLOGV(...) { \
char *p = cclog_buffer + seprintf(cclog_buffer, lastof(cclog_buffer), __VA_ARGS__); \ char *p = cclog_buffer + seprintf(cclog_buffer, lastof(cclog_buffer), __VA_ARGS__); \
output_veh_info(p, u, v, length); \ output_veh_info(p, u, v, length); \
DEBUG(desync, 0, "%s", cclog_buffer); \ cclog_common(); \
if (log) { \
log(cclog_buffer); \
} else { \
LogDesyncMsg(cclog_buffer); \
} \
} }
if (flags & CHECK_CACHE_GENERAL) { if (flags & CHECK_CACHE_GENERAL) {