fix
DXProject/HPLAirscapeLib/src/minerva/MinervaEnemyManager.h (diff) DXProject/HPLAirscapeLib/src/minerva/MinervaShot.h (diff) DXProject/HPLAirscapeLib/src/minerva/MinervaShotManager.h (diff)| @@ -60,6 +60,22 @@ | ||
| 60 | 60 | int getRemainAllyNum() { |
| 61 | 61 | return this->m_nRemainAllyNum; |
| 62 | 62 | } |
| 63 | + tstring getName(int nEnemyType, bool bIsEng) { | |
| 64 | + if (bIsEng) { | |
| 65 | + int nMax = (int)this->m_vecEnemyNamesE.size(); | |
| 66 | + if (nEnemyType < 0 || nEnemyType >= nMax) { | |
| 67 | + ASSERT_IT_INDEX(nEnemyType, 0, nMax); | |
| 68 | + return tstring(); | |
| 69 | + } | |
| 70 | + return this->m_vecEnemyNamesE[nEnemyType]; | |
| 71 | + } | |
| 72 | + int nMax = (int)this->m_vecEnemyNames.size(); | |
| 73 | + if (nEnemyType < 0 || nEnemyType >= nMax) { | |
| 74 | + ASSERT_IT_INDEX(nEnemyType, 0, nMax); | |
| 75 | + return tstring(); | |
| 76 | + } | |
| 77 | + return this->m_vecEnemyNames[nEnemyType]; | |
| 78 | + } | |
| 63 | 79 | HPLEnemySetting* getSetting(int nType) { |
| 64 | 80 | const int MAX_NUM = (int)this->m_vecSettings.size(); |
| 65 | 81 | if (nType < 0 || nType >= MAX_NUM) { |
| @@ -23,6 +23,9 @@ | ||
| 23 | 23 | void setIntPower(int nPower) { this->m_nIntPower = nPower; } |
| 24 | 24 | public: |
| 25 | 25 | MinervaShot(int nType) :HPLShot(nType) { |
| 26 | + this->m_nIntPower = 0; | |
| 27 | + this->m_nFaceDirection3D = 0; | |
| 28 | + this->m_nHitArea3DType = 1; | |
| 26 | 29 | } |
| 27 | 30 | virtual ~MinervaShot() { |
| 28 | 31 | } |
| @@ -9,8 +9,9 @@ | ||
| 9 | 9 | public: // getter/setter |
| 10 | 10 | HPLShotSetting* getShotSetting(int nIndex) { |
| 11 | 11 | const int MAX_NUM = (int)this->m_vecShotSettings.size(); |
| 12 | + | |
| 12 | 13 | if (nIndex < 0 || nIndex > MAX_NUM) { |
| 13 | - ASSERT_IT_INDEX(nIndex, 0, MAX_NUM); | |
| 14 | +// ASSERT_IT_INDEX(nIndex, 0, MAX_NUM); | |
| 14 | 15 | return NULL; |
| 15 | 16 | } |
| 16 | 17 | return &this->m_vecShotSettings[nIndex]; |
