From: <hel...@us...> - 2006-08-22 20:27:11
|
Revision: 10491 Author: hellcatv Date: 2006-08-22 13:27:06 -0700 (Tue, 22 Aug 2006) ViewCVS: http://svn.sourceforge.net/vegastrike/?rev=10491&view=rev Log Message: ----------- found a bug in the determination of gender... this could cause crashy if animations were present Modified Paths: -------------- trunk/vegastrike/src/cmd/pilot.h Modified: trunk/vegastrike/src/cmd/pilot.h =================================================================== --- trunk/vegastrike/src/cmd/pilot.h 2006-08-22 20:10:11 UTC (rev 10490) +++ trunk/vegastrike/src/cmd/pilot.h 2006-08-22 20:27:06 UTC (rev 10491) @@ -18,7 +18,7 @@ relationmap effective_relationship; std::vector <Animation *> *comm_face; float getAnger (const Unit * un)const; - std::vector <Animation *> *getCommFaces(unsigned char &sex){return comm_face;} + std::vector <Animation *> *getCommFaces(unsigned char &sex){sex=gender;return comm_face;} float GetEffectiveRelationship (const Unit * target)const ; Animation * getCommFace(Unit * parent, float moon, unsigned char &gender); void adjustSpecificRelationship(Unit * parent, void* aggressor, float value, int guessedFaction/*pass in neutral otherwise*/); |