X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_models.qc;h=e25ce66f3229a80c41ef44d19e702bc5579934d7;hb=5b4d55a39e59f76751555cc0420e5734fbc4a792;hp=befdb9bcc437e552e423d8489ac81f14cfec7d26;hpb=684f569c626ee8a81b3269df66d5e36f123f450e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc index befdb9bcc..e25ce66f3 100644 --- a/qcsrc/server/g_models.qc +++ b/qcsrc/server/g_models.qc @@ -1,3 +1,11 @@ +#include "_all.qh" + +#include "g_subs.qh" +#include "g_triggers.qh" + +#include "../common/constants.qh" +#include "../csqcmodellib/sv_model.qh" + .float modelscale; void g_model_setcolormaptoactivator (void) @@ -22,20 +30,20 @@ void g_clientmodel_setcolormaptoactivator (void) void g_model_dropbyspawnflags() { - if(self.spawnflags & 3 == 1) // ALIGN_ORIGIN + if((self.spawnflags & 3) == 1) // ALIGN_ORIGIN { traceline(self.origin, self.origin - '0 0 4096', MOVE_NOMONSTERS, self); setorigin(self, trace_endpos); } - else if(self.spawnflags & 3 == 2) // ALIGN_BOTTOM + else if((self.spawnflags & 3) == 2) // ALIGN_BOTTOM { tracebox(self.origin, self.mins, self.maxs, self.origin - '0 0 4096', MOVE_NOMONSTERS, self); setorigin(self, trace_endpos); } - else if(self.spawnflags & 3 == 3) // ALIGN_ORIGIN | ALIGN_BOTTOM + else if((self.spawnflags & 3) == 3) // ALIGN_ORIGIN | ALIGN_BOTTOM { traceline(self.origin, self.origin - '0 0 4096', MOVE_NOMONSTERS, self); - setorigin(self, trace_endpos - '0 0 1' * self.mins_z); + setorigin(self, trace_endpos - '0 0 1' * self.mins.z); } } @@ -48,7 +56,7 @@ void g_clientmodel_dropbyspawnflags() self.SendFlags |= 2; } -float g_clientmodel_genericsendentity (entity to, float sf) +float g_clientmodel_genericsendentity (entity to, int sf) { sf = sf & 0x0F; if(self.angles != '0 0 0') @@ -59,7 +67,7 @@ float g_clientmodel_genericsendentity (entity to, float sf) sf |= 0x40; if(self.lodmodelindex1) sf |= 0x80; - + WriteByte(MSG_ENTITY, ENT_CLIENT_WALL); WriteByte(MSG_ENTITY, sf); @@ -71,18 +79,18 @@ float g_clientmodel_genericsendentity (entity to, float sf) if(sf & 2) { - WriteCoord(MSG_ENTITY, self.origin_x); - WriteCoord(MSG_ENTITY, self.origin_y); - WriteCoord(MSG_ENTITY, self.origin_z); + WriteCoord(MSG_ENTITY, self.origin.x); + WriteCoord(MSG_ENTITY, self.origin.y); + WriteCoord(MSG_ENTITY, self.origin.z); } if(sf & 4) { if(sf & 0x10) { - WriteAngle(MSG_ENTITY, self.angles_x); - WriteAngle(MSG_ENTITY, self.angles_y); - WriteAngle(MSG_ENTITY, self.angles_z); + WriteAngle(MSG_ENTITY, self.angles.x); + WriteAngle(MSG_ENTITY, self.angles.y); + WriteAngle(MSG_ENTITY, self.angles.z); } } @@ -102,12 +110,12 @@ float g_clientmodel_genericsendentity (entity to, float sf) WriteShort(MSG_ENTITY, floor(self.scale * 256)); if(sf & 0x20) { - WriteCoord(MSG_ENTITY, self.mins_x); - WriteCoord(MSG_ENTITY, self.mins_y); - WriteCoord(MSG_ENTITY, self.mins_z); - WriteCoord(MSG_ENTITY, self.maxs_x); - WriteCoord(MSG_ENTITY, self.maxs_y); - WriteCoord(MSG_ENTITY, self.maxs_z); + WriteCoord(MSG_ENTITY, self.mins.x); + WriteCoord(MSG_ENTITY, self.mins.y); + WriteCoord(MSG_ENTITY, self.mins.z); + WriteCoord(MSG_ENTITY, self.maxs.x); + WriteCoord(MSG_ENTITY, self.maxs.y); + WriteCoord(MSG_ENTITY, self.maxs.z); } WriteString(MSG_ENTITY, self.bgmscript); if(self.bgmscript != "") @@ -116,18 +124,19 @@ float g_clientmodel_genericsendentity (entity to, float sf) WriteByte(MSG_ENTITY, floor(self.bgmscriptdecay * 64)); WriteByte(MSG_ENTITY, floor(self.bgmscriptsustain * 255)); WriteByte(MSG_ENTITY, floor(self.bgmscriptrelease * 64)); - WriteCoord(MSG_ENTITY, self.movedir_x); - WriteCoord(MSG_ENTITY, self.movedir_y); - WriteCoord(MSG_ENTITY, self.movedir_z); + WriteCoord(MSG_ENTITY, self.movedir.x); + WriteCoord(MSG_ENTITY, self.movedir.y); + WriteCoord(MSG_ENTITY, self.movedir.z); WriteByte(MSG_ENTITY, floor(self.lip * 255)); } } - return TRUE; + return true; } #define G_MODEL_INIT(sol) \ + if(self.geomtype) if(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) self.movetype = MOVETYPE_PHYSICS; \ if(!self.scale) self.scale = self.modelscale; \ SetBrushEntityModel(); \ self.use = g_model_setcolormaptoactivator; \ @@ -135,18 +144,19 @@ float g_clientmodel_genericsendentity (entity to, float sf) if(!self.solid) self.solid = (sol); else if(self.solid < 0) self.solid = SOLID_NOT; #define G_CLIENTMODEL_INIT(sol) \ + if(self.geomtype) if(autocvar_physics_ode && checkextension("DP_PHYSICS_ODE")) self.movetype = MOVETYPE_PHYSICS; \ if(!self.scale) self.scale = self.modelscale; \ SetBrushEntityModel(); \ self.use = g_clientmodel_setcolormaptoactivator; \ InitializeEntity(self, g_clientmodel_dropbyspawnflags, INITPRIO_DROPTOFLOOR); \ if(!self.solid) self.solid = (sol); else if(self.solid < 0) self.solid = SOLID_NOT; \ if(!self.bgmscriptsustain) self.bgmscriptsustain = 1; else if(self.bgmscriptsustain < 0) self.bgmscriptsustain = 0; \ - Net_LinkEntity(self, TRUE, 0, g_clientmodel_genericsendentity); + Net_LinkEntity(self, true, 0, g_clientmodel_genericsendentity); // non-solid model entities: -void spawnfunc_misc_gamemodel() { self.angles_x = -self.angles_x; G_MODEL_INIT (SOLID_NOT) } // model entity -void spawnfunc_misc_clientmodel() { self.angles_x = -self.angles_x; G_CLIENTMODEL_INIT(SOLID_NOT) } // model entity -void spawnfunc_misc_models() { self.angles_x = -self.angles_x; G_MODEL_INIT (SOLID_NOT) } // DEPRECATED old compat entity with confusing name, do not use +void spawnfunc_misc_gamemodel() { self.angles_x = -self.angles.x; G_MODEL_INIT (SOLID_NOT) } // model entity +void spawnfunc_misc_clientmodel() { self.angles_x = -self.angles.x; G_CLIENTMODEL_INIT(SOLID_NOT) } // model entity +void spawnfunc_misc_models() { self.angles_x = -self.angles.x; G_MODEL_INIT (SOLID_NOT) } // DEPRECATED old compat entity with confusing name, do not use // non-solid brush entities: void spawnfunc_func_illusionary() { G_MODEL_INIT (SOLID_NOT) } // Q1 name (WARNING: MISPREDICTED)