X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.h;h=b831b28448914a1184ded9576b5e56af8d0488cd;hb=1aef858f5ecb3dc8fd816e0155635371ed3632f2;hp=56d4f5490b87fe0562558594702b723037d25f97;hpb=fe7e2a8681a5988af06f7cbd24b3c8cc447b0738;p=lugaru.git diff --git a/Source/Person.h b/Source/Person.h index 56d4f54..b831b28 100644 --- a/Source/Person.h +++ b/Source/Person.h @@ -48,12 +48,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define rabbittype 0 #define wolftype 1 -class Person +struct Person { - public: - Person(); - ~Person(); - int whichpatchx; int whichpatchz; @@ -386,21 +382,45 @@ class Person return animation_bits[targetanimation] & ab_land; } int getLanding(); - - bool wasLandhard(); - bool isLandhard(); + + bool wasLandhard() + { + return animation_bits[currentanimation] & ab_landhard; + } + bool isLandhard() + { + return animation_bits[targetanimation] & ab_landhard; + } int getLandhard(); - - bool isFlip(); - bool wasFlip(); - + + bool wasFlip() + { + return animation_bits[currentanimation] & ab_flip; + } + bool isFlip() + { + return animation_bits[targetanimation] & ab_flip; + } + bool jumpclimb; - - bool isWallJump(); + + bool isWallJump() + { + return animation_bits[targetanimation] & ab_walljump; + } void Reverse(); void DoDamage(float howmuch); void DoHead(); - void DoMipmaps(int howmanylevels, float startx, float endx, float starty, float endy); + void DoMipmaps() + { + glBindTexture(GL_TEXTURE_2D, skeleton.drawmodel.textureptr); + gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, + skeleton.skinsize, + skeleton.skinsize, + GL_RGB, GL_UNSIGNED_BYTE, + &skeleton.skinText[0]); + } + int SphereCheck(XYZ *p1,float radius, XYZ *p, XYZ *move, float *rotate, Model *model); int DrawSkeleton(); void Puff(int whichlabel);