Mercurial > mm7
comparison Player.cpp @ 1113:39eaa6b00141
something to bool cast (performance warning) mostly fixed
author | Grumpy7 |
---|---|
date | Tue, 28 May 2013 00:19:45 +0200 |
parents | e1ad5ccc13ae |
children | 6a4d654ef9fb |
comparison
equal
deleted
inserted
replaced
1112:4994eb3947ae | 1113:39eaa6b00141 |
---|---|
6071 v71 = (ITEM_EQUIP_TYPE)1; | 6071 v71 = (ITEM_EQUIP_TYPE)1; |
6072 goto LABEL_55; | 6072 goto LABEL_55; |
6073 } | 6073 } |
6074 | 6074 |
6075 | 6075 |
6076 | 6076 assert(false && "Unknown attribute!"); |
6077 } | 6077 } |
6078 | 6078 |
6079 //----- (00490109) -------------------------------------------------------- | 6079 //----- (00490109) -------------------------------------------------------- |
6080 // faces are: 0 1 2 3 human males | 6080 // faces are: 0 1 2 3 human males |
6081 // 4 5 6 7 human females | 6081 // 4 5 6 7 human females |
9039 pParty->field_709 = 0; | 9039 pParty->field_709 = 0; |
9040 pParty->CountHirelings(); | 9040 pParty->CountHirelings(); |
9041 break; | 9041 break; |
9042 case 243: | 9042 case 243: |
9043 v17 = (char *)&this->uSkillPoints; | 9043 v17 = (char *)&this->uSkillPoints; |
9044 result = *v17; | 9044 result = *v17 != NULL; |
9045 if ( (unsigned int)pValue <= *(int *)v17 ) | 9045 if ( (unsigned int)pValue <= *(int *)v17 ) |
9046 { | 9046 { |
9047 *(int *)v17 -= (int)pValue; | 9047 *(int *)v17 -= (int)pValue; |
9048 result = v17; | 9048 result = (v17 != NULL); |
9049 } | 9049 } |
9050 else | 9050 else |
9051 *(int *)v17 = 0; | 9051 *(int *)v17 = 0; |
9052 break; | 9052 break; |
9053 case 275: | 9053 case 275: |
9103 case 313: | 9103 case 313: |
9104 result = (bool)pValue; | 9104 result = (bool)pValue; |
9105 pParty->uNumArenaLordWins -= (char)pValue; | 9105 pParty->uNumArenaLordWins -= (char)pValue; |
9106 break; | 9106 break; |
9107 } | 9107 } |
9108 assert(false && "Function not returning any value!"); | |
9108 } | 9109 } |
9109 else | 9110 else |
9110 { | 9111 { |
9111 if ( (signed int)VarNum >= 123 ) | 9112 if ( (signed int)VarNum >= 123 ) |
9112 { | 9113 { |