Merge branch 'master' into develop

diff --git a/.tx/merge-base b/.tx/merge-base
index 785b420a47fbd51579b42de60b4f42a5a90b4ebc..5ef01d8a33ff2852c379b282a9adb5baf37317d9 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Apr 19 07:23:07 CEST 2022
+Tue Apr 26 07:23:12 CEST 2022

diff --git a/common.es.po b/common.es.po
index 8f16af22101a175559087a14d28dbf2615a8e175..37c0666223f456e6bbd21fe076db243911935134 100644 (file)
--- a/common.es.po
+++ b/common.es.po
@@ -1101,7 +1101,7 @@ msgstr "Calentamiento"
 
 #: qcsrc/client/hud/panel/timer.qc:134
 msgid "Timeout"
-msgstr "Tiempo fuera"
+msgstr "Tiempo muerto"
 
 #: qcsrc/client/hud/panel/timer.qc:136
 msgid "Sudden Death"
@@ -4576,11 +4576,11 @@ msgstr "^K1Suicidio en ^COUNT"
 
 #: qcsrc/common/notifications/all.inc:767
 msgid "^F4Timeout begins in ^COUNT"
-msgstr "^F4Tiempo fuera comienza en ^COUNT"
+msgstr "^F4El tiempo muerto comienza en ^COUNT"
 
 #: qcsrc/common/notifications/all.inc:768
 msgid "^F4Timeout ends in ^COUNT"
-msgstr "^F4Tiempo fuera termina en ^COUNT"
+msgstr "^F4Fin del tiempo muerto en ^COUNT"
 
 #: qcsrc/common/notifications/all.inc:770
 msgid "^K1Cannot join given minigame session!"
@@ -4645,7 +4645,7 @@ msgstr "tirar granada"
 #: qcsrc/common/notifications/all.qh:454
 #, c-format
 msgid "%s^K1 made a TRIPLE FRAG! %s^BG"
-msgstr "¡%s^K1 ha hecho una ELIMINACIÓN TRIPLE! %s^BG"
+msgstr "¡%s^K1 ha hecho una TRIPLE ELIMINACIÓN! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:454
 #, c-format
@@ -4654,7 +4654,7 @@ msgstr "¡%s^K1 ha hecho TRIPLE ACIERTO! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:454
 msgid "TRIPLE FRAG! "
-msgstr "¡ELIMINACIÓN TRIPLE! "
+msgstr "¡TRIPLE ELIMINACIÓN! "
 
 #: qcsrc/common/notifications/all.qh:455
 #, c-format

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 1dc444b3ec3181e8012bfcb9182416d996cd7512..0b1b96880dc93985a6711c17a80183a795de0495 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -1960,14 +1960,13 @@ void unfollow_sameorigin(entity e)
 .float aiment_deadflag;
 void SetMovetypeFollow(entity ent, entity e)
 {
-       // FIXME this may not be warpzone aware
        set_movetype(ent, MOVETYPE_FOLLOW); // make the hole follow
        ent.solid = SOLID_NOT; // MOVETYPE_FOLLOW is always non-solid - this means this cannot be teleported by warpzones any more! Instead, we must notice when our owner gets teleported.
        ent.aiment = e; // make the hole follow bmodel
        ent.punchangle = e.angles; // the original angles of bmodel
        ent.view_ofs = ent.origin - e.origin; // relative origin
        ent.v_angle = ent.angles - e.angles; // relative angles
-       ent.aiment_classname = strzone(e.classname);
+       ent.aiment_classname = e.classname;
        ent.aiment_deadflag = e.deadflag;
 
        if(IS_PLAYER(ent.aiment))
@@ -1983,8 +1982,7 @@ void UnsetMovetypeFollow(entity ent)
 {
        set_movetype(ent, MOVETYPE_FLY);
        PROJECTILE_MAKETRIGGER(ent);
-       if (ent.aiment_classname)
-               strunzone(ent.classname);
+       ent.aiment_classname = string_null;
        // FIXME: engine bug?
        // resetting aiment the engine will set orb's origin close to world's origin
        //ent.aiment = NULL;

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 950b1114e676b890346da9fdd628abafb40a9381..b6244ee24ba2a5e8eb820e9a59581433f8c34374 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -210,12 +210,11 @@ bool ScoreInfo_SendEntity(entity this, entity to, int sf)
        }
        // prevent sending the welcome message again when score types are sent again because the scoring system has changed
        // it can happen in some game modes like Race when the qualyfing session ends and the race starts
-       // NOTE: CS(this) is not initialized yet when a local client connects to a local dedicated server
-       bool welcome_msg_too = (!CS(this) || time < CS(this).jointime + 5);
+       bool welcome_msg_too = (!CS(to) || time < CS(to).jointime + 5);
        WriteByte(MSG_ENTITY, welcome_msg_too);
        // welcome message is sent here because it needs to know the gametype
        if (welcome_msg_too)
-               SendWelcomemessage_msg_type(this, false, MSG_ENTITY);
+               SendWelcomemessage_msg_type(to, false, MSG_ENTITY);
        return true;
 }