Merge remote branch 'origin/master' into divVerent/crypto2

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / Main.qc

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 8b053cfd38fd553477a140ade161e159aef20dff..780609d5a9e507bc2ea8899ba4b0f2e9152ba0e1 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -1335,8 +1335,16 @@ float CSQC_Parse_TempEntity()
                        bHandled = true;
                        break;
                case TE_CSQC_NEX_VELOCITY:
+                       nex_velocitydependent = ReadByte();
                        nex_minvelocity = ReadShort();
                        nex_maxvelocity = ReadShort();
+                       nex_speed_falloff_rate = ReadByte();
+                       nex_charge = ReadByte();
+                       nex_charge_rate = ReadByte();
+                       bHandled = true;
+                       break;
+               case TE_CSQC_CR_MAXBULLETS:
+                       cr_maxbullets = ReadByte();
                        bHandled = true;
                        break;
                default: