fallout2sfall/int2ssl
0
0
Fork 0
mirror of https://github.com/sfall-team/int2ssl.git synced 2026-07-27 16:52:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler warning

Browse Source
This commit is contained in:
Wipe
2023-07-02 14:07:08 +02:00
parent 557e243968
commit d8f959379d
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FalloutScript.h
+19
View File
@@ -11,6 +11,8 @@
#define FALLOUT_SCRIPT_H
// C++ standard includes
#include <cstring> // for std::memcpy() / int2ssl::bit_cast<>
#include <memory> // for std::addressof() / int2ssl::bit_cast<>
#include <vector>
// int2ssl includes
@@ -125,4 +127,21 @@ private:
std::vector<std::string> m_GlobalVarsNames;
};
namespace int2ssl
{
// https://en.cppreference.com/w/cpp/numeric/bit_cast
template<class T, class F>
T bit_cast(const F& f)
{
static_assert(sizeof(T) == sizeof(F), "Types must match sizes");
static_assert(std::is_pod<F>::value, "Requires POD input");
static_assert(std::is_pod<T>::value, "Requires POD output");
T t;
std::memcpy(std::addressof(t), std::addressof(f), sizeof(T));
return t;
}
}
#endif //FALLOUT_SCRIPT_H
FalloutScriptDump.cpp
+3 -3
View File
@@ -73,7 +73,7 @@ void CFalloutScript::Dump()
i,
m_GlobalVar[i].GetAttributes().m_strMnemonic.c_str(),
ulArgument,
*((float*)(&ulArgument))) << std::endl;
int2ssl::bit_cast<float>(ulArgument)) << std::endl;
}
}
}
@@ -113,7 +113,7 @@ void CFalloutScript::Dump()
case COpcode::O_FLOATOP:
g_ofstream << format("%s := %05f",
m_Namespace[ulNameArgument].c_str(),
*((float*)(&ulArgument))) << std::endl;
int2ssl::bit_cast<float>(ulArgument)) << std::endl;
}
}
}
@@ -156,7 +156,7 @@ void CFalloutScript::Dump()
wOperator,
ulArgument,
m_ProcBodies[nIndexOfProc][i].m_Opcode.GetAttributes().m_strMnemonic.c_str(),
*((float*)(&ulArgument))) << std::endl;
int2ssl::bit_cast<float>(ulArgument)) << std::endl;
break;
default:
FalloutScriptStore.cpp
+3 -3
View File
@@ -104,7 +104,7 @@ void CFalloutScript::StoreDefinitions()
break;
case COpcode::O_FLOATOP:
strDefinition = format(strDefinition + " := %.5f", *((float*)(&ulVarValue)));
strDefinition = format(strDefinition + " := %.5f", int2ssl::bit_cast<float>(ulVarValue));
break;
case COpcode::O_INTOP:
@@ -249,7 +249,7 @@ void CFalloutScript::StoreDefinitions()
break;
case COpcode::O_FLOATOP:
strDefinition = format(strDefinition + " := %.5f", *((float*)(&defObject.m_ulVarValue)));
strDefinition = format(strDefinition + " := %.5f", int2ssl::bit_cast<float>(defObject.m_ulVarValue));
break;
case COpcode::O_INTOP:
@@ -548,7 +548,7 @@ std::string CFalloutScript::GetSource(CNode& node, bool bLabel, uint32_t ulNumAr
break;
case COpcode::O_FLOATOP:
strResult = format("%.5f", *((float*)(&ulArgument)));
strResult = format("%.5f", int2ssl::bit_cast<float>(ulArgument));
break;
case COpcode::O_INTOP: