Fix compilation errors against upstream Nuclide
This commit is contained in:
parent
0bd0a130a7
commit
4959ed8f96
|
@ -21,28 +21,6 @@ ClientGame_EventParse(float fHeader)
|
||||||
case EV_OBITUARY:
|
case EV_OBITUARY:
|
||||||
Obituary_Parse();
|
Obituary_Parse();
|
||||||
break;
|
break;
|
||||||
case EV_SPARK:
|
|
||||||
vector vSparkPos, vSparkAngle;
|
|
||||||
vSparkPos[0] = readcoord();
|
|
||||||
vSparkPos[1] = readcoord();
|
|
||||||
vSparkPos[2] = readcoord();
|
|
||||||
vSparkAngle[0] = readcoord();
|
|
||||||
vSparkAngle[1] = readcoord();
|
|
||||||
vSparkAngle[2] = readcoord();
|
|
||||||
FX_Spark(vSparkPos, vSparkAngle);
|
|
||||||
break;
|
|
||||||
case EV_GIBHUMAN:
|
|
||||||
vector vGibPos;
|
|
||||||
vGibPos[0] = readcoord();
|
|
||||||
vGibPos[1] = readcoord();
|
|
||||||
vGibPos[2] = readcoord();
|
|
||||||
vector vDir;
|
|
||||||
vDir[0] = readcoord();
|
|
||||||
vDir[1] = readcoord();
|
|
||||||
vDir[2] = readcoord();
|
|
||||||
float flForce = readfloat();
|
|
||||||
FX_GibHuman(vGibPos, vDir, flForce);
|
|
||||||
break;
|
|
||||||
case EV_BLOOD:
|
case EV_BLOOD:
|
||||||
vector vBloodPos;
|
vector vBloodPos;
|
||||||
vector vBloodColor;
|
vector vBloodColor;
|
||||||
|
@ -87,45 +65,6 @@ ClientGame_EventParse(float fHeader)
|
||||||
|
|
||||||
FX_Soda(vSodaPos, vSodaColor);
|
FX_Soda(vSodaPos, vSodaColor);
|
||||||
break;
|
break;
|
||||||
case EV_EXPLOSION:
|
|
||||||
vector vExploPos;
|
|
||||||
|
|
||||||
vExploPos[0] = readcoord();
|
|
||||||
vExploPos[1] = readcoord();
|
|
||||||
vExploPos[2] = readcoord();
|
|
||||||
|
|
||||||
FX_Explosion(vExploPos);
|
|
||||||
break;
|
|
||||||
case EV_MODELGIB:
|
|
||||||
vector vecPos;
|
|
||||||
vecPos[0] = readcoord();
|
|
||||||
vecPos[1] = readcoord();
|
|
||||||
vecPos[2] = readcoord();
|
|
||||||
|
|
||||||
vector vSize;
|
|
||||||
vSize[0] = readcoord();
|
|
||||||
vSize[1] = readcoord();
|
|
||||||
vSize[2] = readcoord();
|
|
||||||
|
|
||||||
float fStyle = readbyte();
|
|
||||||
int count = readbyte();
|
|
||||||
FX_BreakModel(count, vecPos, vSize, [0,0,0], fStyle);
|
|
||||||
break;
|
|
||||||
case EV_IMPACT:
|
|
||||||
impactType_t iType;
|
|
||||||
vector vOrigin, vNormal;
|
|
||||||
|
|
||||||
iType = (impactType_t)readbyte();
|
|
||||||
vOrigin[0] = readcoord();
|
|
||||||
vOrigin[1] = readcoord();
|
|
||||||
vOrigin[2] = readcoord();
|
|
||||||
|
|
||||||
vNormal[0] = readcoord();
|
|
||||||
vNormal[1] = readcoord();
|
|
||||||
vNormal[2] = readcoord();
|
|
||||||
|
|
||||||
FX_Impact(iType, vOrigin, vNormal);
|
|
||||||
break;
|
|
||||||
case EV_CHAT:
|
case EV_CHAT:
|
||||||
float fSender = readbyte();
|
float fSender = readbyte();
|
||||||
float fTeam = readbyte();
|
float fTeam = readbyte();
|
||||||
|
|
|
@ -41,11 +41,6 @@ ClientGame_RendererRestart(string rstr)
|
||||||
Damage_Precache();
|
Damage_Precache();
|
||||||
|
|
||||||
FX_Blood_Init();
|
FX_Blood_Init();
|
||||||
FX_BreakModel_Init();
|
|
||||||
FX_Explosion_Init();
|
|
||||||
FX_GibHuman_Init();
|
|
||||||
FX_Spark_Init();
|
|
||||||
FX_Impact_Init();
|
|
||||||
FX_Lego_Init();
|
FX_Lego_Init();
|
||||||
FX_Soda_Init();
|
FX_Soda_Init();
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,7 @@ game_event.qc
|
||||||
../../../valve/src/client/viewmodel.qc
|
../../../valve/src/client/viewmodel.qc
|
||||||
../../../valve/src/client/view.qc
|
../../../valve/src/client/view.qc
|
||||||
obituary.qc
|
obituary.qc
|
||||||
|
../../../valve/src/client/hud_sprite.qc
|
||||||
../../../valve/src/client/hud_dmgnotify.qc
|
../../../valve/src/client/hud_dmgnotify.qc
|
||||||
hud.qc
|
hud.qc
|
||||||
../../../valve/src/client/hud_weaponselect.qc
|
../../../valve/src/client/hud_weaponselect.qc
|
||||||
|
|
|
@ -20,8 +20,6 @@ defs.h
|
||||||
|
|
||||||
../shared/include.src
|
../shared/include.src
|
||||||
|
|
||||||
../../../valve/src/server/monster_scientist_dead.qc
|
|
||||||
|
|
||||||
../../../valve/src/server/player.qc
|
../../../valve/src/server/player.qc
|
||||||
items.qc
|
items.qc
|
||||||
../../../valve/src/server/item_suit.qc
|
../../../valve/src/server/item_suit.qc
|
||||||
|
|
|
@ -9,11 +9,6 @@ player.qc
|
||||||
pmove.qc
|
pmove.qc
|
||||||
|
|
||||||
../../../valve/src/shared/fx_blood.qc
|
../../../valve/src/shared/fx_blood.qc
|
||||||
../../../valve/src/shared/fx_breakmodel.qc
|
|
||||||
../../../valve/src/shared/fx_explosion.qc
|
|
||||||
../../../valve/src/shared/fx_gibhuman.qc
|
|
||||||
../../../valve/src/shared/fx_spark.qc
|
|
||||||
../../../valve/src/shared/fx_impact.qc
|
|
||||||
../../../valve/src/shared/fx_corpse.qc
|
../../../valve/src/shared/fx_corpse.qc
|
||||||
fx_lego.qc
|
fx_lego.qc
|
||||||
fx_legopiece.qc
|
fx_legopiece.qc
|
||||||
|
|
|
@ -138,7 +138,7 @@ w_forks_primary(player pl)
|
||||||
if (trace_ent.iBleeds) {
|
if (trace_ent.iBleeds) {
|
||||||
FX_Blood(trace_endpos, [1,0,0]);
|
FX_Blood(trace_endpos, [1,0,0]);
|
||||||
} else {
|
} else {
|
||||||
FX_Impact(IMPACT_MELEE, trace_endpos, trace_plane_normal);
|
SurfData_Impact(trace_ent, trace_endpos, trace_plane_normal);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (trace_ent.takedamage) {
|
if (trace_ent.takedamage) {
|
||||||
|
@ -181,7 +181,7 @@ w_forks_secondary(player pl)
|
||||||
FX_Blood(trace_endpos, [1,0,0]);
|
FX_Blood(trace_endpos, [1,0,0]);
|
||||||
remove(self);
|
remove(self);
|
||||||
} else {
|
} else {
|
||||||
FX_Impact(IMPACT_DEFAULT, trace_endpos, trace_plane_normal);
|
SurfData_Impact(trace_ent, trace_endpos, trace_plane_normal);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (other.takedamage == DAMAGE_YES) {
|
if (other.takedamage == DAMAGE_YES) {
|
||||||
|
|
|
@ -113,7 +113,7 @@ w_fryingpan_primary(player pl)
|
||||||
if (trace_ent.iBleeds) {
|
if (trace_ent.iBleeds) {
|
||||||
FX_Blood(trace_endpos, [1,0,0]);
|
FX_Blood(trace_endpos, [1,0,0]);
|
||||||
} else {
|
} else {
|
||||||
FX_Impact(IMPACT_MELEE, trace_endpos, trace_plane_normal);
|
SurfData_Impact(trace_ent, trace_endpos, trace_plane_normal);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (trace_ent.takedamage) {
|
if (trace_ent.takedamage) {
|
||||||
|
@ -164,7 +164,7 @@ w_fryingpan_secondary(player pl)
|
||||||
if (trace_ent.iBleeds) {
|
if (trace_ent.iBleeds) {
|
||||||
FX_Blood(trace_endpos, [1,0,0]);
|
FX_Blood(trace_endpos, [1,0,0]);
|
||||||
} else {
|
} else {
|
||||||
FX_Impact(IMPACT_MELEE, trace_endpos, trace_plane_normal);
|
SurfData_Impact(trace_ent, trace_endpos, trace_plane_normal);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (trace_ent.takedamage) {
|
if (trace_ent.takedamage) {
|
||||||
|
|
|
@ -170,7 +170,7 @@ w_glove_primary(player pl)
|
||||||
if (trace_ent.iBleeds) {
|
if (trace_ent.iBleeds) {
|
||||||
FX_Blood(trace_endpos, [1,0,0]);
|
FX_Blood(trace_endpos, [1,0,0]);
|
||||||
} else {
|
} else {
|
||||||
FX_Spark(trace_endpos, trace_plane_normal);
|
pointparticles(particleeffectnum("fx_spark.main"), trace_endpos, trace_plane_normal, 1);
|
||||||
r = (float)input_sequence % 2;
|
r = (float)input_sequence % 2;
|
||||||
Decals_Place(trace_endpos, r == 1 ? "{slash1" : "{slash2");
|
Decals_Place(trace_endpos, r == 1 ? "{slash1" : "{slash2");
|
||||||
|
|
||||||
|
|
|
@ -131,7 +131,7 @@ w_knife_primary(player pl)
|
||||||
FX_Blood(trace_endpos, [1,0,0]);
|
FX_Blood(trace_endpos, [1,0,0]);
|
||||||
remove(self);
|
remove(self);
|
||||||
} else {
|
} else {
|
||||||
FX_Spark(trace_endpos, trace_plane_normal);
|
pointparticles(particleeffectnum("fx_spark.main"), trace_endpos, trace_plane_normal, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (other.takedamage == DAMAGE_YES) {
|
if (other.takedamage == DAMAGE_YES) {
|
||||||
|
|
|
@ -108,7 +108,7 @@ w_legolauncher_shootlego(player pl)
|
||||||
if (trace_ent.iBleeds) {
|
if (trace_ent.iBleeds) {
|
||||||
FX_Blood(trace_endpos, [1,0,0]);
|
FX_Blood(trace_endpos, [1,0,0]);
|
||||||
} else {
|
} else {
|
||||||
FX_Impact(IMPACT_DEFAULT, self.origin, trace_plane_normal);
|
SurfData_Impact(trace_ent, trace_endpos, trace_plane_normal);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (other.takedamage == DAMAGE_YES) {
|
if (other.takedamage == DAMAGE_YES) {
|
||||||
|
|
|
@ -123,7 +123,7 @@ w_machette_primary(player pl)
|
||||||
if (trace_ent.iBleeds) {
|
if (trace_ent.iBleeds) {
|
||||||
FX_Blood(trace_endpos, [1,0,0]);
|
FX_Blood(trace_endpos, [1,0,0]);
|
||||||
} else {
|
} else {
|
||||||
FX_Impact(IMPACT_MELEE, trace_endpos, trace_plane_normal);
|
SurfData_Impact(trace_ent, trace_endpos, trace_plane_normal);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (trace_ent.takedamage) {
|
if (trace_ent.takedamage) {
|
||||||
|
@ -149,7 +149,7 @@ w_machette_throw(player pl)
|
||||||
FX_Blood(trace_endpos, [1,0,0]);
|
FX_Blood(trace_endpos, [1,0,0]);
|
||||||
remove(self);
|
remove(self);
|
||||||
} else {
|
} else {
|
||||||
FX_Impact(IMPACT_DEFAULT, trace_endpos, trace_plane_normal);
|
SurfData_Impact(trace_ent, trace_endpos, trace_plane_normal);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (other.takedamage == DAMAGE_YES) {
|
if (other.takedamage == DAMAGE_YES) {
|
||||||
|
|
Loading…
Reference in New Issue