From 76d2e2b9a606fab67eb161462651d37b776d9903 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 30 Jul 2018 16:51:24 +0100 Subject: [PATCH] Wrong comparison between pointers and integral type. --- source/game/main/initialization.cpp | 2 +- source/game/scripts/manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/game/main/initialization.cpp b/source/game/main/initialization.cpp index 6013eca..ea782b7 100644 --- a/source/game/main/initialization.cpp +++ b/source/game/main/initialization.cpp @@ -1386,7 +1386,7 @@ void passSettings(scripts::Manager* man) { auto& modules = man->modules; for(auto it = modules.begin(); it != modules.end(); ++it) { scripts::Module& mod = *it->second; - if(mod.callbacks[scripts::SC_game_settings] > 0) { + if(mod.callbacks[scripts::SC_game_settings] != nullptr) { game_settings.rewind(); scripts::Call cl = mod.call(scripts::SC_game_settings); cl.push(&game_settings); diff --git a/source/game/scripts/manager.cpp b/source/game/scripts/manager.cpp index 8b18995..1b33317 100644 --- a/source/game/scripts/manager.cpp +++ b/source/game/scripts/manager.cpp @@ -1495,7 +1495,7 @@ MultiCall Manager::call(ScriptCallback cb) { for(auto it = modules.begin(), end = modules.end(); it != end; ++it) { Module& mod = *it->second; - if(mod.callbacks[cb] > 0) + if(mod.callbacks[cb] != nullptr) calls.calls.push_back(mod.call(cb)); }