git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7470 d7cf8633-e32d-0410...

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 3a4a8b005e6e94bb66c847999b3eb47f99f5a26a..a08f5d8bd39c60de43bebdf9e0ea5ed88b19058e 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -523,6 +523,8 @@ int SV_CheckContentsTransition(prvm_edict_t *ent, const int nContents)
                                PRVM_G_FLOAT(OFS_PARM0) = ent->fields.server->watertype;
                                // New Contents
                                PRVM_G_FLOAT(OFS_PARM1) = nContents;
+                               // Assign Self
+                               prog->globals.server->self = PRVM_EDICT_TO_PROG(ent);
                        // Execute VM Function
                        PRVM_ExecuteProgram(contentstransition->function, "contentstransition: NULL function");
                }
@@ -1988,7 +1990,7 @@ static void SV_Physics_Entity (prvm_edict_t *ent)
        case MOVETYPE_FLYMISSILE:
        case MOVETYPE_FLY:
                // regular thinking
-               if (SV_RunThink (ent) && runmove)
+               if (SV_RunThink (ent) && (runmove || !sv_gameplayfix_delayprojectiles.integer))
                        SV_Physics_Toss (ent);
                break;
        default: