From e203e13c82534e0376d5e87686c9cef44ae98e02 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Thu, 9 Nov 2006 21:05:15 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@551 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/hudgun.cpp | 4 ++-- source/src/md2.h | 2 +- source/src/md3.h | 2 +- source/src/vertmodel.h | 6 ------ 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/source/src/hudgun.cpp b/source/src/hudgun.cpp index 5978e8eb..cd5cf77c 100644 --- a/source/src/hudgun.cpp +++ b/source/src/hudgun.cpp @@ -118,8 +118,8 @@ void renderhudgun() { if(player1->akimbo && player1->gunselect==GUN_PISTOL) // akimbo { - renderhudgun(GUN_PISTOL, player1->akimbolastaction[0]); - renderhudgun(GUN_PISTOL, player1->akimbolastaction[1], true); + renderhudgun(GUN_PISTOL, player1->akimbolastaction[0], 0); + renderhudgun(GUN_PISTOL, player1->akimbolastaction[1], 1); } else { diff --git a/source/src/md2.h b/source/src/md2.h index e3e29f70..50ae6c2f 100644 --- a/source/src/md2.h +++ b/source/src/md2.h @@ -178,7 +178,7 @@ struct md2 : vertmodel glTranslatef(x, y, z); glRotatef(yaw+180, 0, -1, 0); glRotatef(pitch, 0, 0, 1); - if(scale!=1) glScalef(scale, scale, scale); + if(anim&ANIM_MIRROR || scale!=1) glScalef(anim&ANIM_MIRROR ? -scale : scale, scale, scale); parts[0]->render(anim, varseed, speed, basetime, d); glPopMatrix(); diff --git a/source/src/md3.h b/source/src/md3.h index 7a073097..ef1ced70 100644 --- a/source/src/md3.h +++ b/source/src/md3.h @@ -155,7 +155,7 @@ struct md3 : vertmodel glRotatef(pitch, 0, 0, 1); glRotatef(-90, 0, 1, 0); glRotatef(-90, 1, 0, 0); - if(scale!=1) glScalef(scale, scale, scale); + if(anim&ANIM_MIRROR || scale!=1) glScalef(anim&ANIM_MIRROR ? -scale : scale, scale, scale); parts[0]->render(anim, varseed, speed, basetime, d); glPopMatrix(); }; diff --git a/source/src/vertmodel.h b/source/src/vertmodel.h index d1080eff..64b67470 100644 --- a/source/src/vertmodel.h +++ b/source/src/vertmodel.h @@ -123,11 +123,6 @@ struct vertmodel : model }; glBindTexture(GL_TEXTURE_2D, id); - if(as.anim&ANIM_MIRROR) - { - glPushMatrix(); - glScalef(-1, 1, 1); - }; bool isstat = as.frame==0 && as.range==1; if(isstat && statlist) { @@ -160,7 +155,6 @@ struct vertmodel : model }; xtraverts += dynlen; }; - if(as.anim&ANIM_MIRROR) glPopMatrix(); }; };