diff options
Diffstat (limited to 'src/Person.cpp')
| -rw-r--r-- | src/Person.cpp | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/src/Person.cpp b/src/Person.cpp index 0b0a97c..aa99852 100644 --- a/src/Person.cpp +++ b/src/Person.cpp @@ -795,9 +795,9 @@ void draw_joint(Joint& joint, enum PersonType type, int whichcostume) auto& model = joint.modelnum; if (auto color = determine_color(model, type, whichcostume)) - skeletonmodels[model].draw(color[0], color[1], color[2]); + drawModel(skeletonmodels + model, color); if (model == 0 && type == playertype && thirdperson) - skeletonmodels[9].draw(); // black shades + drawModel(skeletonmodels + 9, visions ? BLACK : NULL); glPopMatrix(); } @@ -817,7 +817,7 @@ void draw_muscle(Muscle& mus, enum PersonType type, int whichcostume) auto& model = mus.parent1->modelnum; if (auto color = determine_color(model, type, whichcostume)) - skeletonmodels[model].draw(color[0], color[1], color[2]); + drawModel(skeletonmodels + model, color); glPopMatrix(); } @@ -836,7 +836,8 @@ int Person::drawSkeleton() glRotatef(90 - gunrotate1, 0, 1, 0); glRotatef(90 - gunrotate2, 0, 0, 1); glRotatef(-gunrotate3, 0, 1, 0); - gunmodels[sniperriflemodel].draw(); + drawModel(gunmodels + sniperriflemodel, + visions ? BLACK : NULL); glPopMatrix(); break; case shotgun: @@ -848,7 +849,8 @@ int Person::drawSkeleton() glRotatef(90 - gunrotate2, 0, 0, 1); glRotatef(-gunrotate3, 0, 1, 0); glTranslatef(0, -0.4, 0); - gunmodels[shotgunmodel].draw(); + drawModel(gunmodels + shotgunmodel, + visions ? BLACK : NULL); glPopMatrix(); break; case assaultrifle: @@ -858,7 +860,8 @@ int Person::drawSkeleton() glRotatef(90 - gunrotate1, 0, 1, 0); glRotatef(90 - gunrotate2, 0, 0, 1); glRotatef(-gunrotate3, 0, 1, 0); - gunmodels[assaultriflemodel].draw(); + drawModel(gunmodels + assaultriflemodel, + visions ? BLACK : NULL); glPopMatrix(); break; case handgun1: @@ -877,15 +880,11 @@ int Person::drawSkeleton() glRotatef(-gunrotate3, 0, 1, 0); glTranslatef(0, 0, 0.15); - if (whichgun == handgun1) - gunmodels[handgunbasemodel].draw(); - else - gunmodels[handgun2basemodel].draw(); + drawModel(gunmodels + (whichgun == handgun1 ? handgunbasemodel : handgun2basemodel), + visions ? BLACK : NULL); glTranslatef(0, recoil * -0.3, 0); - if (whichgun == handgun1) - gunmodels[handgunslidemodel].draw(); - else - gunmodels[handgun2slidemodel].draw(); + drawModel(gunmodels + (whichgun == handgun1 ? handgunslidemodel : handgun2slidemodel), + visions ? BLACK : NULL); glPopMatrix(); break; case grenade: @@ -894,11 +893,14 @@ int Person::drawSkeleton() glRotatef(-90, 1, 0, 0); glTranslatef(0, 0, 0.05); if (reloading <= 0) { - gunmodels[grenadebasemodel].draw(); + drawModel(gunmodels + grenadebasemodel, + visions ? BLACK : NULL); if (!grenphase) - gunmodels[grenadepinmodel].draw(); + drawModel(gunmodels + grenadepinmodel, + visions ? BLACK : NULL); glTranslatef(0, 0, 0.005); - gunmodels[grenadespoonmodel].draw(); + drawModel(gunmodels + grenadespoonmodel, + visions ? BLACK : NULL); } glPopMatrix(); @@ -907,7 +909,8 @@ int Person::drawSkeleton() glRotatef(-90, 1, 0, 0); glTranslatef(0, 0, -0.15); if (reloading <= 0 && grenphase) - gunmodels[grenadepinmodel].draw(); + drawModel(gunmodels + grenadepinmodel, + visions ? BLACK : NULL); glPopMatrix(); break; case knife: @@ -919,7 +922,7 @@ int Person::drawSkeleton() glRotatef(90 - wrist.rotate2, 0, 0, 1); glRotatef(-wrist.rotate3, 0, 1, 0); glTranslatef(0, -0.2, 0); - gunmodels[knifemodel].draw(); + drawModel(gunmodels + knifemodel, visions ? BLACK : NULL); glPopMatrix(); break; } |