Mercurial > mm7
comparison mm7_4.cpp @ 1104:5d5c78088274
strcmpi to stricmp conversion
author | Grumpy7 |
---|---|
date | Mon, 27 May 2013 21:37:14 +0200 |
parents | c59ac5ea63f5 |
children | cf6cd674c398 |
comparison
equal
deleted
inserted
replaced
1103:db395ce89ede | 1104:5d5c78088274 |
---|---|
2934 v2->pFrames[v2->uNumFrames].uAnimTime = atoi(v11); | 2934 v2->pFrames[v2->uNumFrames].uAnimTime = atoi(v11); |
2935 v2->pFrames[v2->uNumFrames].uAnimLength = 0; | 2935 v2->pFrames[v2->uNumFrames].uAnimLength = 0; |
2936 v2->pFrames[v2->uNumFrames].uFlags = 0; | 2936 v2->pFrames[v2->uNumFrames].uFlags = 0; |
2937 for ( j = 3; j < v24.uPropCount; ++j ) | 2937 for ( j = 3; j < v24.uPropCount; ++j ) |
2938 { | 2938 { |
2939 if ( !_strcmpi(v24.pProperties[j], "New") ) | 2939 if ( !_stricmp(v24.pProperties[j], "New") ) |
2940 { | 2940 { |
2941 v13 = (int)&v2->pFrames[v2->uNumFrames].uFlags; | 2941 v13 = (int)&v2->pFrames[v2->uNumFrames].uFlags; |
2942 *(char *)v13 |= 4u; | 2942 *(char *)v13 |= 4u; |
2943 } | 2943 } |
2944 } | 2944 } |
2996 LABEL_4: | 2996 LABEL_4: |
2997 result = 0; | 2997 result = 0; |
2998 } | 2998 } |
2999 else | 2999 else |
3000 { | 3000 { |
3001 while ( _strcmpi(pIconName, v2->pIcons[v3].pAnimationName) ) | 3001 while ( _stricmp(pIconName, v2->pIcons[v3].pAnimationName) ) |
3002 { | 3002 { |
3003 ++uID; | 3003 ++uID; |
3004 ++v3; | 3004 ++v3; |
3005 if ( (signed int)uID >= (signed int)v2->uNumIcons ) | 3005 if ( (signed int)uID >= (signed int)v2->uNumIcons ) |
3006 goto LABEL_4; | 3006 goto LABEL_4; |
3164 { | 3164 { |
3165 strcpy(v2->pIcons[v2->uNumIcons].pAnimationName, v20.pProperties[0]); | 3165 strcpy(v2->pIcons[v2->uNumIcons].pAnimationName, v20.pProperties[0]); |
3166 strcpy(v2->pIcons[v2->uNumIcons].pTextureName, v20.pProperties[1]); | 3166 strcpy(v2->pIcons[v2->uNumIcons].pTextureName, v20.pProperties[1]); |
3167 v8 = v20.pProperties[2]; | 3167 v8 = v20.pProperties[2]; |
3168 v2->pIcons[v2->uNumIcons].uFlags = 0; | 3168 v2->pIcons[v2->uNumIcons].uFlags = 0; |
3169 if ( !_strcmpi(v8, "new") ) | 3169 if ( !_stricmp(v8, "new") ) |
3170 { | 3170 { |
3171 v9 = (int)&v2->pIcons[v2->uNumIcons].uFlags; | 3171 v9 = (int)&v2->pIcons[v2->uNumIcons].uFlags; |
3172 *(char *)v9 |= 4u; | 3172 *(char *)v9 |= 4u; |
3173 } | 3173 } |
3174 v2->pIcons[v2->uNumIcons].uAnimTime = atoi(v20.pProperties[3]); | 3174 v2->pIcons[v2->uNumIcons].uAnimTime = atoi(v20.pProperties[3]); |
7966 break; | 7966 break; |
7967 } | 7967 } |
7968 if( v8 < (signed int)pNPCStats->uNumNewNPCs ) | 7968 if( v8 < (signed int)pNPCStats->uNumNewNPCs ) |
7969 v6[8] &= 0x7Fu; | 7969 v6[8] &= 0x7Fu; |
7970 } | 7970 } |
7971 if ( pParty->pHirelings[0].pName && !_strcmpi(pParty->pHirelings[0].pName, speakingNPC->pName) ) | 7971 if ( pParty->pHirelings[0].pName && !_stricmp(pParty->pHirelings[0].pName, speakingNPC->pName) ) |
7972 { | 7972 { |
7973 v11 = pParty->pHirelings; | 7973 v11 = pParty->pHirelings; |
7974 memset(v11, 0, sizeof(NPCData)); | 7974 memset(v11, 0, sizeof(NPCData)); |
7975 } | 7975 } |
7976 else if ( pParty->pHirelings[1].pName && !_strcmpi(pParty->pHirelings[1].pName, speakingNPC->pName) ) | 7976 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) ) |
7977 { | 7977 { |
7978 v11 = &pParty->pHirelings[1]; | 7978 v11 = &pParty->pHirelings[1]; |
7979 memset(v11, 0, sizeof(NPCData)); | 7979 memset(v11, 0, sizeof(NPCData)); |
7980 } | 7980 } |
7981 pParty->field_709 = 0; | 7981 pParty->field_709 = 0; |
8077 break; | 8077 break; |
8078 } | 8078 } |
8079 if ( v5 < (signed int)pNPCStats->uNumNewNPCs ) | 8079 if ( v5 < (signed int)pNPCStats->uNumNewNPCs ) |
8080 v6[8] &= 0x7Fu; | 8080 v6[8] &= 0x7Fu; |
8081 } | 8081 } |
8082 if ( pParty->pHirelings[0].pName && !_strcmpi(pParty->pHirelings[0].pName, speakingNPC->pName) ) | 8082 if ( pParty->pHirelings[0].pName && !_stricmp(pParty->pHirelings[0].pName, speakingNPC->pName) ) |
8083 { | 8083 { |
8084 v11 = pParty->pHirelings; | 8084 v11 = pParty->pHirelings; |
8085 memset(v11, 0, sizeof(NPCData)); | 8085 memset(v11, 0, sizeof(NPCData)); |
8086 } | 8086 } |
8087 else if ( pParty->pHirelings[1].pName && !_strcmpi(pParty->pHirelings[1].pName, speakingNPC->pName) ) | 8087 else if ( pParty->pHirelings[1].pName && !_stricmp(pParty->pHirelings[1].pName, speakingNPC->pName) ) |
8088 { | 8088 { |
8089 v11 = &pParty->pHirelings[1]; | 8089 v11 = &pParty->pHirelings[1]; |
8090 memset(v11, 0, sizeof(NPCData)); | 8090 memset(v11, 0, sizeof(NPCData)); |
8091 } | 8091 } |
8092 pParty->field_709 = 0; | 8092 pParty->field_709 = 0; |