This shuts down both the client and server
================
*/
+void PRVM_ProcessError(void);
static char hosterrorstring1[4096];
static char hosterrorstring2[4096];
static qboolean hosterror = false;
PR_Crash();
+ //PRVM_Crash(); // crash current prog
+
+ // crash all prvm progs
+ PRVM_CrashAll();
+
+ PRVM_ProcessError();
+
if (sv.active)
Host_ShutdownServer (false);
Host_InitLocal
======================
*/
+void Host_SaveConfig_f(void);
void Host_InitLocal (void)
{
Host_InitCommands ();
+
+ Cmd_AddCommand("saveconfig", Host_SaveConfig_f);
Cvar_RegisterVariable (&host_framerate);
Cvar_RegisterVariable (&host_speeds);
/*
===============
-Host_WriteConfiguration
+Host_SaveConfig_f
Writes key bindings and archived cvars to config.cfg
===============
*/
-void Host_WriteConfiguration (void)
+void Host_SaveConfig_f(void)
{
qfile_t *f;
extern cvar_t cl_avidemo;
qboolean Host_FilterTime (double time)
{
- double timecap;
+ double timecap, timeleft;
realtime += time;
if (slowmo.value < 0.0f)
Cvar_SetValue("cl_avidemo", 0.0f);
// check if framerate is too high
- if (cl_avidemo.value >= 0.1f)
+ if (!cls.timedemo)
{
- timecap = 1.0 / (double)cl_avidemo.value;
- if ((realtime - oldrealtime) < timecap)
- return false;
- }
- else if (!cls.timedemo)
- {
- // default to sys_ticrate (server framerate - presumably low) unless we're the active window and either connected to a server or playing a video
+ // default to sys_ticrate (server framerate - presumably low) unless we
+ // have a good reason to run faster
timecap = sys_ticrate.value;
- if (vid_activewindow && (cls.state == ca_connected || cl_videoplaying))
+ if (cl_avidemo.value >= 0.1f)
+ timecap = 1.0 / (double)cl_avidemo.value;
+ else if (vid_activewindow)
timecap = 1.0 / host_maxfps.value;
- if ((realtime - oldrealtime) < timecap)
+ timeleft = oldrealtime + timecap - realtime;
+ if (timeleft > 0)
+ {
+ // don't totally hog the CPU
+ if (timeleft >= 0.02)
+ Sys_Sleep();
return false;
+ }
}
// LordHavoc: copy into host_realframetime as well
static double time2 = 0;
static double time3 = 0;
int pass1, pass2, pass3;
+ usercmd_t cmd; // Used for receiving input
if (setjmp(host_abortserver))
return; // something bad happened, or the server disconnected
// decide the simulation time
if (!Host_FilterTime(time))
- {
- // if time was rejected, don't totally hog the CPU
- Sys_Sleep();
return;
- }
cl.islocalgame = NetConn_IsLocalGame();
// allow mice or other external controllers to add commands
IN_Commands();
+ // Collect input into cmd
+ IN_ProcessMove(&cmd);
+
// process console commands
Cbuf_Execute();
// if running the server locally, make intentions now
if (cls.state == ca_connected && sv.active)
- CL_SendCmd();
+ CL_SendCmd(&cmd);
//-------------------
//
// if running the server remotely, send intentions now after
// the incoming messages have been read
if (!sv.active)
- CL_SendCmd();
+ CL_SendCmd(&cmd);
CL_ReadFromServer();
}
- ui_update();
+ //ui_update();
CL_VideoFrame();
time2 = Sys_DoubleTime();
// update audio
- if (cls.signon == SIGNONS)
+ if (cls.signon == SIGNONS && cl.viewentity >= 0 && cl.viewentity < MAX_EDICTS && cl_entities[cl.viewentity].state_current.active)
{
// LordHavoc: this used to use renderer variables (eww)
- vec3_t forward, right, up;
- AngleVectors(cl.viewangles, forward, right, up);
- S_Update(cl_entities[cl.viewentity].render.origin, forward, right, up);
+ vec3_t forward, left, up, origin;
+ Matrix4x4_ToVectors(&cl_entities[cl.viewentity].render.matrix, forward, left, up, origin);
+ S_Update(origin, forward, left, up);
}
else
S_Update(vec3_origin, vec3_origin, vec3_origin, vec3_origin);
host_framecount++;
host_loopactive = true;
+
}
void Host_Frame (float time)
Host_InitLocal();
Key_Init();
Con_Init();
- Chase_Init();
- M_Init();
PR_Init();
+ PRVM_Init();
Mod_Init();
NetConn_Init();
SV_Init();
Con_DPrintf ("========Initialized=========\n");
if (cls.state != ca_dedicated)
+ {
VID_Open();
+ SCR_BeginLoadingPlaque();
+ MR_Init();
+ }
}
}
isdown = true;
- Host_WriteConfiguration ();
+ // Shutdown menu
+ if(MR_Shutdown)
+ MR_Shutdown();
+
+ // AK shutdown PRVM
+ // AK hmm, no PRVM_Shutdown(); yet
+
+
+ Host_SaveConfig_f();
CDAudio_Shutdown ();
NetConn_Shutdown ();
- S_Shutdown();
if (cls.state != ca_dedicated)
{