Merge branch 'master' into terencehill/slider_anim_improvements

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items / item / ammo.qc

diff --git a/qcsrc/common/items/item/ammo.qc b/qcsrc/common/items/item/ammo.qc
index faf2b26da28b8ded5020d87c86ecbcc92b59b65b..2d487a7b51be6723a030f44af5e14d5997da9883 100644 (file)
--- a/qcsrc/common/items/item/ammo.qc
+++ b/qcsrc/common/items/item/ammo.qc
@@ -4,45 +4,45 @@
 #endif
 
 REGISTER_ITEM(Bullets, Ammo) {
-    this.m_model    =   "models/items/a_bullets.mdl";
+    this.m_model    =   "a_bullets.mdl";
     this.m_name     =   "bullets";
-    this.m_ammoPic  =   "ammo_bullets";
+    this.m_icon     =   "ammo_bullets";
 #ifdef SVQC
     this.m_botvalue =   2000;
     this.m_itemid   =   IT_NAILS;
 #endif
 }
 REGISTER_ITEM(Cells, Ammo) {
-    this.m_model    =   "models/items/a_cells.md3";
+    this.m_model    =   "a_cells.md3";
     this.m_name     =   "cells";
-    this.m_ammoPic  =   "ammo_cells";
+    this.m_icon     =   "ammo_cells";
 #ifdef SVQC
     this.m_botvalue =   2000;
     this.m_itemid   =   IT_CELLS;
 #endif
 }
 REGISTER_ITEM(Plasma, Ammo) {
-    this.m_model    =   "models/items/a_cells.md3";
+    this.m_model    =   "a_cells.md3";
     this.m_name     =   "plasma";
-    this.m_ammoPic  =   "ammo_cells";
+    this.m_icon     =   "ammo_plasma";
 #ifdef SVQC
     this.m_botvalue =   2000;
     this.m_itemid   =   IT_PLASMA;
 #endif
 }
 REGISTER_ITEM(Rockets, Ammo) {
-    this.m_model    =   "models/items/a_rockets.md3";
+    this.m_model    =   "a_rockets.md3";
     this.m_name     =   "rockets";
-    this.m_ammoPic  =   "ammo_rockets";
+    this.m_icon     =   "ammo_rockets";
 #ifdef SVQC
     this.m_botvalue =   3000;
     this.m_itemid   =   IT_ROCKETS;
 #endif
 }
 REGISTER_ITEM(Shells, Ammo) {
-    this.m_model    =   "models/items/a_shells.md3";
+    this.m_model    =   "a_shells.md3";
     this.m_name     =   "shells";
-    this.m_ammoPic  =   "ammo_shells";
+    this.m_icon     =   "ammo_shells";
 #ifdef SVQC
     this.m_botvalue =   500;
     this.m_itemid   =   IT_SHELLS;