jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-05-13 16:00:14 -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

13
scripts/linux_lib.cpp
View File

@@ -16,14 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
void _splitpath(const char *path, char *drive, char *dir, char *fname, char *ext);
int _vsnprintf(char *buffer, size_t count, const char *format, va_list argptr);
int stricmp(const char *string1, const char *string2);
#include <cstring>
void _splitpath(const char *srcPath, char *drive, char *path, char *filename, char *ext) {
int pathStart = -1;
@@ -103,8 +96,4 @@ void _splitpath(const char *srcPath, char *drive, char *path, char *filename, ch
}
}
int _vsnprintf(char *buffer, size_t count, const char *format, va_list argptr) {
return vsnprintf(buffer, count, format, argptr);
}
int stricmp(const char *string1, const char *string2) { return strcasecmp(string1, string2); }

7
scripts/linux_lib.h
View File

@@ -19,12 +19,11 @@
#ifndef __LINUX_LIB_H_
#define __LINUX_LIB_H_
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <cstdio>
#include <cstdlib>
#include <cstdarg>
void _splitpath(const char *path, char *drive, char *dir, char *fname, char *ext);
int _vsnprintf(char *buffer, size_t count, const char *format, va_list argptr);
int stricmp(const char *string1, const char *string2);
#endif

8
scripts/osiris_import.h
View File

@@ -25,13 +25,7 @@
#include "osiris_common.h"
#ifdef __LINUX__
#ifndef MACOSX
// typedef unsigned int size_t;
#endif
#include <stdarg.h>
void _splitpath(const char *path, char *drive, char *dir, char *fname, char *ext);
int _vsnprintf(char *buffer, size_t count, const char *format, va_list argptr);
int stricmp(const char *string1, const char *string2);
#include "linux_lib.h"
#endif
// ===========================================================