diff --git a/engines/ultima/ultima8/gumps/container_gump.cpp b/engines/ultima/ultima8/gumps/container_gump.cpp index 0cc91355372..2172fc24cd0 100644 --- a/engines/ultima/ultima8/gumps/container_gump.cpp +++ b/engines/ultima/ultima8/gumps/container_gump.cpp @@ -505,7 +505,6 @@ void ContainerGump::DropItem(Item *item, int mx, int my) { // combined, so delete item item->destroy(); - item = nullptr; return; } } diff --git a/engines/ultima/ultima8/gumps/item_relative_gump.cpp b/engines/ultima/ultima8/gumps/item_relative_gump.cpp index 668f59a0c63..54465a0156a 100644 --- a/engines/ultima/ultima8/gumps/item_relative_gump.cpp +++ b/engines/ultima/ultima8/gumps/item_relative_gump.cpp @@ -111,12 +111,9 @@ void ItemRelativeGump::GumpToParent(int32 &gx, int32 &gy, PointRoundDir r) { } void ItemRelativeGump::GetItemLocation(int32 lerp_factor) { - Item *it = nullptr; - Item *next = nullptr; - Item *prev = nullptr; Gump *gump = nullptr; - it = getItem(_owner); + Item *it = getItem(_owner); if (!it) { // This shouldn't ever happen, the GumpNotifyProcess should @@ -125,6 +122,8 @@ void ItemRelativeGump::GetItemLocation(int32 lerp_factor) { return; } + Item *next; + Item *prev; while ((next = it->getParentAsContainer()) != nullptr) { prev = it; it = next; diff --git a/engines/ultima/ultima8/world/actors/main_actor.cpp b/engines/ultima/ultima8/world/actors/main_actor.cpp index 1e277fdbba0..ff17bf23126 100644 --- a/engines/ultima/ultima8/world/actors/main_actor.cpp +++ b/engines/ultima/ultima8/world/actors/main_actor.cpp @@ -61,7 +61,7 @@ MainActor::~MainActor() { } GravityProcess *MainActor::ensureGravityProcess() { - AvatarGravityProcess *p = nullptr; + AvatarGravityProcess *p; if (_gravityPid) { p = p_dynamic_cast( Kernel::get_instance()->getProcess(_gravityPid)); diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp index 7c47a3368b6..3616e37f54d 100644 --- a/engines/ultima/ultima8/world/item.cpp +++ b/engines/ultima/ultima8/world/item.cpp @@ -1452,7 +1452,7 @@ int32 Item::ascend(int delta) { } GravityProcess *Item::ensureGravityProcess() { - GravityProcess *p = nullptr; + GravityProcess *p; if (_gravityPid) { p = p_dynamic_cast( Kernel::get_instance()->getProcess(_gravityPid)); diff --git a/engines/ultima/ultima8/world/split_item_process.cpp b/engines/ultima/ultima8/world/split_item_process.cpp index 72786adf304..6774ef6d97e 100644 --- a/engines/ultima/ultima8/world/split_item_process.cpp +++ b/engines/ultima/ultima8/world/split_item_process.cpp @@ -75,7 +75,6 @@ void SplitItemProcess::run() { targetitem->callUsecodeEvent_combine(); } else { targetitem->destroy(); - targetitem = nullptr; } if (origcount > 0) { @@ -83,7 +82,6 @@ void SplitItemProcess::run() { original->callUsecodeEvent_combine(); } else { original->destroy(); // note: this terminates us - original = nullptr; } _result = 0;