From: Mario <mario.mario@y7mail.com>
Date: Tue, 26 May 2020 11:09:54 +0000 (+1000)
Subject: Don't apply picmip to the RPC's texture, possible fix for #2447. Also whitelist ... 
X-Git-Tag: xonotic-v0.8.5~1025
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d9a350cc651d9259dd2ead8f17578b764d888e14;p=xonotic%2Fxonotic-data.pk3dir.git

Don't apply picmip to the RPC's texture, possible fix for #2447. Also whitelist .invincible_finished and .strength_finished in map entities
---

diff --git a/qcsrc/lib/spawnfunc.qh b/qcsrc/lib/spawnfunc.qh
index bcc1f2c69..8c7911233 100644
--- a/qcsrc/lib/spawnfunc.qh
+++ b/qcsrc/lib/spawnfunc.qh
@@ -146,6 +146,7 @@ noref bool require_spawnfunc_prefix;
 		FIELD_SCALAR(fld, health) \
 		FIELD_SCALAR(fld, height) \
 		FIELD_SCALAR(fld, impulse) \
+		FIELD_SCALAR(fld, invincible_finished) \
 		FIELD_SCALAR(fld, item_pickupsound) \
 		FIELD_SCALAR(fld, killtarget) \
 		FIELD_SCALAR(fld, lerpfrac) \
@@ -178,6 +179,7 @@ noref bool require_spawnfunc_prefix;
 		FIELD_SCALAR(fld, phase) \
 		FIELD_SCALAR(fld, platmovetype) \
 		FIELD_SCALAR(fld, race_place) \
+		FIELD_SCALAR(fld, strength_finished) \
 		FIELD_SCALAR(fld, radius) \
 		FIELD_SCALAR(fld, respawntimestart) \
 		FIELD_SCALAR(fld, respawntimejitter) \
diff --git a/scripts/okweapons.shader b/scripts/okweapons.shader
index 163da49b6..967b67e34 100644
--- a/scripts/okweapons.shader
+++ b/scripts/okweapons.shader
@@ -31,6 +31,8 @@ OK_shotgun
 
 minsta
 {
+	nopicmip
+	nomipmaps
 	dpglossexponentmod  64
 	dpreflectcube env/exomorph/exomorph
  	{