mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-10 06:31:56 +00:00
Synced some code between UQ/QW.
This commit is contained in:
Marcus Sundberg
parent
fe555bd14e
commit
636b73cc11
5 changed files with 29 additions and 32 deletions
|
|
@ -498,11 +498,10 @@ char *Key_KeynumToString (int keynum);
|
|||
// cl_demo.c
|
||||
//
|
||||
void CL_StopPlayback (void);
|
||||
int CL_GetMessage (void);
|
||||
#ifdef QUAKEWORLD
|
||||
qboolean CL_GetMessage (void);
|
||||
void CL_WriteDemoCmd (usercmd_t *pcmd);
|
||||
#elif defined(UQUAKE)
|
||||
int CL_GetMessage (void);
|
||||
void CL_SignonReply (void);
|
||||
#endif // QUAKEWORLD else UQUAKE
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
cl_demo.c - demo functions
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Portions Copyright (C) 1999,2000 Nelson Rush.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
|
|
@ -13,7 +14,7 @@ This program is distributed in the hope that it will be useful,
|
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the included (GNU.txt) GNU General Public License for more details.
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
|
|
@ -55,9 +56,9 @@ void CL_StopPlayback (void)
|
|||
return;
|
||||
|
||||
Qclose (cls.demofile);
|
||||
cls.demoplayback = 0;
|
||||
cls.demofile = NULL;
|
||||
cls.state = ca_disconnected;
|
||||
cls.demoplayback = 0;
|
||||
|
||||
if (cls.timedemo)
|
||||
CL_FinishTimeDemo ();
|
||||
|
|
@ -263,7 +264,7 @@ CL_GetMessage
|
|||
Handles recording and playback of demos, on top of NET_ code
|
||||
====================
|
||||
*/
|
||||
qboolean CL_GetMessage (void)
|
||||
int CL_GetMessage(void)
|
||||
{
|
||||
if (cls.demoplayback)
|
||||
return CL_GetDemoMessage ();
|
||||
|
|
|
|||
|
|
@ -72,9 +72,8 @@ char *svc_strings[] =
|
|||
"svc_foundsecret",
|
||||
"svc_spawnstaticsound",
|
||||
"svc_intermission",
|
||||
"svc_finale",
|
||||
|
||||
"svc_cdtrack",
|
||||
"svc_finale", // [string] music [string] text
|
||||
"svc_cdtrack", // [byte] track [byte] looptrack
|
||||
"svc_sellscreen",
|
||||
|
||||
"svc_smallkick",
|
||||
|
|
@ -118,8 +117,7 @@ char *svc_strings[] =
|
|||
int oldparsecountmod;
|
||||
int parsecountmod;
|
||||
double parsecounttime;
|
||||
|
||||
int cl_spikeindex, cl_playerindex, cl_flagindex;
|
||||
int cl_spikeindex, cl_playerindex, cl_flagindex;
|
||||
|
||||
//=============================================================================
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
/*
|
||||
cl_demo.c - demo functions for uquake
|
||||
cl_demo.c - demo functions
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Portions Copyright (C) 1999,2000 Nelson Rush.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
Please see the file "AUTHORS" for a list of contributors
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
|
@ -20,15 +22,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
*/
|
||||
|
||||
#include <qtypes.h>
|
||||
#include <client.h>
|
||||
#include <quakedef.h>
|
||||
#include <net.h>
|
||||
#include <sys.h>
|
||||
#include <mathlib.h>
|
||||
#include <cmd.h>
|
||||
#include <console.h>
|
||||
#include <protocol.h>
|
||||
#include "quakedef.h"
|
||||
#include "pmove_simple.h"
|
||||
#include "qtypes.h"
|
||||
#include "client.h"
|
||||
#include "console.h"
|
||||
#include "mathlib.h"
|
||||
|
||||
void CL_FinishTimeDemo (void);
|
||||
|
||||
|
|
@ -58,7 +57,7 @@ void CL_StopPlayback (void)
|
|||
return;
|
||||
|
||||
Qclose (cls.demofile);
|
||||
cls.demoplayback = false;
|
||||
cls.demoplayback = 0;
|
||||
cls.demofile = NULL;
|
||||
cls.state = ca_disconnected;
|
||||
|
||||
|
|
@ -97,9 +96,9 @@ CL_GetMessage
|
|||
Handles recording and playback of demos, on top of NET_ code
|
||||
====================
|
||||
*/
|
||||
int CL_GetMessage (void)
|
||||
int CL_GetMessage(void)
|
||||
{
|
||||
int r, i;
|
||||
int r, i;
|
||||
float f;
|
||||
|
||||
if (cls.demoplayback)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
/*
|
||||
cl_parse.c - parse a message received from the server
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Copyright (C) 1999,2000 contributors of the QuakeForge project
|
||||
Please see the file "AUTHORS" for a list of contributors
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
|
@ -19,18 +21,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
|
||||
*/
|
||||
|
||||
#include <qtypes.h>
|
||||
#include <quakedef.h>
|
||||
#include <protocol.h>
|
||||
#include <sound.h>
|
||||
#include <net.h>
|
||||
#include <sys.h>
|
||||
#include <model.h>
|
||||
#include <pmove.h>
|
||||
#include <console.h>
|
||||
#include <sbar.h>
|
||||
#include <mathlib.h>
|
||||
#include <sound.h>
|
||||
#include <cdaudio.h>
|
||||
#include <sbar.h>
|
||||
#include <screen.h>
|
||||
#include <lib_replace.h>
|
||||
#include <cmd.h>
|
||||
#include <cvars.h>
|
||||
#include <client.h>
|
||||
#include <server.h>
|
||||
|
||||
|
|
@ -82,9 +83,9 @@ char *svc_strings[] =
|
|||
"svc_cutscene"
|
||||
};
|
||||
|
||||
int cl_spikeindex, cl_playerindex, cl_flagindex;
|
||||
int parsecountmod;
|
||||
double parsecounttime;
|
||||
int cl_spikeindex, cl_playerindex, cl_flagindex;
|
||||
|
||||
//=============================================================================
|
||||
|
||||
|
|
@ -786,4 +787,3 @@ void CL_ParseServerMessage (void)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue