bionickatana/starruler-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32 from devnexen/wrong_type_checking

Browse Source 
Wrong comparison between pointers and integral type.
This commit is contained in:
Amy Ackermann
2018-07-30 09:16:02 -07:00
committed by GitHub
parent b6d879d510 76d2e2b9a6
commit 4df99914d0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/main/initialization.cpp
+1 -1
View File
@@ -1386,7 +1386,7 @@ void passSettings(scripts::Manager* man) {
auto& modules = man->modules; auto& modules = man->modules;
for(auto it = modules.begin(); it != modules.end(); ++it) { for(auto it = modules.begin(); it != modules.end(); ++it) {
scripts::Module& mod = *it->second; scripts::Module& mod = *it->second;
if(mod.callbacks[scripts::SC_game_settings] > 0) { if(mod.callbacks[scripts::SC_game_settings] != nullptr) {
game_settings.rewind(); game_settings.rewind();
scripts::Call cl = mod.call(scripts::SC_game_settings); scripts::Call cl = mod.call(scripts::SC_game_settings);
cl.push(&game_settings); cl.push(&game_settings);
source/game/scripts/manager.cpp
+1 -1
View File
@@ -1495,7 +1495,7 @@ MultiCall Manager::call(ScriptCallback cb) {
for(auto it = modules.begin(), end = modules.end(); it != end; ++it) { for(auto it = modules.begin(), end = modules.end(); it != end; ++it) {
Module& mod = *it->second; Module& mod = *it->second;
if(mod.callbacks[cb] > 0) if(mod.callbacks[cb] != nullptr)
calls.calls.push_back(mod.call(cb)); calls.calls.push_back(mod.call(cb));
} }