github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Just use boolean operators on ptr

Browse source
This commit is contained in:
Sirius902 2022-05-09 20:22:21 -07:00
commit 7cd0b77421
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libultraship/libultraship/Cvar.cpp
View file

@ -16,7 +16,7 @@ extern "C" CVar* CVar_Get(const char* name) {
extern "C" s32 CVar_GetS32(const char* name, s32 defaultValue) { extern "C" s32 CVar_GetS32(const char* name, s32 defaultValue) {
CVar* cvar = CVar_Get(name); CVar* cvar = CVar_Get(name);
if (cvar != nullptr) { if (cvar) {
if (cvar->type == CVAR_TYPE_S32) if (cvar->type == CVAR_TYPE_S32)
return cvar->value.valueS32; return cvar->value.valueS32;
} }
@ -27,7 +27,7 @@ extern "C" s32 CVar_GetS32(const char* name, s32 defaultValue) {
extern "C" float CVar_GetFloat(const char* name, float defaultValue) { extern "C" float CVar_GetFloat(const char* name, float defaultValue) {
CVar* cvar = CVar_Get(name); CVar* cvar = CVar_Get(name);
if (cvar != nullptr) { if (cvar) {
if (cvar->type == CVAR_TYPE_FLOAT) if (cvar->type == CVAR_TYPE_FLOAT)
return cvar->value.valueFloat; return cvar->value.valueFloat;
} }
@ -38,7 +38,7 @@ extern "C" float CVar_GetFloat(const char* name, float defaultValue) {
extern "C" const char* CVar_GetString(const char* name, const char* defaultValue) { extern "C" const char* CVar_GetString(const char* name, const char* defaultValue) {
CVar* cvar = CVar_Get(name); CVar* cvar = CVar_Get(name);
if (cvar != nullptr) { if (cvar) {
if (cvar->type == CVAR_TYPE_STRING) if (cvar->type == CVAR_TYPE_STRING)
return cvar->value.valueStr; return cvar->value.valueStr;
} }
@ -48,7 +48,7 @@ extern "C" const char* CVar_GetString(const char* name, const char* defaultValue
extern "C" void CVar_SetS32(const char* name, s32 value) { extern "C" void CVar_SetS32(const char* name, s32 value) {
auto& cvar = cvars[name]; auto& cvar = cvars[name];
if (cvar == nullptr) { if (!cvar) {
cvar = std::make_unique<CVar>(); cvar = std::make_unique<CVar>();
} }
cvar->type = CVAR_TYPE_S32; cvar->type = CVAR_TYPE_S32;
@ -57,7 +57,7 @@ extern "C" void CVar_SetS32(const char* name, s32 value) {
void CVar_SetFloat(const char* name, float value) { void CVar_SetFloat(const char* name, float value) {
auto& cvar = cvars[name]; auto& cvar = cvars[name];
if (cvar == nullptr) { if (!cvar) {
cvar = std::make_unique<CVar>(); cvar = std::make_unique<CVar>();
} }
cvar->type = CVAR_TYPE_FLOAT; cvar->type = CVAR_TYPE_FLOAT;
@ -66,7 +66,7 @@ void CVar_SetFloat(const char* name, float value) {
void CVar_SetString(const char* name, const char* value) { void CVar_SetString(const char* name, const char* value) {
auto& cvar = cvars[name]; auto& cvar = cvars[name];
if (cvar == nullptr) { if (!cvar) {
cvar = std::make_unique<CVar>(); cvar = std::make_unique<CVar>();
} }
cvar->type = CVAR_TYPE_STRING; cvar->type = CVAR_TYPE_STRING;
@ -74,22 +74,16 @@ void CVar_SetString(const char* name, const char* value) {
} }
extern "C" void CVar_RegisterS32(const char* name, s32 defaultValue) { extern "C" void CVar_RegisterS32(const char* name, s32 defaultValue) {
CVar* cvar = CVar_Get(name); if (!CVar_Get(name))
if (cvar == nullptr)
CVar_SetS32(name, defaultValue); CVar_SetS32(name, defaultValue);
} }
extern "C" void CVar_RegisterFloat(const char* name, float defaultValue) { extern "C" void CVar_RegisterFloat(const char* name, float defaultValue) {
CVar* cvar = CVar_Get(name); if (!CVar_Get(name))
if (cvar == nullptr)
CVar_SetFloat(name, defaultValue); CVar_SetFloat(name, defaultValue);
} }
extern "C" void CVar_RegisterString(const char* name, const char* defaultValue) { extern "C" void CVar_RegisterString(const char* name, const char* defaultValue) {
CVar* cvar = CVar_Get(name); if (!CVar_Get(name))
if (cvar == nullptr)
CVar_SetString(name, defaultValue); CVar_SetString(name, defaultValue);
} }