#ifdef CSQC
-float autocvar_cl_ghost_items;
-vector autocvar_cl_ghost_items_color;
-float autocvar_cl_simple_items;
+var float autocvar_cl_ghost_items = 1;
+var vector autocvar_cl_ghost_items_color = '-1 -1 -1';
float autocvar_cl_fullbright_items;
vector autocvar_cl_staywep_color;
float autocvar_cl_staywep_alpha;
+float autocvar_cl_simple_items;
+float cl_simple_items;
+float cl_ghost_items_alpha;
.float spawntime;
.float gravity;
float csqcitems_started; // remove this after a release or two
void csqcitems_start()
{
- autocvar_cl_ghost_items = bound(0, autocvar_cl_ghost_items, 1);
if(autocvar_cl_ghost_items == 1)
- autocvar_cl_ghost_items = 0.55;
+ cl_ghost_items_alpha = 0.55;
+ else
+ cl_ghost_items_alpha = bound(0, autocvar_cl_ghost_items, 1);
- string _tmp = cvar_string("cl_ghost_items_color");
- if(_tmp == "")
- autocvar_cl_ghost_items_color = '-1 -1 -1';
-
csqcitems_started = TRUE;
}
}
else
{
- if (autocvar_cl_ghost_items)
+ if (cl_ghost_items_alpha)
{
self.alpha = autocvar_cl_ghost_items;
self.colormod = self.glowmod = autocvar_cl_ghost_items_color;
{
self.drawmask = MASK_NORMAL;
self.movetype = MOVETYPE_NOCLIP;
+ self.draw = ItemDraw;
if(self.mdl)
strunzone(self.mdl);
self.mdl = "";
string _fn = ReadString();
- if(autocvar_cl_simple_items && (self.ItemStatus & ITS_ALLOWSI))
+ if(cl_simple_items && (self.ItemStatus & ITS_ALLOWSI))
{
string _fn2 = substring(_fn, 0 , strlen(_fn) -4);
-
+ self.draw = ItemDrawSimple;
+
if(fexists(strcat(_fn2, "_simple.md3")))
self.mdl = strzone(strcat(_fn2, "_simple.md3"));
else if(fexists(strcat(_fn2, "_simple.dpm")))
self.mdl = strzone(strcat(_fn2, "_simple.obj"));
else
{
- self.mdl = "";
+ self.draw = ItemDraw;
dprint("Simple item requested for ", _fn, " but no model exsist for it\n");
}
}
+ if(self.draw != ItemDrawSimple)
+ self.mdl = strzone(_fn);
+
+
if(self.mdl == "")
- {
- self.mdl = strzone(_fn);
- self.draw = ItemDraw;
- }
- else
- self.draw = ItemDrawSimple;
+ dprint("^1WARNING!^7 self.mdl is unset for item ", self.classname, " tell tZork aboute this!\n");
precache_model(self.mdl);
setmodel(self, self.mdl);
if(sf & ISF_DROP)
{
- self.effects |= EF_FLAME;
self.gravity = 1;
self.move_movetype = MOVETYPE_TOSS;
self.move_velocity_x = ReadCoord();
WriteByte(MSG_ENTITY, self.ItemStatus);
if(sf & ISF_MODEL)
+ {
+
+ if(self.mdl == "")
+ dprint("^1WARNING!^7 self.mdl is unset for item ", self.classname, "exspect a crash just aboute now\n");
+
WriteString(MSG_ENTITY, self.mdl);
+ }
+
if(sf & ISF_COLORMAP)
WriteShort(MSG_ENTITY, self.colormap);
if(self.count == 1)
{
string name;
- vector rgb;
+ vector rgb = '1 0 1';
name = string_null;
if(g_minstagib)
{
float commodity_pickupevalfunc(entity player, entity item)
{
- float c, i, need_shells, need_nails, need_rockets, need_cells, need_fuel;
+ float c, i;
+ float need_shells = FALSE, need_nails = FALSE, need_rockets = FALSE, need_cells = FALSE, need_fuel = FALSE;
entity wi;
c = 0;
if(self.model == "")
self.model = itemmodel;
+ if(self.model == "")
+ {
+ error(strcat("^1Tried to spawn ", itemname, " with no model!\n"));
+ return;
+ }
+
if(self.item_pickupsound == "")
self.item_pickupsound = pickupsound;
else if(argv(i) == "jetpack") self.items |= IT_JETPACK;
else if(argv(i) == "fuel_regen") self.items |= IT_FUEL_REGEN;
else
- for(j = WEP_FIRST; j <= WEP_LAST; ++j)
{
- e = get_weaponinfo(j);
- if(argv(i) == e.netname)
+ for(j = WEP_FIRST; j <= WEP_LAST; ++j)
{
- WEPSET_OR_EW(self, j);
- if(self.spawnflags == 0 || self.spawnflags == 2)
- weapon_action(e.weapon, WR_PRECACHE);
- break;
+ e = get_weaponinfo(j);
+ if(argv(i) == e.netname)
+ {
+ WEPSET_OR_EW(self, j);
+ if(self.spawnflags == 0 || self.spawnflags == 2)
+ weapon_action(e.weapon, WR_PRECACHE);
+ break;
+ }
}
+ if(j > WEP_LAST)
+ print("target_items: invalid item ", argv(i), "\n");
}
- if(j > WEP_LAST)
- print("target_items: invalid item ", argv(i), "\n");
}
string itemprefix, valueprefix;