mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Refactored asserts always calling the function regardless of expression.

Browse Source
This commit is contained in:
ZehMatt
2017-07-27 05:12:50 +02:00
parent 30b907f0e8
commit f7b7b18b4a
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/core/Guard.cpp
View File

@@ -34,12 +34,9 @@
extern "C"
{
void openrct2_assert(bool expression, const char * message, ...)
void openrct2_assert_va(bool expression, const char * message, va_list va)
{
va_list args;
va_start(args, message);
Guard::Assert_VA(expression, message, args);
va_end(args);
Guard::Assert_VA(expression, message, va);
}
}

14
src/openrct2/core/Guard.hpp
View File

@@ -16,17 +16,25 @@
#pragma once
#include <stdarg.h>
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
void openrct2_assert(bool expression, const char * message, ...);
void openrct2_assert_va(bool expression, const char * message, va_list va);
inline void openrct2_assert(bool expression, const char * message, ...)
{
if (!expression) return;
va_list va;
va_start(va, message);
openrct2_assert_va(expression, message, va);
va_end(va);
}
#ifdef __cplusplus
}
#include <stdarg.h>
enum class ASSERT_BEHAVIOUR
{
ABORT,