blendo/thirtyflightsofloving
0
0
Fork 0
mirror of https://github.com/blendogames/thirtyflightsofloving.git synced 2025-01-18 06:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Missed a couple of things from Linux finishing changes.

Browse source
This commit is contained in:
Knightmare66 2021-11-18 01:26:32 -05:00
parent e7eca9e3ff
commit 52efbae77d
4 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qcommon/filesystem.h
View file

@ -32,8 +32,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../unix/zip/unzip.h"
#include "../unix/zip/zip.h"
#else // _WIN32
#include <minizip/unzip.h>
#include <minizip/zip.h>
//#include <minizip/unzip.h>
//#include <minizip/zip.h>
// KMQ2 MacOSX port builds with the above, but the below should work as well.
#include "../unix/zip/unzip.h"
#include "../unix/zip/zip.h"
#endif // _WIN32
#define BASEDIRNAME "baseq2"

1
unix/glw_unix.h
View file

@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__)
#error You shouldn't be including this file on non-Linux platforms
#endif
#endif
#ifndef __GLW_UNIX_H__
#define __GLW_UNIX_H__

30
unix/in_unix.c
View file

@ -174,6 +174,34 @@ void IN_Move (usercmd_t *cmd)
cmd->forwardmove -= m_forward->value * my;
mx = my = 0;
// flibitijibibo added
if (!in_joystick->value)
{
return;
}
// add controller movement to cmd
if ( (in_speed.state & 1) ^ (int)cl_run->value)
speed = 2;
else
speed = 1;
aspeed = speed * cls.netFrameTime;
cmd->sidemove += controller_leftx * speed * cl_sidespeed->value;
cmd->forwardmove -= controller_lefty * speed * cl_forwardspeed->value;
if (in_autosensitivity->integer && cl.base_fov < 90)
{
cl.viewangles[YAW] -= controller_rightx * aspeed * cl_pitchspeed->value * (cl.refdef.fov_x/90.0);
cl.viewangles[PITCH] += controller_righty * aspeed * cl_pitchspeed->value * (cl.refdef.fov_x/90.0);
}
else
{
cl.viewangles[YAW] -= controller_rightx * aspeed * cl_pitchspeed->value;
cl.viewangles[PITCH] += controller_righty * aspeed * cl_pitchspeed->value;
}
// end flibitijibibo
}
void IN_Frame (void)
@ -185,6 +213,4 @@ void IN_Frame (void)
IN_Activate(false);
else
IN_Activate(true);
}

2
unix/sys_unix.c
View file

@ -243,7 +243,7 @@ void *Sys_GetGameAPI (void *parms)
char curpath[MAX_OSPATH];
char *path;
#ifdef (__APPLE__)
#ifdef __APPLE__
// KMQ2 MacOSX port uses the Fruitz of Dojo plug system. So this will go unused.
#define LIB_SUFFIX "dylib"
#else