Mercurial > mm7
comparison Player.cpp @ 1861:a86c60679949
changing most of party arrays to std::arrays, some minor cleanups in actor.cpp
author | Grumpy7 |
---|---|
date | Mon, 14 Oct 2013 06:32:30 +0200 |
parents | 211dfe2d8db1 |
children | 351b4ff10ac1 |
comparison
equal
deleted
inserted
replaced
1860:3186f469323a | 1861:a86c60679949 |
---|---|
7024 { | 7024 { |
7025 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; | 7025 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; |
7026 } | 7026 } |
7027 } | 7027 } |
7028 if ( pParty->pHirelings[0].uProfession == pValue ) | 7028 if ( pParty->pHirelings[0].uProfession == pValue ) |
7029 memset(pParty->pHirelings, 0, sizeof(NPCData)); | 7029 memset(pParty->pHirelings.data(), 0, sizeof(NPCData)); |
7030 if ( pParty->pHirelings[1].uProfession == pValue ) | 7030 if ( pParty->pHirelings[1].uProfession == pValue ) |
7031 memset(&pParty->pHirelings[1], 0, sizeof(NPCData)); | 7031 memset(&pParty->pHirelings[1], 0, sizeof(NPCData)); |
7032 pParty->hirelingScrollPosition = 0; | 7032 pParty->hirelingScrollPosition = 0; |
7033 pParty->CountHirelings(); | 7033 pParty->CountHirelings(); |
7034 return; | 7034 return; |