From a819b99eeb6aa2a5a545651595f913a67b97e52f Mon Sep 17 00:00:00 2001 From: Andrei Drexler Date: Tue, 21 May 2002 14:59:12 +0000 Subject: [PATCH] cg_RQ3_avidemo --- reaction/cgame/cg_local.h | 7 +++++ reaction/cgame/cg_main.c | 7 +++++ reaction/cgame/cg_view.c | 14 ++++++++- reaction/cgame/cgame.plg | 63 +++++++++++++++++++++++++++++++++++++-- 4 files changed, 88 insertions(+), 3 deletions(-) diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h index e0c72e2d..496abbe2 100644 --- a/reaction/cgame/cg_local.h +++ b/reaction/cgame/cg_local.h @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.80 2002/05/21 14:59:11 makro +// cg_RQ3_avidemo +// // Revision 1.79 2002/05/19 21:27:51 blaze // added force and buoyancy to breakables // @@ -711,6 +714,8 @@ typedef struct { int cvarCheckTime; // Elder: used for cvar cheat interval cycling + int screenshotTime; // Makro - avidemo with jpegs + int physicsTime; // either cg.snap->time or cg.nextSnap->time int timelimitWarnings; // 5 min, 1 min, overtime @@ -1635,6 +1640,8 @@ extern vmCvar_t cg_RQ3_bloodStyle; extern vmCvar_t cg_RQ3_strobe; //Niceass: Q2-like prediction (or lack of) // extern vmCvar_t cg_RQ3_oldpredict; +//Makro - avidemo with jpegs +extern vmCvar_t cg_RQ3_avidemo; extern vmCvar_t cg_drawFriend; extern vmCvar_t cg_teamChatsOnly; extern vmCvar_t cg_noVoiceChats; diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c index 8a3489d8..70fe6aa8 100644 --- a/reaction/cgame/cg_main.c +++ b/reaction/cgame/cg_main.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.68 2002/05/21 14:59:11 makro +// cg_RQ3_avidemo +// // Revision 1.67 2002/05/19 21:04:37 jbravo // Tkok popup system // @@ -297,6 +300,8 @@ vmCvar_t cg_RQ3_anouncer; vmCvar_t cg_RQ3_bloodStyle; //NiceAss: Temporary boolean strobe cvar vmCvar_t cg_RQ3_strobe; +//Makro: avidemo with jpegs +vmCvar_t cg_RQ3_avidemo; vmCvar_t cg_drawFriend; vmCvar_t cg_teamChatsOnly; vmCvar_t cg_noVoiceChats; @@ -511,6 +516,8 @@ static cvarTable_t cvarTable[] = { // bk001129 { &cg_oldRocket, "cg_oldRocket", "1", CVAR_ARCHIVE}, { &cg_oldPlasma, "cg_oldPlasma", "1", CVAR_ARCHIVE}, { &cg_trueLightning, "cg_trueLightning", "0.0", CVAR_ARCHIVE}, + //Makro - avidemo with jpegs + { &cg_RQ3_avidemo, "cg_RQ3_avidemo", "0", 0 }, // JBravo: added { &cg_RQ3_lca, "cg_RQ3_lca", "0", CVAR_ROM}, { &cg_RQ3_team_round_going, "cg_RQ3_team_round_going", "0", CVAR_ROM}, diff --git a/reaction/cgame/cg_view.c b/reaction/cgame/cg_view.c index ea9e555a..6c435a6d 100644 --- a/reaction/cgame/cg_view.c +++ b/reaction/cgame/cg_view.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.20 2002/05/21 14:59:11 makro +// cg_RQ3_avidemo +// // Revision 1.19 2002/03/07 14:51:57 makro // no message // @@ -1265,12 +1268,21 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView, qboolean demo //Makro - a Com_Error would be nicer //trap_Cvar_Set("RQ3_CvarKickReason", cheats[i].cvar ); //trap_SendConsoleCommand(va("disconnect\n")); - Com_Error( ERR_DISCONNECT, "WARNING: You have been disconnected from the server because %s was out of range (%1.3f - %1.3f)",cheats[i].cvar,cheats[i].low, cheats[i].high); + Com_Error( ERR_DISCONNECT, "WARNING: You have been disconnected from the server because %s was out of range (%f - %f)",cheats[i].cvar,cheats[i].low, cheats[i].high); } } } } + + //Makro - like cl_avidemo, just that it uses JPEG's + if (cg_RQ3_avidemo.integer > 0) { + //if it's time to take a screenshot + if (cg.time > cg.screenshotTime + (int) (1000 / cg_RQ3_avidemo.integer)) { + trap_SendConsoleCommand("screenshotJPEG silent\n"); + cg.screenshotTime = cg.time; + } + } } diff --git a/reaction/cgame/cgame.plg b/reaction/cgame/cgame.plg index 4ee5866c..d4e74dd3 100644 --- a/reaction/cgame/cgame.plg +++ b/reaction/cgame/cgame.plg @@ -3,14 +3,73 @@ 
 
Build Log

 

---------------------Configuration: cgame - Win32 Debug--------------------
+--------------------Configuration: cgame - Win32 Release--------------------
+

+
Command Lines

+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP53D.tmp" with contents
+[
+/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"Release/cgame.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
+"C:\Games\Quake3\rq3source\reaction\cgame\cg_view.c"
+]
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP53D.tmp" 
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP53E.tmp" with contents
+[
+/nologo /base:"0x30000000" /subsystem:windows /dll /incremental:no /pdb:"Release/cgamex86.pdb" /map:"Release/cgamex86.map" /machine:I386 /def:".\cgame.def" /out:"../Release/cgamex86.dll" /implib:"Release/cgamex86.lib" 
+.\Release\bg_misc.obj
+.\Release\bg_pmove.obj
+.\Release\bg_slidemove.obj
+.\Release\cg_consolecmds.obj
+.\Release\cg_draw.obj
+.\Release\cg_drawtools.obj
+.\Release\cg_effects.obj
+.\Release\cg_ents.obj
+.\Release\cg_event.obj
+.\Release\cg_info.obj
+.\Release\cg_localents.obj
+.\Release\cg_main.obj
+.\Release\cg_marks.obj
+.\Release\cg_players.obj
+.\Release\cg_playerstate.obj
+.\Release\cg_predict.obj
+.\Release\cg_scoreboard.obj
+.\Release\cg_servercmds.obj
+.\Release\cg_snapshot.obj
+.\Release\cg_syscalls.obj
+.\Release\cg_view.obj
+.\Release\cg_weapons.obj
+.\Release\q_math.obj
+.\Release\q_shared.obj
+.\Release\ui_shared.obj
+]
+Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP53E.tmp"
+
Output Window

+Compiling...
+cg_view.c
+Linking...
+   Creating library Release/cgamex86.lib and object Release/cgamex86.exp
+
+
+
+
Results

+cgamex86.dll - 0 error(s), 0 warning(s)
+

+--------------------Configuration: game - Win32 Release--------------------
 

 
Command Lines

 
 
 
 
Results

-cgamex86.dll - 0 error(s), 0 warning(s)
+qagamex86.dll - 0 error(s), 0 warning(s)
+

+--------------------Configuration: ui - Win32 Release TA--------------------
+

+
Command Lines

+
+
+
+
Results

+uix86.dll - 0 error(s), 0 warning(s)