jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-04-04 02:00:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #367 from winterheart/lnxcontroller

Browse Source 
Reordering linux modules, cleanup code
This commit is contained in:
Louis Gombert
2024-05-22 18:37:18 +00:00
committed by GitHub
parent dc143a9e25 4b78b7068d
commit f5d5ea947b
45 changed files with 104 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/DallasFuncs.cpp
View File

@@ -1217,14 +1217,11 @@ Parameters:
$$END
*/
void aShowHUDMessage(const char *format, ...) {
#if defined(__LINUX__)
#define _vsnprintf vsnprintf
#endif
msafe_struct mstruct;
va_list args;
va_start(args, format);
_vsnprintf(mstruct.message, sizeof(mstruct.message) - 1, format, args);
vsnprintf(mstruct.message, sizeof(mstruct.message) - 1, format, args);
va_end(args);
mstruct.message[sizeof(mstruct.message) - 1] = 0; // if message too long, vsnprintf() won't terminate
@@ -1252,7 +1249,7 @@ void aShowHUDMessageObj(const char *format, int objhandle, ...) {
va_list args;
va_start(args, objhandle);
_vsnprintf(mstruct.message, sizeof(mstruct.message) - 1, format, args);
vsnprintf(mstruct.message, sizeof(mstruct.message) - 1, format, args);
va_end(args);
mstruct.message[sizeof(mstruct.message) - 1] = 0; // if message too long, vsnprintf() won't terminate
@@ -1283,7 +1280,7 @@ void aShowColoredHUDMessage(int red, int green, int blue, const char *format, ..
va_list args;
va_start(args, format);
_vsnprintf(mstruct.message, sizeof(mstruct.message) - 1, format, args);
vsnprintf(mstruct.message, sizeof(mstruct.message) - 1, format, args);
va_end(args);
mstruct.message[sizeof(mstruct.message) - 1] = 0; // if message too long, vsnprintf() won't terminate
@@ -1314,7 +1311,7 @@ void aShowColoredHUDMessageObj(int red, int green, int blue, const char *format,
va_list args;
va_start(args, objhandle);
_vsnprintf(mstruct.message, sizeof(mstruct.message) - 1, format, args);
vsnprintf(mstruct.message, sizeof(mstruct.message) - 1, format, args);
va_end(args);
mstruct.message[sizeof(mstruct.message) - 1] = 0; // if message too long, vsnprintf() won't terminate