improve console text parsing a little (now handles \r line endings as well as \n...

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index d695f3bf98557c47ae57a378686f4654b9a83203..97669a558e535bfab93c5cc3e259b574eb3fc5e8 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -272,7 +272,7 @@ void SV_SendServerinfo (client_t *client)
        MSG_WriteString (&client->message,message);
 
        MSG_WriteByte (&client->message, svc_serverinfo);
-       MSG_WriteLong (&client->message, PROTOCOL_DARKPLACES4);
+       MSG_WriteLong (&client->message, PROTOCOL_DARKPLACES5);
        MSG_WriteByte (&client->message, svs.maxclients);
 
        if (!coop.integer && deathmatch.integer)
@@ -816,7 +816,29 @@ void SV_PrepareEntitiesForSending(void)
                cs.lightstyle = (qbyte)GETEDICTFIELDVALUE(ent, eval_style)->_float;
                cs.lightpflags = (qbyte)GETEDICTFIELDVALUE(ent, eval_pflags)->_float;
 
-               cs.specialvisibilityradius = cs.light[3];
+               if (gamemode == GAME_TENEBRAE)
+               {
+                       // tenebrae's EF_FULLDYNAMIC conflicts with Q2's EF_NODRAW
+                       if (cs.effects & 16)
+                       {
+                               cs.effects &= ~16;
+                               cs.lightpflags |= PFLAGS_FULLDYNAMIC;
+                       }
+                       // tenebrae's EF_GREEN conflicts with DP's EF_ADDITIVE
+                       if (cs.effects & 32)
+                       {
+                               cs.effects &= ~32;
+                               cs.light[0] = 0.2;
+                               cs.light[1] = 1;
+                               cs.light[2] = 0.2;
+                               cs.light[3] = 200;
+                               cs.lightpflags |= PFLAGS_FULLDYNAMIC;
+                       }
+               }
+
+               cs.specialvisibilityradius = 0;
+               if (cs.lightpflags & PFLAGS_FULLDYNAMIC)
+                       cs.specialvisibilityradius = max(cs.specialvisibilityradius, cs.light[3]);
                if (cs.glowsize)
                        cs.specialvisibilityradius = max(cs.specialvisibilityradius, cs.glowsize * 4);
                if (cs.flags & RENDER_GLOWTRAIL)
@@ -1295,9 +1317,9 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg)
                if (bits & (SU_PUNCH1<<i))
                        MSG_WritePreciseAngle(msg, ent->v->punchangle[i]); // PROTOCOL_DARKPLACES
                if (bits & (SU_PUNCHVEC1<<i)) // PROTOCOL_DARKPLACES
-                       MSG_WriteDPCoord(msg, punchvector[i]); // PROTOCOL_DARKPLACES
+                       MSG_WriteFloat(msg, punchvector[i]); // PROTOCOL_DARKPLACES
                if (bits & (SU_VELOCITY1<<i))
-                       MSG_WriteChar (msg, ent->v->velocity[i]/16);
+                       MSG_WriteFloat(msg, ent->v->velocity[i]);
        }
 
 // [always sent]       if (bits & SU_ITEMS)