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

Merge: Codechange: Use null pointer literal instead of the NULL macro

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-04-11 18:14:13 +01:00
parent f5747bf753 7c8e7c6b6e
commit 674732cd68
585 changed files with 6604 additions and 6604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/programmable_signals_gui.cpp
View File

@@ -256,7 +256,7 @@ public:
case PROGRAM_WIDGET_REMOVE: {
SignalInstruction *ins = GetSelected();
if (ins == NULL) return;
if (ins == nullptr) return;
uint32 p1 = 0;
SB(p1, 0, 3, this->track);
@@ -592,7 +592,7 @@ private:
{
if (this->selected_instruction == -1
|| this->selected_instruction >= int(this->instructions.size()))
return NULL;
return nullptr;
return this->instructions[this->selected_instruction].insn;
}
@@ -850,7 +850,7 @@ static WindowDesc _program_desc(
void ShowSignalProgramWindow(SignalReference ref)
{
uint32 window_id = (ref.tile << 3) | ref.track;
if (BringWindowToFrontById(WC_SIGNAL_PROGRAM, window_id) != NULL) return;
if (BringWindowToFrontById(WC_SIGNAL_PROGRAM, window_id) != nullptr) return;
new ProgramWindow(&_program_desc, ref);
}