Commit: 336 - OpenXOPS (svn)

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

Commit MetaInfo

• Revision: 336 (tree)
• Time: 2022-10-23 23:39:31
• Author: xops-mikan

Log Message

デバック用コンソールに"teleport"コマンド追加、一部コマンドの仕様改善。

Change Summary

• modified: trunk/gamemain.cpp

Incremental Difference

--- trunk/gamemain.cpp	(revision 335)
+++ trunk/gamemain.cpp	(revision 336)
@@ -3587,12 +3587,12 @@
 	//コマンドリスト
 	if( strcmp(NewCommand, "help") == 0 ){
 		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "help          human        result          event            skip <NUM>");
-		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "config        mif          bd1             pd1              resinfo");
-		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "info          view         center          map     model    aiinfo <NUM>");
-		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "tag           radar        inmap           sky <NUM>        dark      fog");
+		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "config        mif          bd1    pd1      resinfo          info");
+		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "view          center       map    model    aiinfo <NUM>     tag");
+		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "radar         inmap        sky <NUM>       dark     fog     teleport <NUM>");
 		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "player <NUM>  revive       kill <NUM>      treat <NUM>      nodamage <NUM>");
 		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "newobj <NUM>  break <NUM>  delhuman <NUM>  delweapon <NUM>  delobj <NUM>");
-		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "nofight       caution      ailevel <NUM>   ff      bot      stop      estop");
+		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "nofight       caution      ailevel <NUM>   ff       bot     stop      estop");
 		AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "speed         window       ss              clear            ver       exit");
 	}
 
@@ -4265,9 +4265,27 @@
 		}
 	}
 
+	//プレイヤー移動
+	if( GetCommandNum("teleport", &id) == true ){
+		if( (0 <= id)&&(id < MAX_HUMAN)&&(id != ObjMgr.GetPlayerID()) ){
+			float x, y, z, rx;
+			human *thuman = ObjMgr.GetHumanObject(id);
+
+			//ターゲットの座標取得
+			thuman->GetPosData(&x, &y, &z, NULL);
+
+			//プレイヤー移動
+			ObjMgr.GetPlayerHumanObject()->GetPosData(NULL, NULL ,NULL, &rx);
+			ObjMgr.GetPlayerHumanObject()->SetPosData(x + 5.0f, y + 5.0f, z + 5.0f, rx);
+
+			sprintf(str, "Teleported player to Human[%d].", id);
+			AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), str);
+		}
+	}
+
 	//プレイヤー切り替え
 	if( GetCommandNum("player", &id) == true ){
-		if( (0 <= id)&&(id < MAX_HUMAN) ){
+		if( (0 <= id)&&(id < MAX_HUMAN)&&(id != ObjMgr.GetPlayerID()) ){
 			//対象プレイヤー番号を適用
 			ObjMgr.SetPlayerID(id);
 
@@ -4666,6 +4684,11 @@
 		GameSpeed = 1;
 	}
 #endif
+
+	if( strcmp(NewCommand, "mikan") == 0 ){
+		AddInfoConsole(d3dg->GetColorCode(1.0f,0.5f,0.0f,1.0f), "Hello! I'm [-_-;](mikan).");
+		AddInfoConsole(d3dg->GetColorCode(1.0f,0.5f,0.0f,1.0f), "Thank you for playing OpenXOPS!");
+	}
 }
 
 //! @brief デバック用コンソールの表示処理