FlightSim-Streaming/XPlaneConnectCSP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed various type inconsistencies to remove warning when building on Windows

Browse Source
This commit is contained in:
Jason Watkins
2015-04-14 15:49:25 -07:00
parent 118af68620
commit 8591db96c0
9 changed files with 65 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
xpcPlugin/MessageHandlers.cpp
View File

@@ -205,7 +205,7 @@ namespace XPC
float thr = *((float*)(buffer + 17));
std::int8_t gear = buffer[21];
float flaps = *((float*)(buffer + 22));
float aircraft = 0;
std::uint8_t aircraft = 0;
if (size == 27)
{
aircraft = buffer[26];
@@ -241,7 +241,27 @@ namespace XPC
// Parse data
const std::uint8_t* buffer = msg.GetBuffer();
std::size_t size = msg.GetSize();
std::uint8_t numCols = (size - 5) / 36;
std::size_t numCols = (size - 5) / 36;
if (numCols > 0)
{
#if LOG_VERBOSITY > 3
Log::FormatLine("[DATA] Message Received (Conn %i)", connection.id);
#endif
}
if (numCols > 32) // Error. Will overflow values
{
#if LOG_VERBOSITY > 2
Log::FormatLine("[DATA] ERROR numCols to large.");
#endif
return;
}
else
{
#if LOG_VERBOSITY > 2
Log::FormatLine("[DATA] WARNING: Empty data packet received (Conn %i)", connection.id);
#endif
return;
}
float values[32][9];
for (int i = 0; i < numCols; ++i)
{
@@ -250,19 +270,6 @@ namespace XPC
}
// Update log
#if LOG_VERBOSITY > 1
if (numCols > 0)
{
// UPDATE LOG
Log::FormatLine("[DATA] Message Received (Conn %i)", connection.id);
}
else
{
// UPDATE LOG
Log::FormatLine("[DATA] WARNING: Empty data packet received (Conn %i)", connection.id);
return;
}
#endif
float savedAlpha = -998;
float savedHPath = -998;
@@ -449,7 +456,7 @@ namespace XPC
for (int i = 0; i < drefCount; ++i)
{
float values[255];
std::size_t count = DataManager::Get(connection.getdRequest[i], values, 255);
int count = DataManager::Get(connection.getdRequest[i], values, 255);
response[cur++] = count;
memcpy(response + cur, values, count * sizeof(float));
cur += count * sizeof(float);