ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2025-02-08 21:31:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

avoid scoped enums which was until very recently a microsoft extension

Browse source
This commit is contained in:
Jonathan Gray 2013-04-25 16:05:55 +10:00
parent e8391f9c09
commit d8c10b2711
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
codemp/ghoul2/G2_bones.cpp
View file

@ -1653,11 +1653,11 @@ void G2_SetRagDoll(CGhoul2Info_v &ghoul2V,CRagDollParams *parms)
#ifndef DEDICATED #ifndef DEDICATED
switch (parms->RagPhase) switch (parms->RagPhase)
{ {
case CRagDollParams::ERagPhase::RP_START_DEATH_ANIM: case CRagDollParams::RP_START_DEATH_ANIM:
ghoul2.mFlags|=GHOUL2_RAG_PENDING; ghoul2.mFlags|=GHOUL2_RAG_PENDING;
return; /// not doing anything with this yet return; /// not doing anything with this yet
break; break;
case CRagDollParams::ERagPhase::RP_END_DEATH_ANIM: case CRagDollParams::RP_END_DEATH_ANIM:
ghoul2.mFlags|=GHOUL2_RAG_PENDING|GHOUL2_RAG_DONE; ghoul2.mFlags|=GHOUL2_RAG_PENDING|GHOUL2_RAG_DONE;
if (broadsword_waitforshot && if (broadsword_waitforshot &&
broadsword_waitforshot->integer) broadsword_waitforshot->integer)
@ -1676,7 +1676,7 @@ void G2_SetRagDoll(CGhoul2Info_v &ghoul2V,CRagDollParams *parms)
} }
} }
break; break;
case CRagDollParams::ERagPhase::RP_DEATH_COLLISION: case CRagDollParams::RP_DEATH_COLLISION:
if (parms->collisionType) if (parms->collisionType)
{ {
ghoul2.mFlags|=GHOUL2_RAG_COLLISION_SLIDE; ghoul2.mFlags|=GHOUL2_RAG_COLLISION_SLIDE;
@ -1695,7 +1695,7 @@ void G2_SetRagDoll(CGhoul2Info_v &ghoul2V,CRagDollParams *parms)
} }
} }
break; break;
case CRagDollParams::ERagPhase::RP_CORPSE_SHOT: case CRagDollParams::RP_CORPSE_SHOT:
if (broadsword_kickorigin && if (broadsword_kickorigin &&
broadsword_kickorigin->integer) broadsword_kickorigin->integer)
{ {
@ -1730,14 +1730,14 @@ void G2_SetRagDoll(CGhoul2Info_v &ghoul2V,CRagDollParams *parms)
} }
} }
break; break;
case CRagDollParams::ERagPhase::RP_GET_PELVIS_OFFSET: case CRagDollParams::RP_GET_PELVIS_OFFSET:
if (parms->RagPhase==CRagDollParams::ERagPhase::RP_GET_PELVIS_OFFSET) if (parms->RagPhase==CRagDollParams::RP_GET_PELVIS_OFFSET)
{ {
VectorClear(parms->pelvisAnglesOffset); VectorClear(parms->pelvisAnglesOffset);
VectorClear(parms->pelvisPositionOffset); VectorClear(parms->pelvisPositionOffset);
} }
// intentional lack of a break // intentional lack of a break
case CRagDollParams::ERagPhase::RP_SET_PELVIS_OFFSET: case CRagDollParams::RP_SET_PELVIS_OFFSET:
if (index>=0&&index<blist.size()) if (index>=0&&index<blist.size())
{ {
boneInfo_t &bone=blist[index]; boneInfo_t &bone=blist[index];
@ -1745,7 +1745,7 @@ void G2_SetRagDoll(CGhoul2Info_v &ghoul2V,CRagDollParams *parms)
{ {
if (bone.flags & BONE_ANGLES_RAGDOLL) if (bone.flags & BONE_ANGLES_RAGDOLL)
{ {
if (parms->RagPhase==CRagDollParams::ERagPhase::RP_GET_PELVIS_OFFSET) if (parms->RagPhase==CRagDollParams::RP_GET_PELVIS_OFFSET)
{ {
VectorCopy(bone.anglesOffset,parms->pelvisAnglesOffset); VectorCopy(bone.anglesOffset,parms->pelvisAnglesOffset);
VectorCopy(bone.positionOffset,parms->pelvisPositionOffset); VectorCopy(bone.positionOffset,parms->pelvisPositionOffset);
@ -1760,7 +1760,7 @@ void G2_SetRagDoll(CGhoul2Info_v &ghoul2V,CRagDollParams *parms)
} }
return; return;
break; break;
case CRagDollParams::ERagPhase::RP_DISABLE_EFFECTORS: case CRagDollParams::RP_DISABLE_EFFECTORS:
// not doing anything with this yet // not doing anything with this yet
return; return;
break; break;