mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove check that would never pass 

`safe_strcpy` already takes the null terminator into
account, making the check useless. If the string was too
long, `safe_strcpy` already prints a warning anyway.

Two small fixups included:
 - Sorting includes
 - Comparing char with `\0` instead of 0
This commit is contained in:
Hielke Morsink 2017-12-27 21:57:58 +01:00 committed by Michael Steenbeek
parent acc33aa47e
commit 32cc3082b2
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@ -14,18 +14,19 @@
*****************************************************************************/
#pragma endregion
#include <openrct2/OpenRCT2.h>
#include <openrct2/world/Climate.h>
#include <openrct2-ui/interface/Dropdown.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/Context.h>
#include <openrct2/Context.h>
#include <openrct2/core/Util.hpp>
#include <openrct2/Game.h>
#include <openrct2/interface/widget.h>
#include <openrct2/localisation/date.h>
#include <openrct2/localisation/localisation.h>
#include <openrct2/OpenRCT2.h>
#include <openrct2/sprites.h>
#include <openrct2/util/Util.h>
#include <openrct2-ui/interface/Dropdown.h>
#include <openrct2/world/Climate.h>
#pragma region Widgets
@ -793,25 +794,15 @@ static void window_editor_objective_options_main_textinput(rct_window *w, rct_wi
case WIDX_PARK_NAME:
park_set_name(text);
if (gS6Info.name[0] == 0)
if (gS6Info.name[0] == '\0')
format_string(gS6Info.name, 64, gParkName, &gParkNameArgs);
break;
case WIDX_SCENARIO_NAME:
safe_strcpy(gS6Info.name, text, 64);
if (strnlen(gS6Info.name, 64) == 64)
{
gS6Info.name[64 - 1] = '\0';
log_warning("Truncated S6 name: %s", gS6Info.name);
}
safe_strcpy(gS6Info.name, text, Util::CountOf(gS6Info.name));
window_invalidate(w);
break;
case WIDX_DETAILS:
safe_strcpy(gS6Info.details, text, 256);
if (strnlen(gS6Info.details, 256) == 256)
{
gS6Info.details[256 - 1] = '\0';
log_warning("Truncated S6 name: %s", gS6Info.details);
}
safe_strcpy(gS6Info.details, text, Util::CountOf(gS6Info.details));
window_invalidate(w);
break;
}