Skip to content

Y
ygopro
Commit ca304499 authored by Chen Bill's avatar Chen Bill Committed by GitHub
Browse files
Options

use nullptr in script reader (#2612)

parent ddef04bb
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
gframe/data_manager.cpp
View file @ ca304499
...@@ -414,16 +414,16 @@ byte* DataManager::ScriptReader(const char* script_name, int* slen) { ...@@ -414,16 +414,16 @@ byte* DataManager::ScriptReader(const char* script_name, int* slen) {
#else #else
IReadFile* reader = FileSystem->createAndOpenFile(script_name); IReadFile* reader = FileSystem->createAndOpenFile(script_name);
#endif #endif
if(reader == NULL) if (!reader)
return 0; return nullptr;
size_t size = reader->getSize(); size_t size = reader->getSize();
if(size > sizeof(scriptBuffer)) { if (size > sizeof scriptBuffer) {
reader->drop(); reader->drop();
return 0; return nullptr;
} }
reader->read(scriptBuffer, size); reader->read(scriptBuffer, size);
reader->drop(); reader->drop();
*slen = size; *slen = (int)size;
return scriptBuffer; return scriptBuffer;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment