From 7c240b3e7b74e3e3098093a06196f8148de423bf Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 21 Feb 2024 15:14:17 -0500 Subject: [PATCH] Remove returns --- LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp | 7 +++---- LEGO1/lego/legoomni/src/common/legoplantmanager.cpp | 7 +++---- LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp index e4ca4762..ddb2788d 100644 --- a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp +++ b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp @@ -53,11 +53,10 @@ void LegoBuildingManager::SetCustomizeAnimFile(const char* p_value) if (p_value != NULL) { g_customizeAnimFile = new char[strlen(p_value) + 1]; - if (g_customizeAnimFile == NULL) { - return; - } - strcpy(g_customizeAnimFile, p_value); + if (g_customizeAnimFile != NULL) { + strcpy(g_customizeAnimFile, p_value); + } } else { g_customizeAnimFile = NULL; diff --git a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp index d678e9ab..2b2cc4e9 100644 --- a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp @@ -44,11 +44,10 @@ void LegoPlantManager::SetCustomizeAnimFile(const char* p_value) if (p_value != NULL) { g_customizeAnimFile = new char[strlen(p_value) + 1]; - if (g_customizeAnimFile == NULL) { - return; - } - strcpy(g_customizeAnimFile, p_value); + if (g_customizeAnimFile != NULL) { + strcpy(g_customizeAnimFile, p_value); + } } else { g_customizeAnimFile = NULL; diff --git a/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp index ae3ff926..336c5838 100644 --- a/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp +++ b/LEGO1/lego/legoomni/src/common/legounksavedatawriter.cpp @@ -118,11 +118,10 @@ void LegoUnkSaveDataWriter::SetCustomizeAnimFile(const char* p_value) if (p_value != NULL) { g_customizeAnimFile = new char[strlen(p_value) + 1]; - if (g_customizeAnimFile == NULL) { - return; - } - strcpy(g_customizeAnimFile, p_value); + if (g_customizeAnimFile != NULL) { + strcpy(g_customizeAnimFile, p_value); + } } else { g_customizeAnimFile = NULL;