fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

qccgui: reworked compile prints to split the screen instead of being some other window that's hidden when fullscreened etc.

Browse source 
splitscreen: split spectator setting into a per-seat setting. scoreboards are now also per-seat.
added parm_string global for richer map change stuff.
dpp7: fixed and reinstated.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5110 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2017-05-28 15:42:32 +00:00
parent 0fad8fe37d
commit 025aeff8a4
50 changed files with 1150 additions and 813 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engine/http/ftpclient.c
View file

@ -1,6 +1,6 @@
#include "quakedef.h"
#if 0//def WEBCLIENT
#ifdef FTPCLIENT
#include "iweb.h"

2
engine/http/ftpserver.c
View file

@ -8,7 +8,7 @@
#endif
#endif
#ifdef WEBSERVER
#ifdef FTPSERVER
#include "iweb.h"

6
engine/http/iweb.h
View file

@ -1,7 +1,9 @@
#ifndef IWEB_H__
#define IWEB_H__
#ifdef WEBSERVER
qboolean SV_AllowDownload (const char *name);
#if defined(WEBSERVER) || defined(FTPSERVER)
#ifdef WEBSVONLY
//When running standalone
@ -34,8 +36,6 @@ struct sockaddr;
struct sockaddr_qstorage;
int NetadrToSockadr (netadr_t *a, struct sockaddr_qstorage *s);
qboolean SV_AllowDownload (const char *name);
typedef qboolean iwboolean;

26
engine/http/iwebiface.c
View file

@ -1,6 +1,6 @@
#include "quakedef.h"
#ifdef WEBSERVER
#if defined(WEBSERVER) || defined(FTPSERVER)
#include "iweb.h"
#include "netinc.h"
@ -503,15 +503,18 @@ IWEBFILE *IWebFOpenRead(char *name) //fread(name, "rb");
#else
#if defined(WEBSERVER) || defined(FTPSERVER)
static cvar_t sv_readlevel = CVAR("sv_readlevel", "0"); //default to allow anyone
static cvar_t sv_writelevel = CVARD("sv_writelevel", "35", "Specifies the required trust level at which user accounts may write to the user-specific subdir of /uploads/USERNAME/*. If blank, then no uploads are permitted"); //allowed to write to uploads/uname
static cvar_t sv_fulllevel = CVARD("sv_fulllevel", "51", "User accounts with an access level greater than this may write anywhere, including the gamedir. Note that setting this low is increadibly risky. An empty value will be understood to never give this permission."); //allowed to write anywhere, replace any file...
#ifdef WEBSERVER
cvar_t ftpserver = CVAR("sv_ftp", "0");
cvar_t ftpserver_port = CVAR("sv_ftp_port", "21");
cvar_t httpserver = CVAR("sv_http", "0");
cvar_t httpserver_port = CVAR("sv_http_port", "80");
cvar_t sv_readlevel = CVAR("sv_readlevel", "0"); //default to allow anyone
cvar_t sv_writelevel = CVAR("sv_writelevel", "35"); //allowed to write to uploads/uname
cvar_t sv_fulllevel = CVAR("sv_fulllevel", "51"); //allowed to write anywhere, replace any file...
cvar_t sv_ftp_port_range = CVARD("sv_ftp_port_range", "0", "Specifies the port range for the server to create listening sockets for 'active' ftp connections, to work around NAT/firewall issues.\nMost FTP clients should use passive connections, but there's still some holdouts like windows.");
static cvar_t httpserver = CVAR("sv_http", "0");
static cvar_t httpserver_port = CVAR("sv_http_port", "80");
#endif
#ifdef FTPSERVER
static cvar_t ftpserver = CVAR("sv_ftp", "0");
static cvar_t ftpserver_port = CVAR("sv_ftp_port", "21");
static cvar_t sv_ftp_port_range = CVARD("sv_ftp_port_range", "0", "Specifies the port range for the server to create listening sockets for 'active' ftp connections, to work around NAT/firewall issues.\nMost FTP clients should use passive connections, but there's still some holdouts like windows.");
int IWebGetSafeListeningPort(void)
{
@ -533,6 +536,7 @@ int IWebGetSafeListeningPort(void)
return base + (sequence++ % (range+1-base));
}
#endif
#endif
//this file contains functions called from each side.
@ -680,9 +684,9 @@ int IWebAuthorize(const char *name, const char *password)
Rank_GetPlayerInfo(id, &info);
if (info.s.trustlevel >= sv_fulllevel.value)
if (*sv_fulllevel.string && info.s.trustlevel >= sv_fulllevel.value)
return IWEBACC_READ | IWEBACC_WRITE | IWEBACC_FULL; //allowed to read and write anywhere to the quake filesystem
if (info.s.trustlevel >= sv_writelevel.value)
if (*sv_writelevel.string && info.s.trustlevel >= sv_writelevel.value)
return IWEBACC_READ | IWEBACC_WRITE; //allowed to read anywhere write to specific places
if (info.s.trustlevel >= sv_readlevel.value)
return IWEBACC_READ; //read only anywhere

6
engine/http/webgen.c
View file

@ -1,11 +1,11 @@
#include "quakedef.h"
#ifdef WEBSERVER
#if defined(WEBSERVER) || defined(FTPSERVER)
#include "iweb.h"
#ifdef CLIENTONLY
vfsfile_t *IWebGenerateFile(char *name)
#if defined(CLIENTONLY) || !defined(WEBSERVER)
vfsfile_t *IWebGenerateFile(const char *name, const char *content, int contentlength)
{
return NULL;
}