diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-06-28 00:57:01 +0200 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2020-06-28 00:57:01 +0200 |
| commit | b8f633de243914aa548381d024e77ad736b91d0d (patch) | |
| tree | 3c81e57b024df92c35f32d6a447f412d781e0661 /src/core/FrontEndControls.h | |
| parent | fixfixfix (diff) | |
| download | re3-b8f633de243914aa548381d024e77ad736b91d0d.tar re3-b8f633de243914aa548381d024e77ad736b91d0d.tar.gz re3-b8f633de243914aa548381d024e77ad736b91d0d.tar.bz2 re3-b8f633de243914aa548381d024e77ad736b91d0d.tar.lz re3-b8f633de243914aa548381d024e77ad736b91d0d.tar.xz re3-b8f633de243914aa548381d024e77ad736b91d0d.tar.zst re3-b8f633de243914aa548381d024e77ad736b91d0d.zip | |
Diffstat (limited to 'src/core/FrontEndControls.h')
| -rw-r--r-- | src/core/FrontEndControls.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/FrontEndControls.h b/src/core/FrontEndControls.h index 04dac96f..68dab90b 100644 --- a/src/core/FrontEndControls.h +++ b/src/core/FrontEndControls.h @@ -16,7 +16,7 @@ class CTriggerCaller int field_C; public: - CTriggerCaller() : bHasTrigger(false), pFunc(NULL) + CTriggerCaller() : bHasTrigger(false), pFunc(nil) {} void SetTrigger(void *func, void *trigger) @@ -31,11 +31,11 @@ public: void CallTrigger(void) { - if ( bHasTrigger && pFunc != NULL ) + if ( bHasTrigger && pFunc != nil ) pFunc(pTrigger); bHasTrigger = false; - pFunc = NULL; + pFunc = nil; } bool CanCall() @@ -52,7 +52,7 @@ public: wchar *m_text; CPlaceableText(void) - : m_position(0.0f, 0.0f), m_color(255, 255, 255, 255), m_text(NULL) {} + : m_position(0.0f, 0.0f), m_color(255, 255, 255, 255), m_text(nil) {} void SetPosition(float x, float y) { m_position.x = x; m_position.y = y; } void SetColor(const CRGBA &color) { m_color = color; } CRGBA GetColor(void) { return m_color; } |