From: LegendaryGuard <rootuser999@gmail.com>
Date: Thu, 23 Dec 2021 04:06:15 +0000 (+0100)
Subject: Cleaning a bit, some empty variable and leaving a TODO for models
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4861bc9fd0439bce4e0d1c1bb559d46619e81eae;p=xonotic%2Fxonotic-data.pk3dir.git

Cleaning a bit, some empty variable and leaving a TODO for models
---

diff --git a/models/containers/barrel01.blend b/models/containers/barrel01.blend
index d2acf3155..243abcf80 100644
Binary files a/models/containers/barrel01.blend and b/models/containers/barrel01.blend differ
diff --git a/models/containers/barrel01.iqm b/models/containers/barrel01.iqm
index 776d559d4..32713d0e5 100644
Binary files a/models/containers/barrel01.iqm and b/models/containers/barrel01.iqm differ
diff --git a/models/containers/crate01.blend b/models/containers/crate01.blend
index d77ffb477..99228e499 100644
Binary files a/models/containers/crate01.blend and b/models/containers/crate01.blend differ
diff --git a/models/containers/crate01.iqm b/models/containers/crate01.iqm
index 669c2e84b..becda4d82 100644
Binary files a/models/containers/crate01.iqm and b/models/containers/crate01.iqm differ
diff --git a/models/containers/if_isnt_loading.txt b/models/containers/if_isnt_loading.txt
new file mode 100644
index 000000000..738744479
--- /dev/null
+++ b/models/containers/if_isnt_loading.txt
@@ -0,0 +1,9 @@
+if some model doesnt load, it's because Materials are called the same as the texture:
+example:
+"Main"
+
+in barrrel01 model
+
+it should be replaced to "barrel01" the same as the assigned texture
+
+More TODO for models
\ No newline at end of file
diff --git a/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qc b/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qc
index 30550dbed..b178402e5 100644
--- a/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qc
+++ b/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qc
@@ -5,7 +5,6 @@
 .vector taggedplayervelocity;
 .vector taggedplayerviewangles;
 .float RunnerSoundTaunt_time;
-.float proptime;
 
 void MH_FakeTimeLimit(entity e, float t)
 {
@@ -97,6 +96,7 @@ MUTATOR_HOOKFUNCTION(mh, PlayerPreThink)
 	else if(player.team == Team_IndexToTeam(2))
 		player.mh_status = MH_STATUS_RUNNER;
 	
+	// TODO: Runners using prop must select an object in the map
 	if(!IS_DEAD(player) && player.team == Team_IndexToTeam(2))
 		traceline_antilag(
 			player, 
diff --git a/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qh b/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qh
index ea3847ff8..0c35a8990 100644
--- a/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qh
+++ b/qcsrc/common/gamemodes/gamemode/mh/sv_mh.qh
@@ -50,7 +50,7 @@ Sound SND_RUNNER_TAUNT_RANDOM() {
 MODEL(RUNNER_PROP1, "models/containers/barrel01.iqm");
 MODEL(RUNNER_PROP2, "models/containers/crate01.iqm");
 Model MDL_RUNNER_PROP_RANDOM() {
-    return REGISTRY_GET(Sounds, MDL_RUNNER_PROP1.m_id + floor(prandom() * 2));
+    return REGISTRY_GET(Models, MDL_RUNNER_PROP1.m_id + floor(prandom() * 2));
 }
 
 bool MH_CheckTeams();