Commit: 338 - OpenXOPS (svn)

X operations（XOPS）に非常に近いFPSゲームを制作・リメイクし、成果物をオープンソースとして公開することを目的としたプロジェクトです。

Commit MetaInfo

• Revision: 338 (tree)
• Time: 2022-11-20 18:10:29
• Author: xops-mikan

Log Message

ポイントパラメーターの種類の値を一部定数化

Change Summary

• modified: trunk/ai.cpp
• modified: trunk/datafile.h
• modified: trunk/event.cpp
• modified: trunk/gamemain.cpp
• modified: trunk/objectmanager.cpp

Incremental Difference

--- trunk/ai.cpp	(revision 337)
+++ trunk/ai.cpp	(revision 338)
@@ -1596,7 +1596,7 @@
 			//警戒待ちパスなら次へ進める
 			pointdata pdata;
 			MoveNavi->GetPathPointData(&pdata);
-			if( (pdata.p1 == 3)&&(pdata.p2 == 4) ){
+			if( (pdata.p1 == POINT_P1TYPE_AIPATH)&&(pdata.p2 == 4) ){
 				MoveNavi->MovePathNextState();
 				MoveNavi->MovePathNowState();
 			}
@@ -2012,7 +2012,7 @@
 	}
 
 	//移動パスなら〜
-	if( pdata.p1 == 3 ){
+	if( pdata.p1 == POINT_P1TYPE_AIPATH ){
 		//移動ステート設定
 		switch(pdata.p2){
 			case 0: movemode = AI_WALK; break;
@@ -2059,7 +2059,7 @@
 	}
 
 	//ランダムパスなら
-	if( pdata.p1 == 8 ){
+	if( pdata.p1 == POINT_P1TYPE_RAND_AIPATH ){
 		movemode = AI_RANDOM;
 		return false;
 	}
@@ -2082,7 +2082,7 @@
 	signed short int nextpointp4 = pdata.p3;
 
 	//ランダムパス処理
-	if( pdata.p1 == 8 ){
+	if( pdata.p1 == POINT_P1TYPE_RAND_AIPATH ){
 		if( GetRand(2) == 0 ){
 			nextpointp4 = pdata.p2;
 		}

--- trunk/datafile.h	(revision 337)
+++ trunk/datafile.h	(revision 338)
@@ -95,6 +95,16 @@
 	signed short int p4;		//!< Param
 } pointdata;
 
+//ポイントデータのP1の種類番号
+#define POINT_P1TYPE_HUMAN			1	//!< Param1 type
+#define POINT_P1TYPE_WEAPON			2	//!< Param1 type
+#define POINT_P1TYPE_AIPATH			3	//!< Param1 type
+#define POINT_P1TYPE_HUMANINFO		4	//!< Param1 type
+#define POINT_P1TYPE_SMALLOBJ		5	//!< Param1 type
+#define POINT_P1TYPE_HUMAN2			6	//!< Param1 type
+#define POINT_P1TYPE_RAND_WEAPON	7	//!< Param1 type
+#define POINT_P1TYPE_RAND_AIPATH	8	//!< Param1 type
+
 //! 追加小物用の構造体
 typedef struct
 {

--- trunk/event.cpp	(revision 337)
+++ trunk/event.cpp	(revision 338)
@@ -176,7 +176,7 @@
 
 		//対象がAIパスならば、強制的にパラメータを書き換える
 		Point->Getdata(&pathdata, pid);
-		if( (pathdata.p1 == 3)||(pathdata.p1 == 8) ){
+		if( (pathdata.p1 == POINT_P1TYPE_AIPATH)||(pathdata.p1 == POINT_P1TYPE_RAND_AIPATH) ){
 			pathdata.p2 = (signed short int)newmode;
 			Point->SetParam(pid, pathdata.p1, pathdata.p2, pathdata.p3, pathdata.p4);
 			return true;

--- trunk/gamemain.cpp	(revision 337)
+++ trunk/gamemain.cpp	(revision 338)
@@ -4002,11 +4002,11 @@
 		for(int i=0; i<TotalPoints; i++){
 			if( PointData.Getdata(&pdata, i) != 0 ){ continue; }
 
-			if( (pdata.p1 == 1)||(pdata.p1 == 6) ){ HumanPoints += 1; }
-			if( (pdata.p1 == 2)||(pdata.p1 == 7) ){ WeaponPoints += 1; }
-			if( pdata.p1 == 5 ){ OjectPoints += 1; }
-			if( pdata.p1 == 4 ){ HumaninfoPoints += 1; }
-			if( (pdata.p1 == 3)||(pdata.p1 == 8) ){ PathPoints += 1; }
+			if( (pdata.p1 == POINT_P1TYPE_HUMAN)||(pdata.p1 == POINT_P1TYPE_HUMAN2) ){ HumanPoints += 1; }
+			if( (pdata.p1 == POINT_P1TYPE_WEAPON)||(pdata.p1 == POINT_P1TYPE_RAND_WEAPON) ){ WeaponPoints += 1; }
+			if( pdata.p1 == POINT_P1TYPE_SMALLOBJ ){ OjectPoints += 1; }
+			if( pdata.p1 == POINT_P1TYPE_HUMANINFO ){ HumaninfoPoints += 1; }
+			if( (pdata.p1 == POINT_P1TYPE_AIPATH)||(pdata.p1 == POINT_P1TYPE_RAND_AIPATH) ){ PathPoints += 1; }
 			if( (10 <= pdata.p1)&&(pdata.p1 <= 19) ){ EventPoints += 1; }
 		}
 		sprintf(str, "HumanPoints : %-3d       WeaponPoints : %-3d    SmallOjectPoints : %-3d", HumanPoints, WeaponPoints, OjectPoints);

--- trunk/objectmanager.cpp	(revision 337)
+++ trunk/objectmanager.cpp	(revision 338)
@@ -232,7 +232,7 @@
 			//成功すれば配列に記録
 			Weapon[0] = &WeaponIndex[Weaponindexid];
 		}
-		if( data.p1 == 1 ){
+		if( data.p1 == POINT_P1TYPE_HUMAN ){
 			//武器Aの仮想武器として追加
 			Weaponindexid = AddVisualWeaponIndex(HumanParam.Weapon[1], true);
 			if( Weaponindexid != -1 ){
@@ -249,7 +249,7 @@
 	Human_ShotFlag[Humanindexid] = false;
 
 	//プレイヤーならば、番号を記録
-	if( ( (data.p1 == 1)||(data.p1 == 6) )&&(data.p4 == 0) ){
+	if( ( (data.p1 == POINT_P1TYPE_HUMAN)||(data.p1 == POINT_P1TYPE_HUMAN2) )&&(data.p4 == 0) ){
 		Player_HumanID = Humanindexid;
 	}
 
@@ -368,7 +368,7 @@
 	int nbs = (unsigned char)data.p3;
 
 	//ランダムな武器ならば
-	if( data.p1 == 7 ){
+	if( data.p1 == POINT_P1TYPE_RAND_WEAPON ){
 		WeaponParameter WeaponParam;
 
 		if( GetRand(2) == 0 ){
@@ -1422,7 +1422,7 @@
 		pointdata data;
 		PointData->Getdata(&data, i);
 
-		if( data.p1 == 4 ){
+		if( data.p1 == POINT_P1TYPE_HUMANINFO ){
 			//人のテクスチャを登録
 			Resource->AddHumanTexture(data.p2);
 		}
@@ -1435,11 +1435,11 @@
 		PointData->Getdata(&data, i);
 
 		//人ならば
-		if( (data.p1 == 1)||(data.p1 == 6) ){
+		if( (data.p1 == POINT_P1TYPE_HUMAN)||(data.p1 == POINT_P1TYPE_HUMAN2) ){
 			pointdata humaninfodata;
 
 			//人情報ポイントを探す
-			if( PointData->SearchPointdata(&humaninfodata, 0x01 + 0x08, 4, 0, 0, data.p2, 0) == 0 ){
+			if( PointData->SearchPointdata(&humaninfodata, 0x01 + 0x08, POINT_P1TYPE_HUMANINFO, 0, 0, data.p2, 0) == 0 ){
 				//continue;
 
 				//人情報ポイントが見つからなかったら、とりあえず「特殊 黒 A」として追加。（バグの再現）
@@ -1455,7 +1455,7 @@
 				Resource->AddHumanTexture(0);
 
 				//人を追加
-				if( data.p1 == 6 ){
+				if( data.p1 == POINT_P1TYPE_HUMAN2 ){
 					Weapon[1] = ID_WEAPON_NONE;
 				}
 
@@ -1477,12 +1477,12 @@
 		}
 
 		//武器ならば
-		if( (data.p1 == 2)||(data.p1 == 7) ){
+		if( (data.p1 == POINT_P1TYPE_WEAPON)||(data.p1 == POINT_P1TYPE_RAND_WEAPON) ){
 			AddWeaponIndex(data);
 		}
 
 		//小物ならば
-		if( data.p1 == 5 ){
+		if( data.p1 == POINT_P1TYPE_SMALLOBJ ){
 			AddSmallObjectIndex(data);
 		}
 	}