(IPKG): New.

[empserver] / src / lib / global / item.c

diff --git a/src/lib/global/item.c b/src/lib/global/item.c
index 35b194378db93a55de3b5259dba14cf16399b368..3603229dec24a756204468a2b7e03f802b5f9d3c 100644 (file)
--- a/src/lib/global/item.c
+++ b/src/lib/global/item.c
@@ -40,24 +40,23 @@
 #include "item.h"
 
 struct ichrstr ichr[I_MAX + 2] = {
-/*        mnem vtype      val  sell lbs rg,wh,ur,bnk  name */
-    {'?', 0, 0, 0, 0, {0, 0, 0, 0}, "unused"},
-/* STM CHANGED HERE */
-    {'c', I_CIVIL, 1, 0, 1, {10, 10, 10, 10}, "civilians"},
-    {'m', I_MILIT, 0, 0, 1, {1, 1, 1, 1}, "military"},
-    {'s', I_SHELL, 5, 1, 1, {1, 10, 1, 1}, "shells"},
-    {'g', I_GUN, 60, 1, 10, {1, 10, 1, 1}, "guns"},
-    {'p', I_PETROL, 4, 1, 1, {1, 10, 1, 1}, "petrol"},
-    {'i', I_IRON, 2, 1, 1, {1, 10, 1, 1}, "iron ore"},
-    {'d', I_DUST, 20, 1, 5, {1, 10, 1, 1}, "dust (gold)"},
-    {'b', I_BAR, 280, 1, 50, {1, 5, 1, 4}, "bars of gold"},
-    {'f', I_FOOD, 0, 1, 1, {1, 10, 1, 1}, "food"},
-    {'o', I_OIL, 8, 1, 1, {1, 10, 1, 1}, "oil"},
-    {'l', I_LCM, 2, 1, 1, {1, 10, 1, 1}, "light products"},
-    {'h', I_HCM, 4, 1, 1, {1, 10, 1, 1}, "heavy products"},
-    {'u', I_UW, 1, 1, 2, {1, 2, 1, 1}, "uncompensated workers"},
-    {'r', I_RAD, 150, 1, 8, {1, 10, 1, 1}, "radioactive materials"},
-    {0, 0, 0, 0, 0, {0, 0, 0, 0}, 0}
+/*  mnem  vtype   val sell lbs {in rg wh  ur bnk}  name */
+    {'?', I_NONE,   0, 0,  0, {0,  0,  0,  0,  0}, "unused"},
+    {'c', I_CIVIL,  1, 0,  1, {1, 10, 10, 10, 10}, "civilians"},
+    {'m', I_MILIT,  0, 0,  1, {1,  1,  1,  1,  1}, "military"},
+    {'s', I_SHELL,  5, 1,  1, {1,  1, 10,  1,  1}, "shells"},
+    {'g', I_GUN,   60, 1, 10, {1,  1, 10,  1,  1}, "guns"},
+    {'p', I_PETROL, 4, 1,  1, {1,  1, 10,  1,  1}, "petrol"},
+    {'i', I_IRON,   2, 1,  1, {1,  1, 10,  1,  1}, "iron ore"},
+    {'d', I_DUST,  20, 1,  5, {1,  1, 10,  1,  1}, "dust (gold)"},
+    {'b', I_BAR,  280, 1, 50, {1,  1,  5,  1,  4}, "bars of gold"},
+    {'f', I_FOOD,   0, 1,  1, {1,  1, 10,  1,  1}, "food"},
+    {'o', I_OIL,    8, 1,  1, {1,  1, 10,  1,  1}, "oil"},
+    {'l', I_LCM,    2, 1,  1, {1,  1, 10,  1,  1}, "light products"},
+    {'h', I_HCM,    4, 1,  1, {1,  1, 10,  1,  1}, "heavy products"},
+    {'u', I_UW,     1, 1,  2, {1,  1,  2,  1,  1}, "uncompensated workers"},
+    {'r', I_RAD,  150, 1,  8, {1,  1, 10,  1,  1}, "radioactive materials"},
+    {0,   I_NONE,   0, 0,  0, {0,  0,  0,  0,  0}, NULL}
 };
 
 int itm_maxno = (sizeof(ichr) / sizeof(struct ichrstr)) - 1;