mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-07 02:40:30 -05:00
Code Issues Projects Releases Wiki Activity

Merge with develop

Browse Source
This commit is contained in:
Nicholas Estelami 2022-05-29 14:36:05 -04:00
parent fa0a66695c
commit a6092c21d4
9 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ZAPDTR/ZAPD/Globals.cpp
View File

@ -23,6 +23,7 @@ Globals::Globals()
singleThreaded = true; singleThreaded = true;
verbosity = VerbosityLevel::VERBOSITY_SILENT; verbosity = VerbosityLevel::VERBOSITY_SILENT;
outputPath = Directory::GetCurrentDirectory(); outputPath = Directory::GetCurrentDirectory();
singleThreaded = true;
} }
Globals::~Globals() Globals::~Globals()

8
libultraship/libultraship/Cvar.cpp
View File

@ -52,7 +52,7 @@ extern "C" void CVar_SetS32(const char* name, int32_t value) {
if (!cvar) { if (!cvar) {
cvar = std::make_unique<CVar>(); cvar = std::make_unique<CVar>();
} }
cvar->type = CVAR_TYPE_S32; cvar->type = CVarType::S32;
cvar->value.valueS32 = value; cvar->value.valueS32 = value;
} }
@ -61,7 +61,7 @@ void CVar_SetFloat(const char* name, float value) {
if (!cvar) { if (!cvar) {
cvar = std::make_unique<CVar>(); cvar = std::make_unique<CVar>();
} }
cvar->type = CVAR_TYPE_FLOAT; cvar->type = CVarType::Float;
cvar->value.valueFloat = value; cvar->value.valueFloat = value;
} }
@ -70,8 +70,8 @@ extern "C" void CVar_SetString(const char* name, const char* value) {
if (!cvar) { if (!cvar) {
cvar = std::make_unique<CVar>(); cvar = std::make_unique<CVar>();
} }
cvar->type = CVAR_TYPE_STRING; cvar->type = CVarType::String;
cvar->value.valueStr = ImStrdup(value); cvar->value.valueStr = value;
} }
extern "C" void CVar_RegisterS32(const char* name, int32_t defaultValue) { extern "C" void CVar_RegisterS32(const char* name, int32_t defaultValue) {

12
libultraship/libultraship/Cvar.h
View File

@ -3,7 +3,14 @@
#include <stdint.h> #include <stdint.h>
typedef enum CVarType { CVAR_TYPE_S32, CVAR_TYPE_FLOAT, CVAR_TYPE_STRING } CVarType; #ifdef __cplusplus
typedef enum class CVarType
{
S32,
Float,
String,
RGBA
} CVarType;
typedef struct CVar { typedef struct CVar {
const char* name; const char* name;
@ -16,6 +23,9 @@ typedef struct CVar {
} value; } value;
} CVar; } CVar;
CVar* CVar_Get(char* name);
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {

0
soh/include/color.h → libultraship/libultraship/color.h
View File

1
libultraship/libultraship/libultraship.vcxproj
View File

@ -351,6 +351,7 @@
<ClInclude Include="Audio.h" /> <ClInclude Include="Audio.h" />
<ClInclude Include="AudioPlayer.h" /> <ClInclude Include="AudioPlayer.h" />
<ClInclude Include="Blob.h" /> <ClInclude Include="Blob.h" />
<ClInclude Include="color.h" />
<ClInclude Include="ControlDeck.h" /> <ClInclude Include="ControlDeck.h" />
<ClInclude Include="Cvar.h" /> <ClInclude Include="Cvar.h" />
<ClInclude Include="Environment.h" /> <ClInclude Include="Environment.h" />

3
libultraship/libultraship/libultraship.vcxproj.filters
View File

@ -653,6 +653,9 @@
<ClInclude Include="GameVersions.h"> <ClInclude Include="GameVersions.h">
<Filter>Source Files\Resources</Filter> <Filter>Source Files\Resources</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="color.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GameOverlay.h"> <ClInclude Include="GameOverlay.h">
<Filter>Source Files\CustomImpl\Overlay</Filter> <Filter>Source Files\CustomImpl\Overlay</Filter>
</ClInclude> </ClInclude>

1
soh/soh.vcxproj
View File

@ -988,7 +988,6 @@
<ClInclude Include="soh\frame_interpolation.h" /> <ClInclude Include="soh\frame_interpolation.h" />
<ClInclude Include="include\alloca.h" /> <ClInclude Include="include\alloca.h" />
<ClInclude Include="include\bgm.h" /> <ClInclude Include="include\bgm.h" />
<ClInclude Include="include\color.h" />
<ClInclude Include="include\command_macros_base.h" /> <ClInclude Include="include\command_macros_base.h" />
<ClInclude Include="include\fp.h" /> <ClInclude Include="include\fp.h" />
<ClInclude Include="include\functions.h" /> <ClInclude Include="include\functions.h" />

3
soh/soh.vcxproj.filters
View File

@ -2384,9 +2384,6 @@
<ClInclude Include="include\bgm.h"> <ClInclude Include="include\bgm.h">
<Filter>Header Files\include</Filter> <Filter>Header Files\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\color.h">
<Filter>Header Files\include</Filter>
</ClInclude>
<ClInclude Include="include\command_macros_base.h"> <ClInclude Include="include\command_macros_base.h">
<Filter>Header Files\include</Filter> <Filter>Header Files\include</Filter>
</ClInclude> </ClInclude>

6
soh/soh/Enhancements/debugconsole.cpp
View File

@ -426,11 +426,11 @@ static bool GetCVarHandler(const std::vector<std::string>& args) {
if (cvar != nullptr) if (cvar != nullptr)
{ {
if (cvar->type == CVAR_TYPE_S32) if (cvar->type == CVarType::S32)
INFO("[SOH] Variable %s is %i", args[1].c_str(), cvar->value.valueS32); INFO("[SOH] Variable %s is %i", args[1].c_str(), cvar->value.valueS32);
else if (cvar->type == CVAR_TYPE_FLOAT) else if (cvar->type == CVarType::Float)
INFO("[SOH] Variable %s is %f", args[1].c_str(), cvar->value.valueFloat); INFO("[SOH] Variable %s is %f", args[1].c_str(), cvar->value.valueFloat);
else if (cvar->type == CVAR_TYPE_STRING) else if (cvar->type == CVarType::String)
INFO("[SOH] Variable %s is %s", args[1].c_str(), cvar->value.valueStr); INFO("[SOH] Variable %s is %s", args[1].c_str(), cvar->value.valueStr);
} }
else else