mirror of
https://git.code.sf.net/p/quake/newtree
synced 2025-02-01 12:20:54 +00:00
^M cleanup, and qw-server compiles with -Werror
This commit is contained in:
parent
e947605cc5
commit
b139acafc2
104 changed files with 21255 additions and 21263 deletions
|
@ -6,9 +6,9 @@ EXE_libs=
|
|||
DIRECTORIES=
|
||||
vpath %.a $(patsubst @%,%,$(DIRECTORIES)) /usr/lib
|
||||
|
||||
CPPFLAGS=-I . -I ../include -DELF -Did386=1 -Dstricmp=strcasecmp -MMD -DSERVERONLY
|
||||
CFLAGS=-Wall #-Werror
|
||||
CXXFLAGS=-Wall #-Werror
|
||||
CPPFLAGS=-I . -I ../include -DELF -Did386=1 -MMD -Dstricmp=strcasecmp -DSERVERONLY
|
||||
CFLAGS=-Wall -Werror
|
||||
CXXFLAGS=-Wall -Werror
|
||||
LDFLAGS=
|
||||
|
||||
CC=gcc
|
||||
|
|
|
@ -2173,10 +2173,6 @@ static byte chktbl[1024 + 4] = {
|
|||
0x00,0x00,0x00,0x00
|
||||
};
|
||||
|
||||
static byte chkbuf[16 + 60 + 4];
|
||||
|
||||
static unsigned last_mapchecksum = 0;
|
||||
|
||||
#if 0
|
||||
/*
|
||||
====================
|
||||
|
|
|
@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
#include "quakedef.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
|
@ -328,7 +329,6 @@ qboolean Netchan_Process (netchan_t *chan)
|
|||
#ifdef SERVERONLY
|
||||
int qport;
|
||||
#endif
|
||||
int i;
|
||||
|
||||
if (
|
||||
#ifndef SERVERONLY
|
||||
|
|
|
@ -158,9 +158,6 @@ qboolean NET_StringToAdr (char *s, netadr_t *a)
|
|||
// the IP is NOT one of our interfaces.
|
||||
qboolean NET_IsClientLegal(netadr_t *adr)
|
||||
{
|
||||
struct sockaddr_in sadr;
|
||||
int newsocket;
|
||||
|
||||
#if 0
|
||||
if (adr->ip[0] == 127)
|
||||
return false; // no local connections period
|
||||
|
|
|
@ -775,7 +775,7 @@ SpectatorMove
|
|||
*/
|
||||
void SpectatorMove (void)
|
||||
{
|
||||
float speed, drop, friction, control, newspeed, accel;
|
||||
float speed, drop, friction, control, newspeed;
|
||||
float currentspeed, addspeed, accelspeed;
|
||||
int i;
|
||||
vec3_t wishvel;
|
||||
|
|
|
@ -1300,9 +1300,7 @@ MESSAGE WRITING
|
|||
|
||||
sizebuf_t *WriteDest (void)
|
||||
{
|
||||
int entnum;
|
||||
int dest;
|
||||
edict_t *ent;
|
||||
|
||||
dest = G_FLOAT(OFS_PARM0);
|
||||
switch (dest)
|
||||
|
|
|
@ -186,6 +186,7 @@ void SV_DropClient (client_t *drop)
|
|||
MSG_WriteByte (&drop->netchan.message, svc_disconnect);
|
||||
|
||||
if (drop->state == cs_spawned)
|
||||
{
|
||||
if (!drop->spectator)
|
||||
{
|
||||
// call the prog function for removing a client
|
||||
|
@ -200,7 +201,7 @@ void SV_DropClient (client_t *drop)
|
|||
pr_global_struct->self = EDICT_TO_PROG(drop->edict);
|
||||
PR_ExecuteProgram (SpectatorDisconnect);
|
||||
}
|
||||
|
||||
}
|
||||
if (drop->spectator)
|
||||
Con_Printf ("Spectator %s removed\n",drop->name);
|
||||
else
|
||||
|
@ -1515,10 +1516,12 @@ void SV_ExtractFromUserinfo (client_t *cl)
|
|||
p = val;
|
||||
|
||||
if (val[0] == '(')
|
||||
{
|
||||
if (val[2] == ')')
|
||||
p = val + 3;
|
||||
else if (val[3] == ')')
|
||||
p = val + 4;
|
||||
}
|
||||
|
||||
sprintf(newname, "(%d)%-.40s", dupc++, p);
|
||||
Info_SetValueForKey (cl->userinfo, "name", newname, MAX_INFO_STRING);
|
||||
|
|
|
@ -37,6 +37,8 @@ extern int fp_messages, fp_persecond, fp_secondsdead;
|
|||
extern char fp_msg[];
|
||||
extern cvar_t pausable;
|
||||
|
||||
void SV_FullClientUpdateToClient (client_t *client, client_t *cl);
|
||||
|
||||
/*
|
||||
============================================================
|
||||
|
||||
|
@ -573,11 +575,8 @@ SV_NextUpload
|
|||
*/
|
||||
void SV_NextUpload (void)
|
||||
{
|
||||
byte buffer[1024];
|
||||
int r;
|
||||
int percent;
|
||||
int size;
|
||||
client_t *client;
|
||||
|
||||
if (!*host_client->uploadfn) {
|
||||
SV_ClientPrintf(host_client, PRINT_HIGH, "Upload denied\n");
|
||||
|
@ -914,8 +913,6 @@ SV_Pause_f
|
|||
*/
|
||||
void SV_Pause_f (void)
|
||||
{
|
||||
int i;
|
||||
client_t *cl;
|
||||
char st[sizeof(host_client->name) + 32];
|
||||
|
||||
if (!pausable.value) {
|
||||
|
|
|
@ -212,7 +212,7 @@ void Sys_Init (void)
|
|||
main
|
||||
=============
|
||||
*/
|
||||
void main(int argc, char *argv[])
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
double time, oldtime, newtime;
|
||||
quakeparms_t parms;
|
||||
|
@ -279,5 +279,6 @@ void main(int argc, char *argv[])
|
|||
if (sys_extrasleep.value)
|
||||
usleep (sys_extrasleep.value);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue