• R/O
  • SSH
  • HTTPS

project200805us: Commit


Commit MetaInfo

Revision3224 (tree)
Time2017-05-14 04:08:09
Authorhogepiyo

Log Message

fix

Change Summary

Incremental Difference

--- DXProject/HPLAirscapeLib/src/minerva/MinervaEnemyManager.h (revision 3223)
+++ DXProject/HPLAirscapeLib/src/minerva/MinervaEnemyManager.h (revision 3224)
@@ -60,6 +60,22 @@
6060 int getRemainAllyNum() {
6161 return this->m_nRemainAllyNum;
6262 }
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+ }
6379 HPLEnemySetting* getSetting(int nType) {
6480 const int MAX_NUM = (int)this->m_vecSettings.size();
6581 if (nType < 0 || nType >= MAX_NUM) {
--- DXProject/HPLAirscapeLib/src/minerva/MinervaShot.h (revision 3223)
+++ DXProject/HPLAirscapeLib/src/minerva/MinervaShot.h (revision 3224)
@@ -23,6 +23,9 @@
2323 void setIntPower(int nPower) { this->m_nIntPower = nPower; }
2424 public:
2525 MinervaShot(int nType) :HPLShot(nType) {
26+ this->m_nIntPower = 0;
27+ this->m_nFaceDirection3D = 0;
28+ this->m_nHitArea3DType = 1;
2629 }
2730 virtual ~MinervaShot() {
2831 }
--- DXProject/HPLAirscapeLib/src/minerva/MinervaShotManager.h (revision 3223)
+++ DXProject/HPLAirscapeLib/src/minerva/MinervaShotManager.h (revision 3224)
@@ -9,8 +9,9 @@
99 public: // getter/setter
1010 HPLShotSetting* getShotSetting(int nIndex) {
1111 const int MAX_NUM = (int)this->m_vecShotSettings.size();
12+
1213 if (nIndex < 0 || nIndex > MAX_NUM) {
13- ASSERT_IT_INDEX(nIndex, 0, MAX_NUM);
14+// ASSERT_IT_INDEX(nIndex, 0, MAX_NUM);
1415 return NULL;
1516 }
1617 return &this->m_vecShotSettings[nIndex];
Show on old repository browser