diff --git a/reaction/cgame/cg_ents.c b/reaction/cgame/cg_ents.c
index 7118fde7..d70f6fd4 100644
--- a/reaction/cgame/cg_ents.c
+++ b/reaction/cgame/cg_ents.c
@@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.36 2003/02/27 19:52:34 makro
+// dlights
+//
// Revision 1.35 2003/02/01 02:15:31 jbravo
// Replacement models and items
//
@@ -1174,8 +1177,18 @@ static void CG_Dlight(centity_t * cent)
if (cent->currentState.eventParm & DLIGHT_FLICKER)
i += rand() % 100 - 50;
+ //Makro - old code
+ /*
if (cent->currentState.eventParm & DLIGHT_PULSE)
i *= 1.0f + sin(2 * M_PI * cg.time / 1000.0f);
+ */
+ if (cent->currentState.eventParm & DLIGHT_PULSE)
+ {
+ float frequency = cent->currentState.frame / 1000.0f;
+ float phase = 2 * M_PI * (frequency * cg.time / 1000.0f + cent->currentState.generic1 / 1000.0f);
+ float i2 = cent->currentState.weapon;
+ i += sin(phase) * (i2-i);
+ }
if (cent->currentState.eventParm & DLIGHT_ADDITIVE)
trap_R_AddAdditiveLightToScene(cent->lerpOrigin, i, r, g, b);
diff --git a/reaction/cgame/cgame.plg b/reaction/cgame/cgame.plg
index 39d26daf..7b2fc803 100644
--- a/reaction/cgame/cgame.plg
+++ b/reaction/cgame/cgame.plg
@@ -6,6 +6,48 @@
--------------------Configuration: cgame - Win32 Release--------------------
Command Lines
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPE.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_ents.c"
+]
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPE.tmp"
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPF.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_atmospheric.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\RSPF.tmp"
+Output Window
+Compiling...
+cg_ents.c
+Linking...
+ Creating library Release/cgamex86.lib and object Release/cgamex86.exp
@@ -15,63 +57,6 @@ cgamex86.dll - 0 error(s), 0 warning(s)
--------------------Configuration: game - Win32 Release--------------------
Command Lines
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP78.tmp" with contents
-[
-/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"c:\reactionoutput/" /Fp"c:\reactionoutput/game.pch" /YX /Fo"c:\reactionoutput/" /Fd"c:\reactionoutput/" /FD /c
-"C:\Games\Quake3\rq3source\reaction\game\g_matchmode.c"
-"C:\Games\Quake3\rq3source\reaction\game\g_misc.c"
-]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP78.tmp"
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP79.tmp" with contents
-[
-kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"c:\reactionoutput/qagamex86.pdb" /map:"c:\reactionoutput/qagamex86.map" /machine:I386 /def:".\game.def" /out:"..\Release/qagamex86.dll" /implib:"c:\reactionoutput/qagamex86.lib"
-\reactionoutput\ai_chat.obj
-\reactionoutput\ai_cmd.obj
-\reactionoutput\ai_dmnet.obj
-\reactionoutput\ai_dmq3.obj
-\reactionoutput\ai_main.obj
-\reactionoutput\ai_team.obj
-\reactionoutput\ai_vcmd.obj
-\reactionoutput\bg_misc.obj
-\reactionoutput\bg_pmove.obj
-\reactionoutput\bg_slidemove.obj
-\reactionoutput\g_active.obj
-\reactionoutput\g_arenas.obj
-\reactionoutput\g_bot.obj
-\reactionoutput\g_client.obj
-\reactionoutput\g_cmds.obj
-\reactionoutput\g_combat.obj
-\reactionoutput\g_fileio.obj
-\reactionoutput\g_items.obj
-\reactionoutput\g_main.obj
-\reactionoutput\g_matchmode.obj
-\reactionoutput\g_mem.obj
-\reactionoutput\g_misc.obj
-\reactionoutput\g_missile.obj
-\reactionoutput\g_mover.obj
-\reactionoutput\g_session.obj
-\reactionoutput\g_spawn.obj
-\reactionoutput\g_svcmds.obj
-\reactionoutput\g_syscalls.obj
-\reactionoutput\g_target.obj
-\reactionoutput\g_team.obj
-\reactionoutput\g_teamplay.obj
-\reactionoutput\g_trigger.obj
-\reactionoutput\g_utils.obj
-\reactionoutput\g_weapon.obj
-\reactionoutput\q_math.obj
-\reactionoutput\q_shared.obj
-\reactionoutput\rxn_game.obj
-\reactionoutput\zcam.obj
-\reactionoutput\zcam_target.obj
-]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP79.tmp"
-Output Window
-Compiling...
-g_matchmode.c
-g_misc.c
-Linking...
- Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp
@@ -81,32 +66,6 @@ qagamex86.dll - 0 error(s), 0 warning(s)
--------------------Configuration: ui - Win32 Release TA--------------------
Command Lines
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP7D.tmp" with contents
-[
-/nologo /G6 /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /Fp"Release_TA/ta_ui.pch" /YX /Fo"Release_TA/" /Fd"Release_TA/" /FD /c
-"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_main.c"
-]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP7D.tmp"
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP7E.tmp" with contents
-[
-/nologo /base:"0x40000000" /dll /incremental:no /pdb:"Release_TA/uix86.pdb" /map:"Release_TA/uix86.map" /machine:I386 /def:".\ui.def" /out:"../Release/uix86.dll" /implib:"Release_TA/uix86.lib"
-.\Release_TA\bg_misc.obj
-.\Release_TA\q_math.obj
-.\Release_TA\q_shared.obj
-.\Release_TA\ui_atoms.obj
-.\Release_TA\ui_gameinfo.obj
-.\Release_TA\ui_main.obj
-.\Release_TA\ui_players.obj
-.\Release_TA\ui_shared.obj
-.\Release_TA\ui_syscalls.obj
-.\Release_TA\ui_util.obj
-]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP7E.tmp"
-Output Window
-Compiling...
-ui_main.c
-Linking...
- Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp
diff --git a/reaction/game/g_misc.c b/reaction/game/g_misc.c
index a05030fc..335a40c3 100644
--- a/reaction/game/g_misc.c
+++ b/reaction/game/g_misc.c
@@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.65 2003/02/27 19:52:34 makro
+// dlights
+//
// Revision 1.64 2003/02/13 21:19:50 makro
// no message
//
@@ -247,13 +250,16 @@ void SP_dlight(gentity_t * ent)
ent->s.eventParm |= DLIGHT_FLICKER;
if (ent->spawnflags & 4)
ent->s.eventParm |= DLIGHT_PULSE;
+ //Makro - removed
+ /*
if (ent->spawnflags & 8)
ent->s.eventParm |= DLIGHT_STROBE;
+ */
//Makro - added START_OFF flag
ent->use = use_dlight;
ent->unbreakable = qfalse;
- if (ent->spawnflags & 16) {
+ if (ent->spawnflags & 8) {
ent->unbreakable = qtrue;
ent->use(ent, NULL, NULL);
}
@@ -277,8 +283,16 @@ void SP_dlight(gentity_t * ent)
ent->s.constantLight = r | (g << 8) | (b << 16) | (i << 24);
+ //Makro - added frequency, phase and light2
+ G_SpawnFloat("frequency", "2", &light);
+ ent->s.frame = light * 1000;
+ G_SpawnFloat("phase", "0", &light);
+ ent->s.generic1 = light * 1000;
+ G_SpawnFloat("light2", "0", &light);
+ ent->s.weapon = light;
+
ent->s.eType = ET_DLIGHT;
- ent->classname = "light_d";
+ ent->classname = "func_dlite";
ent->s.pos.trType = TR_STATIONARY;
VectorCopy(ent->s.origin, ent->r.currentOrigin);
diff --git a/reaction/game/g_spawn.c b/reaction/game/g_spawn.c
index c0ebdef5..c6bb2c1f 100644
--- a/reaction/game/g_spawn.c
+++ b/reaction/game/g_spawn.c
@@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.43 2003/02/27 19:52:34 makro
+// dlights
+//
// Revision 1.42 2003/01/06 00:23:29 makro
// no message
//
@@ -367,7 +370,8 @@ spawn_t spawns[] = {
{"target_push", SP_target_push},
{"light", SP_light},
- {"light_d", SP_dlight}, // Elder: dlight entity
+ {"func_dlite", SP_dlight}, // Elder: dlight entity
+ {"light_d", SP_dlight}, //Makro - for compatibility with older maps
{"path_corner", SP_path_corner},
{"misc_teleporter_dest", SP_misc_teleporter_dest},
diff --git a/reaction/game/game.plg b/reaction/game/game.plg
index f690f068..e5315bf7 100644
--- a/reaction/game/game.plg
+++ b/reaction/game/game.plg
@@ -3,16 +3,26 @@
Build Log
+--------------------Configuration: cgame - Win32 Release--------------------
+
+Command Lines
+
+
+
+Results
+cgamex86.dll - 0 error(s), 0 warning(s)
+
--------------------Configuration: game - Win32 Release--------------------
Command Lines
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPC8.tmp" with contents
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP68.tmp" with contents
[
/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"c:\reactionoutput/" /Fp"c:\reactionoutput/game.pch" /YX /Fo"c:\reactionoutput/" /Fd"c:\reactionoutput/" /FD /c
"C:\Games\Quake3\rq3source\reaction\game\g_misc.c"
+"C:\Games\Quake3\rq3source\reaction\game\g_spawn.c"
]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPC8.tmp"
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPC9.tmp" with contents
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP68.tmp"
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP69.tmp" with contents
[
kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"c:\reactionoutput/qagamex86.pdb" /map:"c:\reactionoutput/qagamex86.map" /machine:I386 /def:".\game.def" /out:"..\Release/qagamex86.dll" /implib:"c:\reactionoutput/qagamex86.lib"
\reactionoutput\ai_chat.obj
@@ -55,10 +65,11 @@ kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows
\reactionoutput\zcam.obj
\reactionoutput\zcam_target.obj
]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPC9.tmp"
+Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP69.tmp"
Output Window
Compiling...
g_misc.c
+g_spawn.c
Linking...
Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp
@@ -66,6 +77,15 @@ Linking...
Results
qagamex86.dll - 0 error(s), 0 warning(s)
+
+--------------------Configuration: ui - Win32 Release TA--------------------
+
+Command Lines
+
+
+
+Results
+uix86.dll - 0 error(s), 0 warning(s)