/*
- * Copyright (c) 2011 Rudolf Polzer
+ * Copyright (c) 2011 Rudolf PolzerCSQCModel_InterpolateAnimation_2To4_PreNote
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
.float csqcmodel_lerpfractime;
.float csqcmodel_lerpfrac2time;
-void CSQCModel_InterpolateAnimation_2To4_PreNote(float sf)
+void CSQCModel_InterpolateAnimation_2To4_PreNote(int sf)
{
if(sf & CSQCMODEL_PROPERTY_FRAME)
{
self.lerpfrac = self.csqcmodel_lerpfrac;
}
}
-void CSQCModel_InterpolateAnimation_1To2_PreNote(float sf)
+void CSQCModel_InterpolateAnimation_1To2_PreNote(int sf)
{
if(sf & CSQCMODEL_PROPERTY_FRAME)
{
#endif
}
-void CSQCModel_InterpolateAnimation_2To4_Note(float sf, float set_times)
+void CSQCModel_InterpolateAnimation_2To4_Note(int sf, float set_times)
{
if(sf & CSQCMODEL_PROPERTY_FRAME)
{
self.csqcmodel_lerpfractime = time;
}
}
-void CSQCModel_InterpolateAnimation_1To2_Note(float sf, float set_times)
+void CSQCModel_InterpolateAnimation_1To2_Note(int sf, float set_times)
{
if(sf & CSQCMODEL_PROPERTY_FRAME)
{
void CSQCModel_Draw()
{
// some nice flags for CSQCMODEL_IF and the hooks
- local noref float isplayer = (self.entnum >= 1 && self.entnum <= maxclients);
- local noref float islocalplayer = (self.entnum == player_localnum + 1);
- local noref float isnolocalplayer = (isplayer && (self.entnum != player_localnum + 1));
+ local noref bool isplayer = (self.entnum >= 1 && self.entnum <= maxclients);
+ local noref bool islocalplayer = (self.entnum == player_localnum + 1);
+ local noref bool isnolocalplayer = (isplayer && (self.entnum != player_localnum + 1));
// we don't do this for the local player as that one is already handled
// by CSQCPlayer_SetCamera()
root = root.tag_entity;
if(self != root)
{
- self.renderflags &~= RF_EXTERNALMODEL | RF_VIEWMODEL;
+ self.renderflags &= ~(RF_EXTERNALMODEL | RF_VIEWMODEL);
self.renderflags |= (root.renderflags & (RF_EXTERNALMODEL | RF_VIEWMODEL));
}
void CSQCModel_Read(float isnew)
{
- float sf;
- sf = ReadShort();
+ int sf = ReadInt24_t();
// some nice flags for CSQCMODEL_IF and the hooks
- local noref float isplayer = (self.entnum >= 1 && self.entnum <= maxclients);
- local noref float islocalplayer = (self.entnum == player_localnum + 1);
- local noref float isnolocalplayer = (isplayer && (self.entnum != player_localnum + 1));
+ local noref bool isplayer = (self.entnum >= 1 && self.entnum <= maxclients);
+ local noref bool islocalplayer = (self.entnum == player_localnum + 1);
+ local noref bool isnolocalplayer = (isplayer && (self.entnum != player_localnum + 1));
self.classname = "csqcmodel";
self.iflags |= IFLAG_ORIGIN; // interpolate origin too
#undef CSQCMODEL_IF
if(sf & CSQCMODEL_PROPERTY_MODELINDEX)
+ {
+ vector pmin = self.mins, pmax = self.maxs;
setmodelindex(self, self.modelindex); // this retrieves the .model key and sets mins/maxs/absmin/absmax
- // FIXME do we WANT this to override mins/maxs?
+ setsize(self, pmin, pmax);
+ }
if(sf & CSQCMODEL_PROPERTY_TELEPORTED)
{
self.iflags |= IFLAG_TELEPORTED;
self.csqcmodel_teleported = 1;
}
-
+
CSQCModel_InterpolateAnimation_Note(sf);
InterpolateOrigin_Note();
CSQCPlayer_PostUpdate();
setorigin(self, self.origin);
// set obvious render flags
-#ifdef COMPAT_XON050_ENGINE
- if(self.entnum == player_localentnum || self.entnum == spectatee_status)
-#else
if(self.entnum == player_localentnum)
-#endif
self.renderflags |= RF_EXTERNALMODEL;
else
- self.renderflags &~= RF_EXTERNALMODEL;
+ self.renderflags &= ~RF_EXTERNALMODEL;
// draw it
self.drawmask = MASK_NORMAL;