Commit: 22 - OpenXOPS (svn)

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

Commit MetaInfo

• Revision: 22 (tree)
• Time: 2015-02-01 20:21:00
• Author: xops-mikan

Log Message

デバック用コンソール機能を追加、そのコマンドに対応するための機能拡張

Change Summary

• modified: trunk/window.h
• modified: trunk/gamemain.cpp
• modified: trunk/d3dgraphics.cpp
• modified: trunk/ai.h
• modified: trunk/objectmanager.cpp
• modified: trunk/window.cpp
• modified: trunk/object.h
• modified: trunk/gamemain.h
• modified: trunk/ai.cpp
• modified: trunk/d3dgraphics.h
• modified: trunk/objectmanager.h
• modified: trunk/object.cpp

Incremental Difference

--- trunk/window.h	(revision 21)
+++ trunk/window.h	(revision 22)
@@ -39,6 +39,7 @@
 
 #include <windows.h>
 #include <mmsystem.h>
+#include <time.h>
 
 #pragma comment(lib, "winmm.lib")
 
@@ -46,6 +47,7 @@
 float GetFps(int getcnt);
 bool ControlFps();
 unsigned int GetTimeMS();
+void GetTimeName(char *str);
 void InitRand();
 int GetRand(int num);
 

--- trunk/gamemain.cpp	(revision 21)
+++ trunk/gamemain.cpp	(revision 22)
@@ -222,7 +222,7 @@
 
 	//マップを描画
 	d3dg->ResetWorldTransform();
-	d3dg->DrawMapdata();
+	d3dg->DrawMapdata(false);
 
 	//オブジェクトを描画
 	ObjMgr.Render(camera_x, camera_y, camera_z, 0);
@@ -245,11 +245,11 @@
 	if( (int)(15.0f*GAMEFPS) <= framecnt ){
 		effect = 1.0f;
 	}
-	d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,effect));
+	d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,effect));
 
 	//上下の黒縁描画
 	d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, 40, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
-	d3dg->Draw2DBox(0, SCREEN_HEIGTH - 40, SCREEN_WIDTH, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
+	d3dg->Draw2DBox(0, SCREEN_HEIGHT - 40, SCREEN_WIDTH, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
 
 	//プロジェクト名
 	if( ((int)(0.5f*GAMEFPS) < framecnt)&&(framecnt < (int)(4.0f*GAMEFPS)) ){
@@ -258,7 +258,7 @@
 		sprintf(str, GAMENAME" project", 0, 0);
 		if( framecnt < (int)(1.5f*GAMEFPS) ){ effectA = GetEffectAlpha(framecnt, 1.0f, 1.0f, 0.5f, false); }
 		if( framecnt > (int)(3.0f*GAMEFPS) ){ effectA = GetEffectAlpha(framecnt, 1.0f, 1.0f, 3.0f, true); }
-		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - strlen(str)*22/2, SCREEN_HEIGTH - 140, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,effectA), 22, 22);
+		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - strlen(str)*22/2, SCREEN_HEIGHT - 140, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,effectA), 22, 22);
 	}
 
 	//スタッフ名・その１
@@ -299,7 +299,7 @@
 		if( framecnt < (int)(13.0f*GAMEFPS) ){ effectA = GetEffectAlpha(framecnt, 1.0f, 1.0f, 12.0f, false); }
 		if( ((int)(16.0f*GAMEFPS) < framecnt)&&(framecnt < (int)(17.0f*GAMEFPS)) ){ effectA = GetEffectAlpha(framecnt, 1.0f, 1.0f, 16.0f, true); }
 		if( framecnt >= (int)(17.0f*GAMEFPS) ){ effectA = 0.0f; }
-		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - strlen(str)*22/2, (SCREEN_HEIGTH-11)/2, str, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,effectA), 22, 22);
+		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - strlen(str)*22/2, (SCREEN_HEIGHT-11)/2, str, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,effectA), 22, 22);
 	}
 }
 
@@ -390,7 +390,7 @@
 	GameSound->InitWorldSound();
 
 	mainmenu_mouseX = SCREEN_WIDTH/2;
-	mainmenu_mouseY = SCREEN_HEIGTH/2;
+	mainmenu_mouseY = SCREEN_HEIGHT/2;
 
 	//標準ミッションのスクロールバーの設定
 	if( TOTAL_OFFICIALMISSION > TOTAL_MENUITEMS ){
@@ -453,7 +453,7 @@
 	if( mainmenu_mouseX < 0 ){ mainmenu_mouseX = 0; }
 	if( mainmenu_mouseX > SCREEN_WIDTH-1 ){ mainmenu_mouseX = SCREEN_WIDTH-1; }
 	if( mainmenu_mouseY < 0 ){ mainmenu_mouseY = 0; }
-	if( mainmenu_mouseY > SCREEN_HEIGTH-1 ){ mainmenu_mouseY = SCREEN_HEIGTH-1; }
+	if( mainmenu_mouseY > SCREEN_HEIGHT-1 ){ mainmenu_mouseY = SCREEN_HEIGHT-1; }
 
 	//ESCキーを処理
 	if( inputCtrl->CheckKeyDown(GetEscKeycode()) ){
@@ -575,7 +575,7 @@
 
 	//マップを描画
 	d3dg->ResetWorldTransform();
-	d3dg->DrawMapdata();
+	d3dg->DrawMapdata(false);
 
 	//オブジェクトを描画
 	ObjMgr.Render(camera_x, camera_y, camera_z, 0);
@@ -738,9 +738,9 @@
 
 	//マウスカーソル描画（赤線）
 	d3dg->Draw2DBox(0, mainmenu_mouseY-1, SCREEN_WIDTH, mainmenu_mouseY+1, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f));
-	d3dg->Draw2DBox(mainmenu_mouseX-1, 0, mainmenu_mouseX+1, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f));
+	d3dg->Draw2DBox(mainmenu_mouseX-1, 0, mainmenu_mouseX+1, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f));
 	d3dg->Draw2DLine(0, mainmenu_mouseY, SCREEN_WIDTH, mainmenu_mouseY, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
-	d3dg->Draw2DLine(mainmenu_mouseX, 0, mainmenu_mouseX, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
+	d3dg->Draw2DLine(mainmenu_mouseX, 0, mainmenu_mouseX, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
 
 	//ゲームのロゴマーク描画
 	d3dg->Draw2DTexture(20, 25, gametitle, 480, 80, 1.0f);
@@ -752,7 +752,7 @@
 	else{
 		effect = 0.0f;
 	}
-	d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,effect));
+	d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,effect));
 }
 
 void mainmenu::Destroy()
@@ -840,9 +840,9 @@
 
 	//固定文字描画
 	d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 60*4, 30, "BRIEFING", D3DCOLOR_COLORVALUE(1.0f,1.0f,0.0f,effectA), 60, 42);
-	d3dg->Draw2DTextureFontText(SCREEN_WIDTH - 210 - effectB_sizeW*20/2, SCREEN_HEIGTH - 37 - effectB_sizeH/2,
+	d3dg->Draw2DTextureFontText(SCREEN_WIDTH - 210 - effectB_sizeW*20/2, SCREEN_HEIGHT - 37 - effectB_sizeH/2,
 								"LEFT CLICK TO BEGIN", D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,effectB), effectB_sizeW, effectB_sizeH);
-	d3dg->Draw2DTextureFontText(SCREEN_WIDTH - 210 - 18*20/2, SCREEN_HEIGTH - 37 - 26/2, "LEFT CLICK TO BEGIN", D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 18, 26);
+	d3dg->Draw2DTextureFontText(SCREEN_WIDTH - 210 - 18*20/2, SCREEN_HEIGHT - 37 - 26/2, "LEFT CLICK TO BEGIN", D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 18, 26);
 
 	//ブリーフィング画像描画
 	if( TwoTexture == false ){
@@ -976,7 +976,14 @@
 	view_rx = 0.0f;
 	view_ry = 0.0f;
 	Camera_Debugmode = false;
+	tag = false;
+	wireframe = false;
+	CenterLine = false;
 	Camera_F1mode = false;
+	InvincibleID = -1;
+	PlayerAI = false;
+	AIstop = false;
+	AINoFight = false;
 	framecnt = 0;
 	start_framecnt = 0;
 	end_framecnt = 0;
@@ -989,6 +996,22 @@
 	MainGameInfo.kill = 0;
 	MainGameInfo.headshot = 0;
 
+#ifdef ENABLE_DEBUGCONSOLE
+	Show_Console = false;
+
+	//コンソール用初期化
+	InfoConsoleData = new ConsoleData [MAX_CONSOLELINES];
+	InputConsoleData = new ConsoleData;
+	for(int i=0; i<MAX_CONSOLELINES; i++){
+		InfoConsoleData[i].color = D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f);
+		InfoConsoleData[i].textdata[0] = NULL;
+	}
+	InputConsoleData->color = D3DCOLOR_COLORVALUE(1.0f,1.0f,0.0f,1.0f);
+	InputConsoleData->textdata[0] = NULL;
+	AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Game Debug Console.");
+	AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "        Command list >help");
+#endif
+
 	GameState->NextState();
 	return 0;
 }
@@ -1088,143 +1111,57 @@
 	inputCtrl->GetInputState(true);
 	inputCtrl->MoveMouseCenter();
 
-	//前後左右の移動（走り）操作かチェック
-	if( CheckInputControl(KEY_MOVEFORWARD, 0) ){
-		ObjMgr.MoveForward(PlayerID);
-	}
-	if( CheckInputControl(KEY_MOVEBACKWARD, 0) ){
-		ObjMgr.MoveBack(PlayerID);
-	}
-	if( CheckInputControl(KEY_MOVELEFT, 0) ){
-		ObjMgr.MoveLeft(PlayerID);
-	}
-	if( CheckInputControl(KEY_MOVERIGHT, 0) ){
-		ObjMgr.MoveRight(PlayerID);
-	}
+	//マウスの移動量取得
+	int x, y;
+	float MouseSensitivity;
+	inputCtrl->GetMouseMovement(&x, &y);
 
-	//歩き操作かチェック
-	if( CheckInputControl(KEY_WALK, 0) ){
-		ObjMgr.MoveWalk(PlayerID);
-	}
+	//視点の移動量計算
+	float mang;
+	if( myHuman->GetScopeMode() == 0 ){ mang = 0.01f; }
+	if( myHuman->GetScopeMode() == 1 ){ mang = 0.0032f; }
+	if( myHuman->GetScopeMode() == 2 ){ mang = 0.0060f; }
+	MouseSensitivity = (float)M_PI/180 * mang * GameConfig.GetMouseSensitivity();
 
-	//ジャンプ操作かチェック
-	if( CheckInputControl(KEY_JUMP, 1) ){
-		ObjMgr.MoveJump(PlayerID);
+	//マウス反転（オプション設定）が有効ならば、反転する。
+	if( GameConfig.GetInvertMouseFlag() == true ){
+		y *= -1;
 	}
 
-	if( Camera_Debugmode == true ){		//デバックモードならば
-		//発砲操作かチェック
-		if( CheckInputControl(KEY_Shot, 0) ){
-			//前回の発射より、4フレーム分よりも時間が経っていれば
-			if( bullettime + 4*((int)GAMEFPS) < GetTimeMS() ){
-				float x, y, z, rx, ry;
-				x = camera_x;
-				y = camera_y;
-				z = camera_z;
-				rx = camera_rx;
-				ry = camera_ry;
+	if( Camera_Debugmode == false ){	//通常モードならば
+		if( myHuman->GetHP() > 0 ){
+			//マウスによる向きを計算
+			mouse_rx += x * MouseSensitivity;
+			mouse_ry -= y * MouseSensitivity;
 
-				//未使用の弾オブジェクトを取得
-				bullet* newbullet = ObjMgr.GetNewBulletObject();
-				if( newbullet != NULL ){
-					//弾オブジェクトを設定
-					newbullet->SetPosData(x, y, z, rx, ry);
-					newbullet->SetParamData(40, 5, 10, 1024, ObjMgr.GetPlayerID(), true);
-					newbullet->SetDrawFlag(true);
-					GameSound->ShotWeapon(x, y, z, 0, 1024, true);
+			//キー操作による向きを計算
+			if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x00)) ){ mouse_ry += (float)M_PI/180 * 3; }		// [↑]
+			if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x01)) ){ mouse_ry -= (float)M_PI/180 * 3; }		// [↓]
+			if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x02)) ){ mouse_rx -= (float)M_PI/180 * 3; }		// [←]
+			if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x03)) ){ mouse_rx += (float)M_PI/180 * 3; }		// [→]
 
-					//スコアに加算
-					MainGameInfo.fire += 1;
-
-					//発射時間を記憶（連射間隔判定用）
-					bullettime = GetTimeMS();
-				}
-			}
+			if( mouse_ry > (float)M_PI/18*7 ) mouse_ry = (float)M_PI/18*7;
+			if( mouse_ry < (float)M_PI/18*7 *-1 ) mouse_ry = (float)M_PI/18*7 *-1;
 		}
 	}
-	else{		//デバックモードでなければ
-		HumanParameter humandata;
-		int id_param;
-		bool zombie;
-		int keymode;
+	else{								//デバックモードならば
+		//キー操作によりカメラ座標を計算
+		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x00)) ){ camera_x += 2.0f; }		// [↑]
+		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x01)) ){ camera_x -= 2.0f; }		// [↓]
+		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x02)) ){ camera_z += 2.0f; }		// [←]
+		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x03)) ){ camera_z -= 2.0f; }		// [→]
+		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x48)) ){ camera_y += 2.0f; }		//［NUM +］
+		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x49)) ){ camera_y -= 2.0f; }		//［NUM -］
 
-		//ゾンビかどうか判定
-		myHuman->GetParamData(&id_param, NULL, NULL, NULL);
-		GameParamInfo.GetHuman(id_param, &humandata);
-		if( humandata.type == 2 ){
-			zombie = true;
-		}
-		else{
-			zombie = false;
-		}
-
-		//連射モードを取得
-		if( zombie == true ){
-			keymode = 1;
-		}
-		else if( myHuman->GetWeaponBlazingmode() == false ){
-			keymode = 1;
-		}
-		else{
-			keymode = 0;
-		}
-
-		//発砲操作かチェック
-		if( CheckInputControl(KEY_Shot, keymode) ){
-
-			if( zombie == false ){
-				//弾の発射に成功すれば
-				if( ObjMgr.ShotWeapon(PlayerID) == 1 ){
-					//スコアに加算
-					MainGameInfo.fire += 1;
-
-					//プレイヤーの向きを取得
-					ObjMgr.GetPlayerHumanObject()->GetRxRy(&mouse_rx, &mouse_ry);
-				}
-			}
-			else{
-				for(int i=0; i<MAX_HUMAN; i++){
-					human *EnemyHuman = ObjMgr.GeHumanObject(i);
-					if( ObjMgr.CheckZombieAttack(myHuman, EnemyHuman) == true ){
-						ObjMgr.HitZombieAttack(EnemyHuman);
-					}
-				}
-			}
-
-		}
+		//マウス移動をカメラの向きとして適用
+		//camera_rx -= x*0.0025f;
+		//camera_ry -= y*0.0025f;
+		camera_rx -= x * MouseSensitivity;
+		camera_ry -= y * MouseSensitivity;
+		if( camera_ry > (float)M_PI/18*7 ) camera_ry = (float)M_PI/18*7;
+		if( camera_ry < (float)M_PI/18*7 *-1 ) camera_ry = (float)M_PI/18*7 *-1;
 	}
 
-	//リロード操作かチェック
-	if( CheckInputControl(KEY_RELOAD, 1) ){
-		ObjMgr.ReloadWeapon(PlayerID);
-	}
-
-	//武器の切り替え操作かチェック
-	if( CheckInputControl(KEY_SWITCHWEAPON, 1) ){
-		ObjMgr.ChangeWeapon(PlayerID, -1);
-	}
-	if( CheckInputControl(KEY_WEAPON1, 1) ){
-		ObjMgr.ChangeWeapon(PlayerID, 0);
-	}
-	if( CheckInputControl(KEY_WEAPON2, 1) ){
-		ObjMgr.ChangeWeapon(PlayerID, 1);
-	}
-
-	//武器の廃棄操作かチェック
-	if( CheckInputControl(KEY_DROPWEAPON, 1) ){
-		ObjMgr.DumpWeapon(PlayerID);
-	}
-
-	//スコープ操作かチェック
-	if( CheckInputControl(KEY_ZOOM, 1) ){
-		ObjMgr.ChangeScopeMode(PlayerID);
-	}
-
-	//連射モード変更操作かチェック
-	if( CheckInputControl(KEY_ShotMODE, 1) ){
-		ObjMgr.ChangeShotMode(PlayerID);
-	}
-
 	//ゲーム終了操作かチェック
 	if( inputCtrl->CheckKeyDown(GetEscKeycode()) ){
 		GameState->PushBackSpaceKey();
@@ -1244,22 +1181,6 @@
 		}
 	}
 
-	//カメラ操作
-	if( Camera_F1mode == true ){
-		if( inputCtrl->CheckKeyNow( OriginalkeycodeToDinputdef(0x0C) ) ){	//NUM8
-			view_ry -= (float)M_PI/180 * 2;
-		}
-		if( inputCtrl->CheckKeyNow( OriginalkeycodeToDinputdef(0x09) ) ){	//NUM5
-			view_ry += (float)M_PI/180 * 2;
-		}
-		if( inputCtrl->CheckKeyNow( OriginalkeycodeToDinputdef(0x08) ) ){	//NUM4
-			view_rx -= (float)M_PI/180 * 2;
-		}
-		if( inputCtrl->CheckKeyNow( OriginalkeycodeToDinputdef(0x0A) ) ){	//NUM6
-			view_rx += (float)M_PI/180 * 2;
-		}
-	}
-
 	//画面のUI変更操作かチェック
 	if( inputCtrl->CheckKeyDown( GetFunctionKeycode(2) ) ){
 		if( Camera_F2mode == 2 ){
@@ -1275,216 +1196,311 @@
 		GameState->PushF12Key();
 	}
 
-	//裏技・上昇の操作かチェック
-	if( (inputCtrl->CheckKeyNow( GetFunctionKeycode(5) ))&&(inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x0F))) ){	// F5 + [ENTER]
-		Cmd_F5 = true;
-	}
-	else{
-		Cmd_F5 = false;
-	}
+#ifdef ENABLE_DEBUGCONSOLE
+	//デバック用コンソールの表示操作かチェック
+	if( inputCtrl->CheckKeyDown( GetFunctionKeycode(11) ) ){
+		if( Show_Console == false ){
+			Show_Console = true;
 
-	//裏技・弾追加の操作かチェック
-	if( inputCtrl->CheckKeyNow( GetFunctionKeycode(6) ) ){
-		if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x0F)) ){		// [ENTER]
-			ObjMgr.CheatAddBullet(PlayerID);
+			strcpy(InputConsoleData->textdata, CONSOLE_PROMPT);
 		}
+		else{
+			Show_Console = false;
+		}
 	}
 
-	//裏技・武器変更の操作かチェック
-	if( inputCtrl->CheckKeyNow( GetFunctionKeycode(7) ) ){
-		if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x02)) ){		// [←]
-			int id_param = myHuman->GetMainWeaponTypeNO();
+	if( Show_Console == false ){
+#endif
 
-			//次の武器番号を計算
-			if( id_param >= TOTAL_PARAMETERINFO_WEAPON-1 ){ id_param = 0; }
-			else{ id_param += 1; }
+		if( PlayerAI == false ){
 
-			ObjMgr.CheatNewWeapon(PlayerID, id_param);
-		}
-		if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x03)) ){		// [→]
-			int id_param = myHuman->GetMainWeaponTypeNO();
+			//前後左右の移動（走り）操作かチェック
+			if( CheckInputControl(KEY_MOVEFORWARD, 0) ){
+				ObjMgr.MoveForward(PlayerID);
+			}
+			if( CheckInputControl(KEY_MOVEBACKWARD, 0) ){
+				ObjMgr.MoveBack(PlayerID);
+			}
+			if( CheckInputControl(KEY_MOVELEFT, 0) ){
+				ObjMgr.MoveLeft(PlayerID);
+			}
+			if( CheckInputControl(KEY_MOVERIGHT, 0) ){
+				ObjMgr.MoveRight(PlayerID);
+			}
 
-			//次の武器番号を計算
-			if( id_param <= 0 ){ id_param = TOTAL_PARAMETERINFO_WEAPON-1; }
-			else{ id_param -= 1; }
+			//歩き操作かチェック
+			if( CheckInputControl(KEY_WALK, 0) ){
+				ObjMgr.MoveWalk(PlayerID);
+			}
 
-			ObjMgr.CheatNewWeapon(PlayerID, id_param);
-		}
-	}
+			//ジャンプ操作かチェック
+			if( CheckInputControl(KEY_JUMP, 1) ){
+				ObjMgr.MoveJump(PlayerID);
+			}
 
-	//裏技・人変更の操作かチェック
-	if( inputCtrl->CheckKeyNow( GetFunctionKeycode(8) ) ){
-		int Player_HumanID;
+			if( Camera_Debugmode == true ){		//デバックモードならば
+				//発砲操作かチェック
+				if( CheckInputControl(KEY_Shot, 0) ){
+					//前回の発射より、4フレーム分よりも時間が経っていれば
+					if( bullettime + 4*((int)GAMEFPS) < GetTimeMS() ){
+						float x, y, z, rx, ry;
+						x = camera_x;
+						y = camera_y;
+						z = camera_z;
+						rx = camera_rx;
+						ry = camera_ry;
 
-		if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x02)) ){		// [←]
-			//現在のプレイヤー番号を取得
-			Player_HumanID = ObjMgr.GetPlayerID();
+						//未使用の弾オブジェクトを取得
+						bullet* newbullet = ObjMgr.GetNewBulletObject();
+						if( newbullet != NULL ){
+							//弾オブジェクトを設定
+							newbullet->SetPosData(x, y, z, rx, ry);
+							newbullet->SetParamData(40, 5, 10, 1024, ObjMgr.GetPlayerID(), true);
+							newbullet->SetDrawFlag(true);
+							GameSound->ShotWeapon(x, y, z, 0, 1024, true);
 
-			//次の人を計算
-			Player_HumanID += 1;
-			if( Player_HumanID >= MAX_HUMAN ){ Player_HumanID = 0; }
+							//スコアに加算
+							MainGameInfo.fire += 1;
 
-			//対象プレイヤー番号を適用
-			ObjMgr.SetPlayerID(Player_HumanID);
+							//発射時間を記憶（連射間隔判定用）
+							bullettime = GetTimeMS();
+						}
+					}
+				}
+			}
+			else{		//デバックモードでなければ
+				HumanParameter humandata;
+				int id_param;
+				bool zombie;
+				int keymode;
 
-			//プレイヤーの向きを取得
-			ObjMgr.GetPlayerHumanObject()->GetRxRy(&mouse_rx, &mouse_ry);
-		}
-		if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x03)) ){		// [→]
-			//現在のプレイヤー番号を取得
-			Player_HumanID = ObjMgr.GetPlayerID();
+				//ゾンビかどうか判定
+				myHuman->GetParamData(&id_param, NULL, NULL, NULL);
+				GameParamInfo.GetHuman(id_param, &humandata);
+				if( humandata.type == 2 ){
+					zombie = true;
+				}
+				else{
+					zombie = false;
+				}
 
-			//次の人を計算
-			Player_HumanID -= 1;
-			if( Player_HumanID < 0 ){ Player_HumanID = MAX_HUMAN-1; }
+				//連射モードを取得
+				if( zombie == true ){
+					keymode = 1;
+				}
+				else if( myHuman->GetWeaponBlazingmode() == false ){
+					keymode = 1;
+				}
+				else{
+					keymode = 0;
+				}
 
-			//対象プレイヤー番号を適用
-			ObjMgr.SetPlayerID(Player_HumanID);
+				//発砲操作かチェック
+				if( CheckInputControl(KEY_Shot, keymode) ){
 
-			//プレイヤーの向きを取得
-			ObjMgr.GetPlayerHumanObject()->GetRxRy(&mouse_rx, &mouse_ry);
-		}
-	}
+					if( zombie == false ){
+						//弾の発射に成功すれば
+						if( ObjMgr.ShotWeapon(PlayerID) == 1 ){
+							//スコアに加算
+							MainGameInfo.fire += 1;
 
-	//裏技・人追加の操作かチェック
-	if( inputCtrl->CheckKeyNow( GetFunctionKeycode(9) ) ){
-		if( (inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x00)))||(inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x01))) ){		// [↑]・[↓]
-			float x, y, z, r;
-			int param, dataid, team; 
-			int selectweapon;
-			weapon *weapon[TOTAL_HAVEWEAPON];
-			int weapon_paramid[TOTAL_HAVEWEAPON];
-			for(int i=0; i<TOTAL_HAVEWEAPON; i++){
-				weapon[i] = NULL;
-				weapon_paramid[i] = 0;
+							//プレイヤーの向きを取得
+							ObjMgr.GetPlayerHumanObject()->GetRxRy(&mouse_rx, &mouse_ry);
+						}
+					}
+					else{
+						for(int i=0; i<MAX_HUMAN; i++){
+							human *EnemyHuman = ObjMgr.GeHumanObject(i);
+							if( ObjMgr.CheckZombieAttack(myHuman, EnemyHuman) == true ){
+								ObjMgr.HitZombieAttack(EnemyHuman);
+							}
+						}
+					}
+
+				}
 			}
-			int id;
 
-			//プレイヤーの座標や武器を取得
-			myHuman->GetPosData(&x, &y, &z, &r);
-			myHuman->GetParamData(&param, &dataid, NULL, &team);
-			myHuman->GetWeapon(&selectweapon, weapon);
-			for(int i=0; i<TOTAL_HAVEWEAPON; i++){
-				if( weapon[i] != NULL ){
-					weapon[i]->GetParamData(&weapon_paramid[i], NULL, NULL);
+			//リロード操作かチェック
+			if( CheckInputControl(KEY_RELOAD, 1) ){
+				ObjMgr.ReloadWeapon(PlayerID);
+			}
+
+			//武器の切り替え操作かチェック
+			if( CheckInputControl(KEY_SWITCHWEAPON, 1) ){
+				ObjMgr.ChangeWeapon(PlayerID, -1);
+			}
+			if( CheckInputControl(KEY_WEAPON1, 1) ){
+				ObjMgr.ChangeWeapon(PlayerID, 0);
+			}
+			if( CheckInputControl(KEY_WEAPON2, 1) ){
+				ObjMgr.ChangeWeapon(PlayerID, 1);
+			}
+
+			//武器の廃棄操作かチェック
+			if( CheckInputControl(KEY_DROPWEAPON, 1) ){
+				ObjMgr.DumpWeapon(PlayerID);
+			}
+
+			//スコープ操作かチェック
+			if( CheckInputControl(KEY_ZOOM, 1) ){
+				ObjMgr.ChangeScopeMode(PlayerID);
+			}
+
+			//連射モード変更操作かチェック
+			if( CheckInputControl(KEY_ShotMODE, 1) ){
+				ObjMgr.ChangeShotMode(PlayerID);
+			}
+
+			//カメラ操作
+			if( Camera_F1mode == true ){
+				if( inputCtrl->CheckKeyNow( OriginalkeycodeToDinputdef(0x0C) ) ){	//NUM8
+					view_ry -= (float)M_PI/180 * 2;
 				}
+				if( inputCtrl->CheckKeyNow( OriginalkeycodeToDinputdef(0x09) ) ){	//NUM5
+					view_ry += (float)M_PI/180 * 2;
+				}
+				if( inputCtrl->CheckKeyNow( OriginalkeycodeToDinputdef(0x08) ) ){	//NUM4
+					view_rx -= (float)M_PI/180 * 2;
+				}
+				if( inputCtrl->CheckKeyNow( OriginalkeycodeToDinputdef(0x0A) ) ){	//NUM6
+					view_rx += (float)M_PI/180 * 2;
+				}
 			}
 
-			//プレイヤーの目の前の座標を取得
-			x += cos(r*-1 + (float)M_PI/2)*10.0f;
-			y += 5.0f;
-			z += sin(r*-1 + (float)M_PI/2)*10.0f;
+			//裏技・上昇の操作かチェック
+			if( (inputCtrl->CheckKeyNow( GetFunctionKeycode(5) ))&&(inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x0F))) ){	// F5 + [ENTER]
+				Cmd_F5 = true;
+			}
+			else{
+				Cmd_F5 = false;
+			}
 
-			//人を追加
-			id = ObjMgr.AddHumanIndex(x, y, z, r, param, team, weapon_paramid);
-			if( id >= 0 ){
-				ObjMgr.ChangeWeapon(id, selectweapon);
+			//裏技・弾追加の操作かチェック
+			if( inputCtrl->CheckKeyNow( GetFunctionKeycode(6) ) ){
+				if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x0F)) ){		// [ENTER]
+					ObjMgr.CheatAddBullet(PlayerID);
+				}
+			}
 
-				//AIを設定
-				HumanAI[id].Init();
-				if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x00)) ){		// [↑]
-					HumanAI[id].SetHoldTracking(dataid);
+			//裏技・武器変更の操作かチェック
+			if( inputCtrl->CheckKeyNow( GetFunctionKeycode(7) ) ){
+				if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x02)) ){		// [←]
+					int id_param = myHuman->GetMainWeaponTypeNO();
+
+					//次の武器番号を計算
+					if( id_param >= TOTAL_PARAMETERINFO_WEAPON-1 ){ id_param = 0; }
+					else{ id_param += 1; }
+
+					ObjMgr.CheatNewWeapon(PlayerID, id_param);
 				}
-				if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x01)) ){		// [↓]
-					HumanAI[id].SetHoldWait(x, z, r);
+				if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x03)) ){		// [→]
+					int id_param = myHuman->GetMainWeaponTypeNO();
+
+					//次の武器番号を計算
+					if( id_param <= 0 ){ id_param = TOTAL_PARAMETERINFO_WEAPON-1; }
+					else{ id_param -= 1; }
+
+					ObjMgr.CheatNewWeapon(PlayerID, id_param);
 				}
 			}
-		}
-	}
 
-	//裏技・腕表示の操作かチェック
-	if( inputCtrl->CheckKeyDown( GetHomeKeycode() ) ){
-		if( Camera_HOMEmode == false ){
-			Camera_HOMEmode = true;
-		}
-		else{
-			Camera_HOMEmode = false;
-		}
-	}
+			//裏技・人変更の操作かチェック
+			if( inputCtrl->CheckKeyNow( GetFunctionKeycode(8) ) ){
+				int Player_HumanID;
 
-	//デバックモード使用操作かチェック
-#ifdef _DEBUG
-	if( inputCtrl->CheckKeyDown( GetFunctionKeycode(4) ) ){
-#else
-	if( 0 ){
-#endif
-		if( Camera_Debugmode == false ){
-			Camera_Debugmode = true;
-		}
-		else{
-			Camera_Debugmode = false;
-		}
+				if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x02)) ){		// [←]
+					//現在のプレイヤー番号を取得
+					Player_HumanID = ObjMgr.GetPlayerID();
 
-		//デバックモード開始時のカメラ設定
-		if( Camera_Debugmode == true ){
-			camera_x = 100.0f;
-			camera_y = 100.0f;
-			camera_z = -100.0f;
-			camera_rx = (float)M_PI/180*135;
-			camera_ry = (float)M_PI/180*(-40);
-		}
-	}
+					//次の人を計算
+					Player_HumanID += 1;
+					if( Player_HumanID >= MAX_HUMAN ){ Player_HumanID = 0; }
 
-	//ゲーム実行情報の表示操作かチェック
-	if( inputCtrl->CheckKeyDown( GetFunctionKeycode(11) ) ){
-		if( ShowInfo_Debugmode == false ){
-			ShowInfo_Debugmode = true;
-		}
-		else{
-			ShowInfo_Debugmode = false;
-		}
-	}
+					//対象プレイヤー番号を適用
+					ObjMgr.SetPlayerID(Player_HumanID);
 
-	//マウスの移動量取得
-	int x, y;
-	float MouseSensitivity;
-	inputCtrl->GetMouseMovement(&x, &y);
+					//プレイヤーの向きを取得
+					ObjMgr.GetPlayerHumanObject()->GetRxRy(&mouse_rx, &mouse_ry);
+				}
+				if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x03)) ){		// [→]
+					//現在のプレイヤー番号を取得
+					Player_HumanID = ObjMgr.GetPlayerID();
 
-	//視点の移動量計算
-	float mang;
-	if( myHuman->GetScopeMode() == 0 ){ mang = 0.01f; }
-	if( myHuman->GetScopeMode() == 1 ){ mang = 0.0032f; }
-	if( myHuman->GetScopeMode() == 2 ){ mang = 0.0060f; }
-	MouseSensitivity = (float)M_PI/180 * mang * GameConfig.GetMouseSensitivity();
+					//次の人を計算
+					Player_HumanID -= 1;
+					if( Player_HumanID < 0 ){ Player_HumanID = MAX_HUMAN-1; }
 
-	//マウス反転（オプション設定）が有効ならば、反転する。
-	if( GameConfig.GetInvertMouseFlag() == true ){
-		y *= -1;
-	}
+					//対象プレイヤー番号を適用
+					ObjMgr.SetPlayerID(Player_HumanID);
 
-	if( Camera_Debugmode == false ){	//通常モードならば
-		if( myHuman->GetHP() > 0 ){
-			//マウスによる向きを計算
-			mouse_rx += x * MouseSensitivity;
-			mouse_ry -= y * MouseSensitivity;
+					//プレイヤーの向きを取得
+					ObjMgr.GetPlayerHumanObject()->GetRxRy(&mouse_rx, &mouse_ry);
+				}
+			}
 
-			//キー操作による向きを計算
-			if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x00)) ){ mouse_ry += (float)M_PI/180 * 3; }		// [↑]
-			if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x01)) ){ mouse_ry -= (float)M_PI/180 * 3; }		// [↓]
-			if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x02)) ){ mouse_rx -= (float)M_PI/180 * 3; }		// [←]
-			if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x03)) ){ mouse_rx += (float)M_PI/180 * 3; }		// [→]
+			//裏技・人追加の操作かチェック
+			if( inputCtrl->CheckKeyNow( GetFunctionKeycode(9) ) ){
+				if( (inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x00)))||(inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x01))) ){		// [↑]・[↓]
+					float x, y, z, r;
+					int param, dataid, team; 
+					int selectweapon;
+					weapon *weapon[TOTAL_HAVEWEAPON];
+					int weapon_paramid[TOTAL_HAVEWEAPON];
+					for(int i=0; i<TOTAL_HAVEWEAPON; i++){
+						weapon[i] = NULL;
+						weapon_paramid[i] = 0;
+					}
+					int id;
 
-			if( mouse_ry > (float)M_PI/18*7 ) mouse_ry = (float)M_PI/18*7;
-			if( mouse_ry < (float)M_PI/18*7 *-1 ) mouse_ry = (float)M_PI/18*7 *-1;
+					//プレイヤーの座標や武器を取得
+					myHuman->GetPosData(&x, &y, &z, &r);
+					myHuman->GetParamData(&param, &dataid, NULL, &team);
+					myHuman->GetWeapon(&selectweapon, weapon);
+					for(int i=0; i<TOTAL_HAVEWEAPON; i++){
+						if( weapon[i] != NULL ){
+							weapon[i]->GetParamData(&weapon_paramid[i], NULL, NULL);
+						}
+					}
+
+					//プレイヤーの目の前の座標を取得
+					x += cos(r*-1 + (float)M_PI/2)*10.0f;
+					y += 5.0f;
+					z += sin(r*-1 + (float)M_PI/2)*10.0f;
+
+					//人を追加
+					id = ObjMgr.AddHumanIndex(x, y, z, r, param, team, weapon_paramid);
+					if( id >= 0 ){
+						ObjMgr.ChangeWeapon(id, selectweapon);
+
+						//AIを設定
+						HumanAI[id].Init();
+						if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x00)) ){		// [↑]
+							HumanAI[id].SetHoldTracking(dataid);
+						}
+						if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x01)) ){		// [↓]
+							HumanAI[id].SetHoldWait(x, z, r);
+						}
+					}
+				}
+			}
+
+			//裏技・腕表示の操作かチェック
+			if( inputCtrl->CheckKeyDown( GetHomeKeycode() ) ){
+				if( Camera_HOMEmode == false ){
+					Camera_HOMEmode = true;
+				}
+				else{
+					Camera_HOMEmode = false;
+				}
+			}
 		}
-	}
-	else{								//デバックモードならば
-		//キー操作によりカメラ座標を計算
-		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x00)) ){ camera_x += 2.0f; }		// [↑]
-		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x01)) ){ camera_x -= 2.0f; }		// [↓]
-		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x02)) ){ camera_z += 2.0f; }		// [←]
-		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x03)) ){ camera_z -= 2.0f; }		// [→]
-		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x48)) ){ camera_y += 2.0f; }		//［NUM +］
-		if( inputCtrl->CheckKeyNow(OriginalkeycodeToDinputdef(0x49)) ){ camera_y -= 2.0f; }		//［NUM -］
 
-		//マウス移動をカメラの向きとして適用
-		//camera_rx -= x*0.0025f;
-		//camera_ry -= y*0.0025f;
-		camera_rx -= x * MouseSensitivity;
-		camera_ry -= y * MouseSensitivity;
-		if( camera_ry > (float)M_PI/18*7 ) camera_ry = (float)M_PI/18*7;
-		if( camera_ry < (float)M_PI/18*7 *-1 ) camera_ry = (float)M_PI/18*7 *-1;
+#ifdef ENABLE_DEBUGCONSOLE
 	}
+	if( Show_Console == true ){
+		InputConsole();
+	}
+#endif
 
 	time_input = GetTimeMS() - time;
 }
@@ -1507,7 +1523,7 @@
 	GameParamInfo.GetWeapon(weaponid, &data);
 
 	//プレイヤー（オブジェクト）の向きを設定
-	if( myHuman->GetHP() > 0 ){
+	if( (PlayerAI == false)&&(myHuman->GetHP() > 0) ){
 		myHuman->SetRxRy(mouse_rx, mouse_ry);
 	}
 
@@ -1530,9 +1546,10 @@
 	//-----------------------------------
 
 	time = GetTimeMS();
-	int PlayerID = ObjMgr.GetPlayerID();
-	for(int i=0; i<MAX_HUMAN; i++){
-		if( i != PlayerID ){
+	if( AIstop == false ){
+		int PlayerID = ObjMgr.GetPlayerID();
+		for(int i=0; i<MAX_HUMAN; i++){
+			if( (PlayerAI == false)&&(i == PlayerID) ){ continue; }
 			//AIを実行
 			HumanAI[i].Process();
 		}
@@ -1588,6 +1605,11 @@
 	float x, y, z;
 	myHuman->GetPosData(&x, &y, &z, NULL);
 
+	if( PlayerAI == true ){
+		//プレイヤーの向きを取得
+		ObjMgr.GetPlayerHumanObject()->GetRxRy(&mouse_rx, &mouse_ry);
+	}
+
 	//カメラワークを求める
 	if( Camera_Debugmode == true ){
 		//
@@ -1630,6 +1652,18 @@
 	//ダメージを受けていれば、レッドフラッシュを描画する
 	redflash_flag = myHuman->CheckHit();
 
+	//-----------------------------------
+
+#ifdef ENABLE_DEBUGCONSOLE
+	//デバック用コンソールを表示しており、かつミッション終了のカウントが始まっていなければ〜
+	if( (Show_Console == true)&&(end_framecnt == 0) ){
+		//デバック用コンソールのメイン処理
+		ProcessConsole();
+	}
+#endif
+
+	//-----------------------------------
+
 	framecnt += 1;
 	if( start_framecnt < (int)(1.0f*GAMEFPS) ){	//ミッション開始中なら
 		start_framecnt += 1;
@@ -1692,12 +1726,14 @@
 	//Zバッファを初期化
 	d3dg->ResetZbuffer();
 
-	//中心線描画（デバック用）
-	//d3dg->Centerline();
+	if( CenterLine == true ){
+		//中心線描画（デバック用）
+		d3dg->Centerline();
+	}
 
 	//マップを描画
 	d3dg->ResetWorldTransform();
-	d3dg->DrawMapdata();
+	d3dg->DrawMapdata(wireframe);
 
 	//プレイヤーの描画有無の決定
 	int DrawPlayer = 0;
@@ -1766,30 +1802,30 @@
 
 	//レッドフラッシュ描画
 	if( redflash_flag == true ){
-		d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f));
+		d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f));
 		redflash_flag = false;
 	}
 
 	//スコープ表示
 	if( (Camera_F1mode == false)&&(myHuman->GetScopeMode() == 1) ){
-		d3dg->Draw2DTexture(0, 0, Resource.GetScopeTexture(), SCREEN_WIDTH, SCREEN_HEIGTH, 1.0f);
-		d3dg->Draw2DLine(SCREEN_WIDTH/2-49, SCREEN_HEIGTH/2, SCREEN_WIDTH/2-4, SCREEN_HEIGTH/2, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
-		d3dg->Draw2DLine(SCREEN_WIDTH/2+4, SCREEN_HEIGTH/2, SCREEN_WIDTH/2+49, SCREEN_HEIGTH/2, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
-		d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGTH/2-49, SCREEN_WIDTH/2, SCREEN_HEIGTH/2-4, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
-		d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGTH/2+4, SCREEN_WIDTH/2, SCREEN_HEIGTH/2+49, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
-		d3dg->Draw2DBox(SCREEN_WIDTH/2-50, SCREEN_HEIGTH/2-1, SCREEN_WIDTH/20+50, SCREEN_HEIGTH/2+1, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,0.5f));
-		d3dg->Draw2DBox(SCREEN_WIDTH/2-1, SCREEN_HEIGTH/2-50, SCREEN_WIDTH/2+1, SCREEN_HEIGTH/2+50, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,0.5f));
+		d3dg->Draw2DTexture(0, 0, Resource.GetScopeTexture(), SCREEN_WIDTH, SCREEN_HEIGHT, 1.0f);
+		d3dg->Draw2DLine(SCREEN_WIDTH/2-49, SCREEN_HEIGHT/2, SCREEN_WIDTH/2-4, SCREEN_HEIGHT/2, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
+		d3dg->Draw2DLine(SCREEN_WIDTH/2+4, SCREEN_HEIGHT/2, SCREEN_WIDTH/2+49, SCREEN_HEIGHT/2, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
+		d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGHT/2-49, SCREEN_WIDTH/2, SCREEN_HEIGHT/2-4, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
+		d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGHT/2+4, SCREEN_WIDTH/2, SCREEN_HEIGHT/2+49, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
+		d3dg->Draw2DBox(SCREEN_WIDTH/2-50, SCREEN_HEIGHT/2-1, SCREEN_WIDTH/20+50, SCREEN_HEIGHT/2+1, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,0.5f));
+		d3dg->Draw2DBox(SCREEN_WIDTH/2-1, SCREEN_HEIGHT/2-50, SCREEN_WIDTH/2+1, SCREEN_HEIGHT/2+50, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,0.5f));
 	}
 	if( (Camera_F1mode == false)&&(myHuman->GetScopeMode() == 2) ){
-		d3dg->Draw2DTexture(0, 0, Resource.GetScopeTexture(), SCREEN_WIDTH, SCREEN_HEIGTH, 1.0f);
-		d3dg->Draw2DLine(0, SCREEN_HEIGTH/2, SCREEN_WIDTH, SCREEN_HEIGTH/2, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
-		d3dg->Draw2DLine(SCREEN_WIDTH/2, 0, SCREEN_WIDTH/2, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
-		d3dg->Draw2DBox(0, SCREEN_HEIGTH/2-1, SCREEN_WIDTH, SCREEN_HEIGTH/2+1, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,0.5f));
-		d3dg->Draw2DBox(SCREEN_WIDTH/2-1, 0, SCREEN_WIDTH/2+1, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,0.5f));
+		d3dg->Draw2DTexture(0, 0, Resource.GetScopeTexture(), SCREEN_WIDTH, SCREEN_HEIGHT, 1.0f);
+		d3dg->Draw2DLine(0, SCREEN_HEIGHT/2, SCREEN_WIDTH, SCREEN_HEIGHT/2, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
+		d3dg->Draw2DLine(SCREEN_WIDTH/2, 0, SCREEN_WIDTH/2, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
+		d3dg->Draw2DBox(0, SCREEN_HEIGHT/2-1, SCREEN_WIDTH, SCREEN_HEIGHT/2+1, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,0.5f));
+		d3dg->Draw2DBox(SCREEN_WIDTH/2-1, 0, SCREEN_WIDTH/2+1, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,0.5f));
 	}
 
 	//目隠し表示
-	if( hp > 0 ){
+	if( (Camera_Debugmode == false)&&(hp > 0) ){
 
 		int scopemode = myHuman->GetScopeMode();
 		float addang;
@@ -1802,22 +1838,22 @@
 
 		//上
 		if( CollD.CheckALLBlockInside(camera_x + cos(camera_rx)*cos(camera_ry + addang) * adddist, camera_y + sin(camera_ry + addang) * adddist, camera_z + sin(camera_rx)*cos(camera_ry + addang) * adddist) == true ){
-			d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, SCREEN_HEIGTH/2, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
+			d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT/2, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
 		}
 
 		//下
 		if( CollD.CheckALLBlockInside(camera_x + cos(camera_rx)*cos(camera_ry - addang) * adddist, camera_y + sin(camera_ry - addang) * adddist, camera_z + sin(camera_rx)*cos(camera_ry - addang) * adddist) == true ){
-			d3dg->Draw2DBox(0, SCREEN_HEIGTH/2, SCREEN_WIDTH, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
+			d3dg->Draw2DBox(0, SCREEN_HEIGHT/2, SCREEN_WIDTH, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
 		}
 
 		//左
 		if( CollD.CheckALLBlockInside(camera_x + cos(camera_rx + addang)*cos(camera_ry) * adddist, camera_y + sin(camera_ry) * adddist, camera_z + sin(camera_rx + addang)*cos(camera_ry) * adddist) == true ){
-			d3dg->Draw2DBox(0, 0, SCREEN_WIDTH/2, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
+			d3dg->Draw2DBox(0, 0, SCREEN_WIDTH/2, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
 		}
 
 		//右
 		if( CollD.CheckALLBlockInside(camera_x + cos(camera_rx - addang)*cos(camera_ry) * adddist, camera_y + sin(camera_ry) * adddist, camera_z + sin(camera_rx - addang)*cos(camera_ry) * adddist) == true ){
-			d3dg->Draw2DBox(SCREEN_WIDTH/2, 0, SCREEN_WIDTH, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
+			d3dg->Draw2DBox(SCREEN_WIDTH/2, 0, SCREEN_WIDTH, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f));
 		}
 	}
 
@@ -1852,10 +1888,6 @@
 		d3dg->Draw2DTextureFontText(10+1, 90+1, str, D3DCOLOR_COLORVALUE(0.1f,0.1f,0.1f,1.0f), 10, 14);
 		d3dg->Draw2DTextureFontText(10, 90, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 10, 14);
 	}
-	else{
-		d3dg->Draw2DTextureFontText(10+1, 10+1, "Debug information [F11]", D3DCOLOR_COLORVALUE(0.1f,0.1f,0.1f,1.0f), 12, 18);
-		d3dg->Draw2DTextureFontText(10, 10, "Debug information [F11]", D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 12, 18);
-	}
 
 	//ゲーム実行速度の表示
 	if( 1 ){
@@ -1874,17 +1906,17 @@
 		//"ｳｴｴｴｴｴｴｵ"
 		str[0] = (signed char)0xB3;		str[1] = (signed char)0xB4;		str[2] = (signed char)0xB4;		str[3] = (signed char)0xB4;		str[4] = (signed char)0xB4;
 		str[5] = (signed char)0xB4;		str[6] = (signed char)0xB4;		str[7] = (signed char)0xB5;		str[8] = (signed char)0x00;
-		d3dg->Draw2DTextureFontText(15, SCREEN_HEIGTH - 105, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,0.5f), 32, 32);
+		d3dg->Draw2DTextureFontText(15, SCREEN_HEIGHT - 105, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,0.5f), 32, 32);
 		//"ﾃﾄﾄﾄﾄﾄﾄﾅ"
 		for(int i=0; str[i] != 0x00; i++){ str[i] += (signed char)0x10; }
-		d3dg->Draw2DTextureFontText(15, SCREEN_HEIGTH - 105 +32, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,0.5f), 32, 32);
+		d3dg->Draw2DTextureFontText(15, SCREEN_HEIGHT - 105 +32, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,0.5f), 32, 32);
 		//"ｳｴｴｶｷｷｷｸｹ"
 		str[0] = (signed char)0xB3;		str[1] = (signed char)0xB4;		str[2] = (signed char)0xB4;		str[3] = (signed char)0xB6;		str[4] = (signed char)0xB7;
 		str[5] = (signed char)0xB7;		str[6] = (signed char)0xB7;		str[7] = (signed char)0xB8;		str[8] = (signed char)0xB9;		str[9] = (signed char)0x00;
-		d3dg->Draw2DTextureFontText(15, SCREEN_HEIGTH - 55, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,0.5f), 32, 32);
+		d3dg->Draw2DTextureFontText(15, SCREEN_HEIGHT - 55, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,0.5f), 32, 32);
 		//"ﾃﾄﾄﾆﾇﾇﾇﾈﾉ"
 		for(int i=0; str[i] != 0x00; i++){ str[i] += (signed char)0x10; }
-		d3dg->Draw2DTextureFontText(15, SCREEN_HEIGTH - 55 +32, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,0.5f), 32, 32);
+		d3dg->Draw2DTextureFontText(15, SCREEN_HEIGHT - 55 +32, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,0.5f), 32, 32);
 
 		//右下エリア用文字コード設定
 		str[0] = (signed char)0xB0;//'ｰ';
@@ -1909,7 +1941,7 @@
 			if( str[i] == 'A' ){ str[i] = (signed char)0xBB; }	//'ｻ'
 			if( str[i] == 'B' ){ str[i] = (signed char)0xBA; }	//'ｺ'
 		}
-		d3dg->Draw2DTextureFontText(25, SCREEN_HEIGTH - 96, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 23, 24);
+		d3dg->Draw2DTextureFontText(25, SCREEN_HEIGHT - 96, str, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 23, 24);
 
 		//HPによる色の決定
 		int statecolor;
@@ -1928,20 +1960,20 @@
 
 		//HP表示
 		if( hp >= 80 ){
-			d3dg->Draw2DTextureFontText(23, SCREEN_HEIGTH - 45, "STATE", statecolor, 18, 24);
-			d3dg->Draw2DTextureFontText(155, SCREEN_HEIGTH - 45, "FINE", statecolor, 18, 24);
+			d3dg->Draw2DTextureFontText(23, SCREEN_HEIGHT - 45, "STATE", statecolor, 18, 24);
+			d3dg->Draw2DTextureFontText(155, SCREEN_HEIGHT - 45, "FINE", statecolor, 18, 24);
 		}
 		else if( hp >= 40 ){
-			d3dg->Draw2DTextureFontText(23, SCREEN_HEIGTH - 45, "STATE", statecolor, 18, 24);
-			d3dg->Draw2DTextureFontText(135, SCREEN_HEIGTH - 45, "CAUTION", statecolor, 18, 24);
+			d3dg->Draw2DTextureFontText(23, SCREEN_HEIGHT - 45, "STATE", statecolor, 18, 24);
+			d3dg->Draw2DTextureFontText(135, SCREEN_HEIGHT - 45, "CAUTION", statecolor, 18, 24);
 		}
 		else if( hp > 0 ){
-			d3dg->Draw2DTextureFontText(23, SCREEN_HEIGTH - 45, "STATE", statecolor, 18, 24);
-			d3dg->Draw2DTextureFontText(140, SCREEN_HEIGTH - 45, "DANGER", statecolor, 18, 24);
+			d3dg->Draw2DTextureFontText(23, SCREEN_HEIGHT - 45, "STATE", statecolor, 18, 24);
+			d3dg->Draw2DTextureFontText(140, SCREEN_HEIGHT - 45, "DANGER", statecolor, 18, 24);
 		}
 		else{
-			d3dg->Draw2DTextureFontText(23, SCREEN_HEIGTH - 45, "STATE", statecolor, 18, 24);
-			d3dg->Draw2DTextureFontText(155, SCREEN_HEIGTH - 45, "DEAD", statecolor, 18, 24);
+			d3dg->Draw2DTextureFontText(23, SCREEN_HEIGHT - 45, "STATE", statecolor, 18, 24);
+			d3dg->Draw2DTextureFontText(155, SCREEN_HEIGHT - 45, "DEAD", statecolor, 18, 24);
 		}
 
 		//武器名表示
@@ -1952,13 +1984,13 @@
 	if( Camera_F2mode == 1 ){
 		//画面周りの線
 		d3dg->Draw2DLine(0, 0, SCREEN_WIDTH-1, 0, D3DCOLOR_COLORVALUE(0.0f,1.0f,0.0f,1.0f));
-		d3dg->Draw2DLine(SCREEN_WIDTH-1, 0, SCREEN_WIDTH-1, SCREEN_HEIGTH-1, D3DCOLOR_COLORVALUE(0.0f,1.0f,0.0f,1.0f));
-		d3dg->Draw2DLine(0, 0, 0, SCREEN_HEIGTH-1, D3DCOLOR_COLORVALUE(0.0f,1.0f,0.0f,1.0f));
-		d3dg->Draw2DLine(0, SCREEN_HEIGTH-1, SCREEN_WIDTH-1, SCREEN_HEIGTH-1, D3DCOLOR_COLORVALUE(0.0f,1.0f,0.0f,1.0f));
+		d3dg->Draw2DLine(SCREEN_WIDTH-1, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, D3DCOLOR_COLORVALUE(0.0f,1.0f,0.0f,1.0f));
+		d3dg->Draw2DLine(0, 0, 0, SCREEN_HEIGHT-1, D3DCOLOR_COLORVALUE(0.0f,1.0f,0.0f,1.0f));
+		d3dg->Draw2DLine(0, SCREEN_HEIGHT-1, SCREEN_WIDTH-1, SCREEN_HEIGHT-1, D3DCOLOR_COLORVALUE(0.0f,1.0f,0.0f,1.0f));
 
 		//武器名表示
-		d3dg->Draw2DBox(8, SCREEN_HEIGTH - 32, 227, SCREEN_HEIGTH - 7, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,0.3f));
-		d3dg->Draw2DTextureFontText(10, SCREEN_HEIGTH - 30, weaponname, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 16, 20);
+		d3dg->Draw2DBox(8, SCREEN_HEIGHT - 32, 227, SCREEN_HEIGHT - 7, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,0.3f));
+		d3dg->Draw2DTextureFontText(10, SCREEN_HEIGHT - 30, weaponname, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 16, 20);
 	}
 
 	//イベントメッセージ表示
@@ -1968,20 +2000,20 @@
 		float effectA = 1.0f;
 		if( message_cnt < (int)(0.2f*GAMEFPS) ){ effectA = GetEffectAlpha(message_cnt, 1.0f, 0.2f, 0.0f, false); }
 		if( (int)((TOTAL_EVENTENT_SHOWMESSEC-0.2f)*GAMEFPS) < message_cnt ){ effectA = GetEffectAlpha(message_cnt, 1.0f, 0.2f, (TOTAL_EVENTENT_SHOWMESSEC - 0.2f), true); }
-		d3dg->Draw2DMSFontTextCenter(0 +1, SCREEN_HEIGTH - 140 +1, SCREEN_WIDTH, 140, messtr, D3DCOLOR_COLORVALUE(0.1f,0.1f,0.1f,effectA));
-		d3dg->Draw2DMSFontTextCenter(0, SCREEN_HEIGTH - 140, SCREEN_WIDTH, 140, messtr, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,effectA));
+		d3dg->Draw2DMSFontTextCenter(0 +1, SCREEN_HEIGHT - 140 +1, SCREEN_WIDTH, 140, messtr, D3DCOLOR_COLORVALUE(0.1f,0.1f,0.1f,effectA));
+		d3dg->Draw2DMSFontTextCenter(0, SCREEN_HEIGHT - 140, SCREEN_WIDTH, 140, messtr, D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,effectA));
 	}
 
 	//リロード表示
 	if( reloadcnt > 0 ){
-		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 145 +3, SCREEN_HEIGTH - 180+3, "RELOADING", D3DCOLOR_COLORVALUE(0.2f,0.2f,0.2f,1.0f), 32, 34);
-		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 145, SCREEN_HEIGTH - 180, "RELOADING", D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 32, 34);
+		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 145 +3, SCREEN_HEIGHT - 180+3, "RELOADING", D3DCOLOR_COLORVALUE(0.2f,0.2f,0.2f,1.0f), 32, 34);
+		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 145, SCREEN_HEIGHT - 180, "RELOADING", D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 32, 34);
 	}
 
 	//武器切り替え表示
 	if( selectweaponcnt > 0 ){
-		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 130 +3, SCREEN_HEIGTH - 180+3, "CHANGING", D3DCOLOR_COLORVALUE(0.2f,0.2f,0.2f,1.0f), 32, 34);
-		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 130, SCREEN_HEIGTH - 180, "CHANGING", D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 32, 34);
+		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 130 +3, SCREEN_HEIGHT - 180+3, "CHANGING", D3DCOLOR_COLORVALUE(0.2f,0.2f,0.2f,1.0f), 32, 34);
+		d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 130, SCREEN_HEIGHT - 180, "CHANGING", D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), 32, 34);
 	}
 
 	//照準表示
@@ -1991,28 +2023,36 @@
 			float alpha = 1.0f - (float)ErrorRange/40.0f;
 			if( alpha < 0.0f ){ alpha = 0.0f; }
 
-			d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGTH/2, SCREEN_WIDTH/2, SCREEN_HEIGTH/2+4, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f));
-			d3dg->Draw2DLine(SCREEN_WIDTH/2-15, SCREEN_HEIGTH/2+15, SCREEN_WIDTH/2-19, SCREEN_HEIGTH/2+19, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f));
-			d3dg->Draw2DLine(SCREEN_WIDTH/2+15, SCREEN_HEIGTH/2+15, SCREEN_WIDTH/2+19, SCREEN_HEIGTH/2+19, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f));
-			d3dg->Draw2DLine(SCREEN_WIDTH/2-4, SCREEN_HEIGTH/2+4, SCREEN_WIDTH/2+4, SCREEN_HEIGTH/2+4, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
+			d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGHT/2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2+4, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f));
+			d3dg->Draw2DLine(SCREEN_WIDTH/2-15, SCREEN_HEIGHT/2+15, SCREEN_WIDTH/2-19, SCREEN_HEIGHT/2+19, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f));
+			d3dg->Draw2DLine(SCREEN_WIDTH/2+15, SCREEN_HEIGHT/2+15, SCREEN_WIDTH/2+19, SCREEN_HEIGHT/2+19, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f));
+			d3dg->Draw2DLine(SCREEN_WIDTH/2-4, SCREEN_HEIGHT/2+4, SCREEN_WIDTH/2+4, SCREEN_HEIGHT/2+4, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
 
-			d3dg->Draw2DLine(SCREEN_WIDTH/2-4 - ErrorRange, SCREEN_HEIGTH/2-4 - ErrorRange/2, SCREEN_WIDTH/2-4 - ErrorRange, SCREEN_HEIGTH/2+4 + ErrorRange/2, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,alpha));
-			d3dg->Draw2DLine(SCREEN_WIDTH/2+4 + ErrorRange, SCREEN_HEIGTH/2-4 - ErrorRange/2, SCREEN_WIDTH/2+4 + ErrorRange, SCREEN_HEIGTH/2+4 + ErrorRange/2, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,alpha));
+			d3dg->Draw2DLine(SCREEN_WIDTH/2-4 - ErrorRange, SCREEN_HEIGHT/2-4 - ErrorRange/2, SCREEN_WIDTH/2-4 - ErrorRange, SCREEN_HEIGHT/2+4 + ErrorRange/2, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,alpha));
+			d3dg->Draw2DLine(SCREEN_WIDTH/2+4 + ErrorRange, SCREEN_HEIGHT/2-4 - ErrorRange/2, SCREEN_WIDTH/2+4 + ErrorRange, SCREEN_HEIGHT/2+4 + ErrorRange/2, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,alpha));
 		}
 		else{										//標準型
-			d3dg->Draw2DLine(SCREEN_WIDTH/2-13, SCREEN_HEIGTH/2, SCREEN_WIDTH/2-3, SCREEN_HEIGTH/2, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
-			d3dg->Draw2DLine(SCREEN_WIDTH/2+13, SCREEN_HEIGTH/2, SCREEN_WIDTH/2+3, SCREEN_HEIGTH/2, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
-			d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGTH/2-13, SCREEN_WIDTH/2, SCREEN_HEIGTH/2-3, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
-			d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGTH/2+13, SCREEN_WIDTH/2, SCREEN_HEIGTH/2+3, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
+			d3dg->Draw2DLine(SCREEN_WIDTH/2-13, SCREEN_HEIGHT/2, SCREEN_WIDTH/2-3, SCREEN_HEIGHT/2, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
+			d3dg->Draw2DLine(SCREEN_WIDTH/2+13, SCREEN_HEIGHT/2, SCREEN_WIDTH/2+3, SCREEN_HEIGHT/2, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
+			d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGHT/2-13, SCREEN_WIDTH/2, SCREEN_HEIGHT/2-3, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
+			d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGHT/2+13, SCREEN_WIDTH/2, SCREEN_HEIGHT/2+3, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f));
 
 			str[0] = (signed char)0xBD;		str[1] = 0x00;	//"ｽ"
-			d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 16 - ErrorRange, SCREEN_HEIGTH/2 - 16, str, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f), 32, 32);
+			d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 16 - ErrorRange, SCREEN_HEIGHT/2 - 16, str, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f), 32, 32);
 			str[0] = (signed char)0xBE;		str[1] = 0x00;	//"ｾ"
-			d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 16 + ErrorRange, SCREEN_HEIGTH/2 - 16, str, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f), 32, 32);
+			d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 16 + ErrorRange, SCREEN_HEIGHT/2 - 16, str, D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,0.5f), 32, 32);
 		}
 	}
 
+	if( tag == true ){
+		int color;
+		if( ObjMgr.GetObjectInfoTag(camera_x, camera_y, camera_z, camera_rx, camera_ry, &color, str) == true ){
+			d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - strlen(str)*14/2 + 1, SCREEN_HEIGHT/2 + 30 +1 , str, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f), 14, 18);
+			d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - strlen(str)*14/2, SCREEN_HEIGHT/2 + 30, str, color, 14, 18);
+		}
+	}
 
+
 	//-----------------------------------
 
 	//Zバッファを初期化
@@ -2042,7 +2082,17 @@
 
 	//-----------------------------------
 
+#ifdef ENABLE_DEBUGCONSOLE
+	if( Show_Console == true ){
+		if( ScreenShot == false ){
+			RenderConsole();
+		}
+	}
+#endif
 
+	//-----------------------------------
+
+
 	//スタート時と終了時のブラックアウト設定
 	if( start_framecnt < (int)(1.0f*GAMEFPS) ){
 		effect = GetEffectAlpha(start_framecnt, 1.0f, 1.0f, 0.0f, true);
@@ -2053,7 +2103,7 @@
 	else{
 		effect = 0.0f;
 	}
-	d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, SCREEN_HEIGTH, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,effect));
+	d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,effect));
 
 	//終了時の文字表示
 	if( end_framecnt > 0 ){
@@ -2068,10 +2118,10 @@
 		}
 
 		if( GameInfoData.missioncomplete == true ){
-			d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 252, SCREEN_HEIGTH/2 + 10, "objective complete", D3DCOLOR_COLORVALUE(1.0f,0.5f,0.0f,effect), 28, 32);
+			d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 252, SCREEN_HEIGHT/2 + 10, "objective complete", D3DCOLOR_COLORVALUE(1.0f,0.5f,0.0f,effect), 28, 32);
 		}
 		else{
-			d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 210, SCREEN_HEIGTH/2 + 10, "mission failure", D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,effect), 28, 32);
+			d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 210, SCREEN_HEIGHT/2 + 10, "mission failure", D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,effect), 28, 32);
 		}
 	}
 
@@ -2079,6 +2129,481 @@
 	time_render = GetTimeMS() - time;
 }
 
+#ifdef ENABLE_DEBUGCONSOLE
+
+//! デバック用コンソールに新たな文字列を追加
+//! @param color 文字の色
+//! @param str 追加する文字列のポインタ
+//! @attention 新しい文字列は常に下から追加されます。
+//! @attention 表示可能行数（定数：MAX_CONSOLELINES）を上回る場合、最初の行（1行目）を削除し1行ずつずらした上で、一番下の行に追加します。
+void maingame::AddInfoConsole(int color, char *str)
+{
+	for(int i=0; i<MAX_CONSOLELINES; i++){
+		if( InfoConsoleData[i].textdata[0] == NULL ){
+			InfoConsoleData[i].color = color;
+			strcpy(InfoConsoleData[i].textdata, str);
+			return;
+		}
+	}
+
+	for(int i=1; i<MAX_CONSOLELINES; i++){
+		memcpy(&(InfoConsoleData[i-1]), &(InfoConsoleData[i]), sizeof(ConsoleData));
+	}
+	InfoConsoleData[MAX_CONSOLELINES-1].color = color;
+	strcpy(InfoConsoleData[MAX_CONSOLELINES-1].textdata, str);
+}
+
+//! 入力用コンソールに文字を一文字追加
+//! @param inchar 追加する文字
+void maingame::ConsoleInputText(char inchar)
+{
+	for(int i=0; i<MAX_CONSOLELEN; i++){
+		if( InputConsoleData->textdata[i] == NULL ){
+			InputConsoleData->textdata[i] = inchar;
+			InputConsoleData->textdata[i+1] = NULL;
+			return;
+		}
+	}
+}
+
+//! 入力用コンソールの文字を一文字削除
+void maingame::ConsoleDeleteText()
+{
+	int s = strlen(InputConsoleData->textdata);
+	if( s == strlen(CONSOLE_PROMPT) ){ return; }
+	InputConsoleData->textdata[ s-1 ] = NULL;
+}
+
+//! コマンドの判定および引数（整数値）を取得
+//! @param cmd 判定するコマンド文字のポインタ
+//! @param num 与えられた引数を受け取るポインタ
+//! @return 取得：true　判定外：false
+bool maingame::GetCommandNum(char *cmd, int *num)
+{
+	char str[MAX_CONSOLELEN];
+
+	//コマンド名を調べる
+	strcpy(str, NewCommand);
+	str[ strlen(cmd) ] = NULL;
+	if( strcmp(str, cmd) != 0 ){ return false; }
+
+	//「コマンド名_X」分の文字数に達しているかどうか
+	if( strlen(cmd)+2 > strlen(NewCommand) ){ return false; }
+
+	//与えられた数字を調べる
+	*num = atoi(&(NewCommand[ strlen(cmd)+1 ]));
+	return true;
+}
+
+//! デバック用コンソールの入力処理
+void maingame::InputConsole()
+{
+	NewCommand[0] = NULL;
+
+	if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x0F)) ){		// [ENTER]
+		//何か入力されていれば〜
+		if( strcmp(InputConsoleData->textdata, CONSOLE_PROMPT) != 0 ){
+			//コンソールに追加し、未処理コマンドとして登録
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), InputConsoleData->textdata);
+			strcpy(NewCommand, &(InputConsoleData->textdata[strlen(CONSOLE_PROMPT)]));
+		}
+
+		//入力エリアを初期化
+		strcpy(InputConsoleData->textdata, CONSOLE_PROMPT);
+	}
+	else{
+		//数字
+		for(int key=0x16; key<=0x1F; key++){
+			if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(key)) ){
+				ConsoleInputText(key + 0x1A);
+			}
+		}
+		for(int key=0x04; key<=0x0D; key++){
+			if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(key)) ){
+				ConsoleInputText(key + 0x2C);
+			}
+		}
+
+		//アルファベット小文字
+		for(int key=0x20; key<=0x39; key++){
+			if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(key)) ){
+				ConsoleInputText(key + 0x41);
+			}
+		}
+
+		//スペース
+		if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x11)) ){		// [SPACE]
+			ConsoleInputText(' ');
+		}
+
+		//一文字削除
+		if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x0E)) ){		// [BACK]
+			ConsoleDeleteText();
+		}
+	}
+}
+
+//! デバック用コンソールのメイン処理
+void maingame::ProcessConsole()
+{
+	char str[MAX_CONSOLELEN];
+	int id;
+
+	//コマンドリスト
+	if( strcmp(NewCommand, "help") == 0 ){
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "help        human        result");
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "info        view         center      map");
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "tag");
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "revive      treat <NUM>  nodamage <NUM>");
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "kill <NUM>  break <NUM>  newobj <NUM>");
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "bot         nofight      caution     stop");
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "ver         ss           clear");
+	}
+
+	//人の統計情報
+	if( strcmp(NewCommand, "human") == 0 ){
+		int alivemyfriend = 0;
+		int myfriend = 0;
+		int aliveenemy = 0;
+		int enemy = 0;
+		int myteamid;
+
+		//プレイヤーのチーム番号を取得
+		ObjMgr.GetPlayerHumanObject()->GetParamData(NULL, NULL, NULL, &myteamid);
+
+		for(int i=0; i<MAX_HUMAN; i++){
+			int teamid;
+			bool deadflag;
+			human *thuman = ObjMgr.GeHumanObject(i);
+			if( thuman->GetDrawFlag() == true ){
+				//死亡状態とチーム番号を取得
+				deadflag = thuman->GetDeadFlag();
+				thuman->GetParamData(NULL, NULL, NULL, &teamid);
+
+				//カウント
+				if( teamid == myteamid ){
+					myfriend += 1;
+					if( deadflag == false ){ alivemyfriend += 1; }
+				}
+				else{
+					enemy += 1;
+					if( deadflag == false ){ aliveenemy += 1; }
+				}
+			}
+		}
+
+		sprintf(str, "Friend:%d/%d  Enemy:%d/%d  Total:%d/%d",
+			alivemyfriend, myfriend, aliveenemy, enemy, alivemyfriend + aliveenemy, myfriend + enemy);
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+	}
+
+	//暫定リザルト表示
+	if( strcmp(NewCommand, "result") == 0 ){
+		float rate;
+		if( MainGameInfo.fire == 0 ){
+			rate = 0.0f;
+		}
+		else{
+			rate = (float)MainGameInfo.ontarget / MainGameInfo.fire * 100;
+		}
+
+		sprintf(str, "Time %02d:%02d  /  Fired %d  /  On target %d", framecnt/(int)GAMEFPS/60, framecnt/(int)GAMEFPS%60, MainGameInfo.fire, MainGameInfo.ontarget);
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+		sprintf(str, "AR rate %.1f%%  /  Kill %d  /  HS %d", rate, MainGameInfo.kill, MainGameInfo.headshot);
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+	}
+
+	//デバック用文字の表示
+	if( strcmp(NewCommand, "info") == 0 ){
+		if( ShowInfo_Debugmode == false ){
+			ShowInfo_Debugmode = true;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Show Debug information.");
+		}
+		else{
+			ShowInfo_Debugmode = false;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Hide Debug information.");
+		}
+	}
+
+	//フリーカメラ切り替え
+	if( strcmp(NewCommand, "view") == 0 ){
+		if( Camera_Debugmode == false ){
+			Camera_Debugmode = true;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Change FreeView mode.");
+		}
+		else{
+			Camera_Debugmode = false;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Change PlayerView mode.");
+		}
+
+		//デバックモード開始時のカメラ設定
+		if( Camera_Debugmode == true ){
+			camera_x = 100.0f;
+			camera_y = 100.0f;
+			camera_z = -100.0f;
+			camera_rx = (float)M_PI/180*135;
+			camera_ry = (float)M_PI/180*(-40);
+		}
+	}
+
+	//3Dの中心線表示
+	if( strcmp(NewCommand, "center") == 0 ){
+		if( CenterLine == false ){
+			CenterLine = true;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Show World center position.");
+		}
+		else{
+			CenterLine = false;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Hide World center position.");
+		}
+	}
+
+	//マップをワイヤーフレーム化
+	if( strcmp(NewCommand, "map") == 0 ){
+		if( wireframe == false ){
+			wireframe = true;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Draw map on the Wire frame.");
+		}
+		else{
+			wireframe = false;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Draw map on the Normal.");
+		}
+	}
+
+	//オブジェクトのタグを表示
+	if( strcmp(NewCommand, "tag") == 0 ){
+		if( tag == false ){
+			tag = true;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Show object information.");
+		}
+		else{
+			tag = false;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Hide object information.");
+		}
+	}
+
+	//全ての死者を蘇生する
+	if( strcmp(NewCommand, "revive") == 0 ){
+		for(int i=0; i<MAX_HUMAN; i++){
+			ObjMgr.HumanResuscitation(i);
+		}
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "All human has resuscitation.");
+	}
+
+	//回復する
+	if( GetCommandNum("treat", &id) == true ){
+		if( (0 <= id)&&(id < MAX_HUMAN) ){
+			int param, hp;
+			HumanParameter data;
+			human *thuman = ObjMgr.GeHumanObject(id);
+			
+			//初期時のHPを取得
+			thuman->GetParamData(&param, NULL, NULL, NULL);
+			GameParamInfo.GetHuman(param, &data);
+			hp = data.hp;
+
+			//回復
+			if( thuman->SetHP(hp) == true ){
+				sprintf(str, "Set the HP:%d to Human[%d].", data.hp, id);
+				AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+			}
+		}
+	}
+
+	//無敵化
+	if( GetCommandNum("nodamage", &id) == true ){
+		if( (0 <= id)&&(id < MAX_HUMAN) ){
+			if( InvincibleID == id ){
+				//同じ番号が指定されたらなら、無効化
+				InvincibleID = -1;
+				ObjMgr.GeHumanObject(id)->SetInvincibleFlag(false);
+				sprintf(str, "Not invincible Human[%d].", id);
+				AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+			}
+			else{
+				//既に誰かが指定されていたら、既に指定されている人を無効化
+				if( InvincibleID != -1 ){
+					ObjMgr.GeHumanObject(InvincibleID)->SetInvincibleFlag(false);
+					sprintf(str, "Not invincible Human[%d].", InvincibleID);
+					AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+				}
+
+				//新たに無敵状態の人を指定
+				InvincibleID = id;
+				ObjMgr.GeHumanObject(id)->SetInvincibleFlag(true);
+				sprintf(str, "Invincible Human[%d].", id);
+				AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+			}
+		}
+	}
+
+	//殺害
+	if( GetCommandNum("kill", &id) == true ){
+		if( (0 <= id)&&(id < MAX_HUMAN) ){
+			human *thuman = ObjMgr.GeHumanObject(id);
+			if( thuman->GetDrawFlag() == true ){
+				if( thuman->SetHP(0) == true ){
+					sprintf(str, "Killed Human[%d].", id);
+					AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+				}
+			}
+		}
+	}
+
+	//小物を破壊
+	if( GetCommandNum("break", &id) == true ){
+		if( (0 <= id)&&(id < MAX_SMALLOBJECT) ){
+			smallobject *tsmallobject = ObjMgr.GetSmallObject(id);
+			if( tsmallobject->GetDrawFlag() == true ){
+				tsmallobject->Destruction();
+				sprintf(str, "Broke SmallObject[%d].", id);
+				AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+			}
+		}
+	}
+
+	//小物を新規配置
+	if( GetCommandNum("newobj", &id) == true ){
+		if( (0 <= id)&&(id < TOTAL_PARAMETERINFO_SMALLOBJECT) ){
+			int dataid = ObjMgr.AddSmallObjectIndex(camera_x + cos(camera_rx)*20.0f, camera_y, camera_z + sin(camera_rx)*20.0f, camera_rx*-1, id, true);
+			if( dataid != -1 ){
+				sprintf(str, "Add SmallObject[%d].", dataid);
+				AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+			}
+		}
+	}
+
+	//プレイヤー操作をAI化
+	if( strcmp(NewCommand, "bot") == 0 ){
+		if( PlayerAI == false ){
+			PlayerAI = true;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Player is AI control. (bot)");
+		}
+		else{
+			PlayerAI = false;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Player is User control.");
+		}
+	}
+
+	//AIを非戦闘化させる
+	if( strcmp(NewCommand, "nofight") == 0 ){
+		if( AINoFight == false ){
+			AINoFight = true;
+			for(int i=0; i<MAX_HUMAN; i++){
+				HumanAI[i].SetNoFightFlag(true);
+			}
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "AI had no Fight.");
+		}
+		else{
+			AINoFight = false;
+			for(int i=0; i<MAX_HUMAN; i++){
+				HumanAI[i].SetNoFightFlag(false);
+			}
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "AI had Fight.");
+		}
+	}
+
+	//AIを警戒させる
+	if( strcmp(NewCommand, "caution") == 0 ){
+		for(int i=0; i<MAX_HUMAN; i++){
+			HumanAI[i].SetCautionMode();
+		}
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Set cautious AI.");
+	}
+
+	//AIの処理を停止
+	if( strcmp(NewCommand, "stop") == 0 ){
+		if( AIstop == false ){
+			AIstop = true;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Stopped AI control.");
+		}
+		else{
+			AIstop = false;
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Started AI control.");
+		}
+	}
+
+	/*
+	//ミッション達成
+	if( strcmp(NewCommand, "comp") == 0 ){
+		end_framecnt += 1;
+		MainGameInfo.missioncomplete = true;
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Mission complete.");
+	}
+
+	//ミッション失敗
+	if( strcmp(NewCommand, "fail") == 0 ){
+		end_framecnt += 1;
+		MainGameInfo.missioncomplete = false;
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "Mission fail.");
+	}
+	*/
+
+	//バージョン情報取得
+	if( strcmp(NewCommand, "ver") == 0 ){
+		sprintf(str, "%s   Version:%s", GAMENAME, GAMEVERSION);
+		AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+	}
+
+	//スクリーンショットを撮影
+	//　※コンソール画面を削除するため、撮影を1フレーム遅らせる。
+	if( ScreenShot == true ){
+		char fname[256];
+
+		//ファイル名を決定
+		GetTimeName(fname);
+		strcat(fname, ".bmp");
+
+		//撮影・保存
+		if( d3dg->SaveScreenShot(fname) == true ){
+			sprintf(str, "Saved Screenshot  (File:%s)", fname);
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), str);
+		}
+		else{
+			AddInfoConsole(D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f), "[Error] Save failed.");
+		}
+	}
+	if( strcmp(NewCommand, "ss") == 0 ){
+		ScreenShot = true;
+	}
+	else{
+		ScreenShot = false;
+	}
+
+	//コンソールをクリア
+	if( strcmp(NewCommand, "clear") == 0 ){
+		for(int i=0; i<MAX_CONSOLELINES; i++){
+			InfoConsoleData[i].color = D3DCOLOR_COLORVALUE(1.0f,1.0f,1.0f,1.0f);
+			InfoConsoleData[i].textdata[0] = NULL;
+		}
+	}
+}
+
+//! デバック用コンソールの描画処理
+void maingame::RenderConsole()
+{
+	//下地
+	d3dg->Draw2DBox(0, 0, SCREEN_WIDTH, (MAX_CONSOLELINES+1)*18 + 5 + 5, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,0.75f));
+
+	//表示中の文字
+	for(int i=0; i<MAX_CONSOLELINES; i++){
+		if( InfoConsoleData[i].textdata[0] != NULL ){
+			d3dg->Draw2DTextureFontText(5+1, i*18+5+1, InfoConsoleData[i].textdata, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f), 14, 17);
+			d3dg->Draw2DTextureFontText(5, i*18+5, InfoConsoleData[i].textdata, InfoConsoleData[i].color, 14, 17);
+		}
+	}
+
+	//入力中の文字
+	int cnt;
+	for(cnt=0; cnt<MAX_CONSOLELINES; cnt++){
+		if( InfoConsoleData[cnt].textdata[0] == NULL ){ break; }
+	}
+	d3dg->Draw2DTextureFontText(5+1, cnt*18+5+1, InputConsoleData->textdata, D3DCOLOR_COLORVALUE(0.0f,0.0f,0.0f,1.0f), 14, 17);
+	d3dg->Draw2DTextureFontText(5, cnt*18+5, InputConsoleData->textdata, InputConsoleData->color, 14, 17);
+}
+
+#endif
+
 void maingame::Destroy()
 {
 	//ブロックデータ解放
@@ -2090,6 +2615,12 @@
 	//背景空解放
 	Resource.CleanupSkyModelTexture();
 
+#ifdef ENABLE_DEBUGCONSOLE
+	//コンソール用データを解放
+	if( InfoConsoleData != NULL ){ delete [] InfoConsoleData; }
+	if( InputConsoleData != NULL ){ delete InputConsoleData; }
+#endif
+
 	GameState->NextState();
 }
 

--- trunk/d3dgraphics.cpp	(revision 21)
+++ trunk/d3dgraphics.cpp	(revision 22)
@@ -840,7 +840,8 @@
 }
 
 //! マップデータを描画
-void D3DGraphics::DrawMapdata()
+//! @param wireframe ワイヤーフレーム表示
+void D3DGraphics::DrawMapdata(bool wireframe)
 {
 	//ブロックデータが読み込まれていなければ、処理しない。
 	if( blockdata == NULL ){ return; }
@@ -849,6 +850,26 @@
 	D3DMATERIAL9 mtrl = {0};
 	int textureID;
 
+	if( wireframe == true ){
+		//ワイヤーフレーム表示
+		for(int i=0; i<bs; i++){
+			blockdata->Getdata(&data, i);
+			Drawline(data.x[0], data.y[0], data.z[0], data.x[1], data.y[1], data.z[1]);
+			Drawline(data.x[1], data.y[1], data.z[1], data.x[2], data.y[2], data.z[2]);
+			Drawline(data.x[2], data.y[2], data.z[2], data.x[3], data.y[3], data.z[3]);
+			Drawline(data.x[3], data.y[3], data.z[3], data.x[0], data.y[0], data.z[0]);
+			Drawline(data.x[4], data.y[4], data.z[4], data.x[5], data.y[5], data.z[5]);
+			Drawline(data.x[5], data.y[5], data.z[5], data.x[6], data.y[6], data.z[6]);
+			Drawline(data.x[6], data.y[6], data.z[6], data.x[7], data.y[7], data.z[7]);
+			Drawline(data.x[7], data.y[7], data.z[7], data.x[4], data.y[4], data.z[4]);
+			Drawline(data.x[0], data.y[0], data.z[0], data.x[4], data.y[4], data.z[4]);
+			Drawline(data.x[1], data.y[1], data.z[1], data.x[5], data.y[5], data.z[5]);
+			Drawline(data.x[2], data.y[2], data.z[2], data.x[6], data.y[6], data.z[6]);
+			Drawline(data.x[3], data.y[3], data.z[3], data.x[7], data.y[7], data.z[7]);
+		}
+		return;
+	}
+
 	//深度バッファ比較関数を設定
 	//pd3dDevice->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESS);
 
@@ -1355,4 +1376,27 @@
 
 	//深度バッファ比較関数を元に戻す
 	pd3dDevice->SetRenderState(D3DRS_ZFUNC, D3DCMP_LESSEQUAL);
+}
+
+//! 画面のスクリーンショットを保存
+//! @param filename ファイル名
+//! @return 成功：true　失敗：false
+bool D3DGraphics::SaveScreenShot(char* filename)
+{
+	LPDIRECT3DSURFACE9 pSurface = NULL;
+	HRESULT hr;
+
+	//サーフェースを作成し、画面を取得
+	pd3dDevice->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &pSurface);
+
+	//サーフェイスを画像に出力
+	hr = D3DXSaveSurfaceToFile(filename, D3DXIFF_BMP, pSurface, NULL, NULL);
+
+	//解放
+	pSurface->Release();
+
+	if( hr == D3D_OK ){
+		return true;
+	}
+	return false;
 }
\ No newline at end of file

--- trunk/ai.h	(revision 21)
+++ trunk/ai.h	(revision 22)
@@ -65,6 +65,7 @@
 	int battlemode;		//!< 戦闘モード
 	int movemode;		//!< 移動モード
 	bool hold;		//!< 移動パスを読まない
+	bool NoFight;	//!< 非戦闘化フラグ
 	float posx;		//!< X座標
 	float posy;		//!< Y座標
 	float posz;		//!< Z座標
@@ -123,6 +124,8 @@
 	void Init();
 	void SetHoldWait(float px, float pz, float rx);
 	void SetHoldTracking(int id);
+	void SetCautionMode();
+	void SetNoFightFlag(bool flag);
 	void Process();
 };
 

--- trunk/objectmanager.cpp	(revision 21)
+++ trunk/objectmanager.cpp	(revision 22)
@@ -431,6 +431,41 @@
 	return -1;
 }
 
+//! 小物追加（ゲーム中用）
+//! @param px X座標
+//! @param py Y座標
+//! @param pz Z座標
+//! @param rx X軸向き
+//! @param paramID 種類番号
+//! @param MapColl 位置修正フラグ
+//! @return 成功：データ番号（0以上）　失敗：-1
+int ObjectManager::AddSmallObjectIndex(float px, float py, float pz, float rx, int paramID, bool MapColl)
+{
+	//モデルとテクスチャを取得
+	int model, texture;
+	if( Resource->GetSmallObjectModelTexture(paramID, &model, &texture) == 1 ){
+		return -1;
+	}
+
+	for(int j=0; j<MAX_SMALLOBJECT; j++){
+		if( SmallObjectIndex[j].GetDrawFlag() == false ){
+			//初期化
+			SmallObjectIndex[j].SetPosData(px, py, pz, rx);
+			SmallObjectIndex[j].SetParamData(paramID, 0, true);
+			SmallObjectIndex[j].SetModel(model, 5.0f);
+			SmallObjectIndex[j].SetTexture(texture);
+			SmallObjectIndex[j].SetDrawFlag(true);
+
+			//位置修正フラグが有効ならば、マップと判定
+			if( MapColl == true ){
+				SmallObjectIndex[j].CollisionMap(CollD);
+			}
+			return j;
+		}
+	}
+	return -1;
+}
+
 //! 出血させる
 //! @param x X座標
 //! @param y Y座標
@@ -1001,16 +1036,25 @@
 //! 指定したデータ番号のweaponクラスを取得
 //! @param id データ番号
 //! @return 武器オブジェクトのポインタ　（無効なデータ番号で NULL）
-weapon* ObjectManager::GeWeaponObject(int id)
+weapon* ObjectManager::GetWeaponObject(int id)
 {
 	if( (id < 0)||(MAX_WEAPON-1 < id) ){ return NULL; }
 	return &(WeaponIndex[id]);
 }
 
+//! 指定したデータ番号のsmallobjectクラスを取得
+//! @param id データ番号
+//! @return 小物オブジェクトのポインタ　（無効なデータ番号で NULL）
+smallobject* ObjectManager::GetSmallObject(int id)
+{
+	if( (id < 0)||(MAX_SMALLOBJECT-1 < id) ){ return NULL; }
+	return &(SmallObjectIndex[id]);
+}
+
 //! 指定したデータ番号のbulletクラスを取得
 //! @param id データ番号
 //! @return 弾オブジェクトのポインタ　（無効なデータ番号で NULL）
-bullet* ObjectManager::GeBulletObject(int id)
+bullet* ObjectManager::GetBulletObject(int id)
 {
 	if( (id < 0)||(MAX_BULLET-1 < id) ){ return NULL; }
 	return &(BulletIndex[id]);
@@ -1612,6 +1656,28 @@
 	GameSound->HitHuman(tx, ty, tz);
 }
 
+//! 死者を蘇生する
+//! @param id 人の番号（0〜MAX_HUMAN-1）
+//! @return true：成功　false：失敗
+//! @warning 手ぶらのまま蘇生します
+//! @attention 無効な人番号が指定された場合や、指定した人が生存していた場合、あるいは謎人間に対して実行した場合、この関数は失敗します。
+bool ObjectManager::HumanResuscitation(int id)
+{
+	if( (id < 0)||(MAX_HUMAN-1 < id) ){ return false; }
+
+	//使用されていないか、生存していれば処理しない。
+	if( HumanIndex[id].GetDrawFlag() == false ){ return false; }
+	if( HumanIndex[id].GetDeadFlag() == false ){ return false; }
+
+	int id_param, dataid, team;
+	signed char p4;
+	HumanIndex[id].GetParamData(&id_param, &dataid, &p4, &team);
+	if( (id_param < 0)||( TOTAL_PARAMETERINFO_HUMAN-1 < id_param) ){ return false; }	//謎人間なら処理しない
+	HumanIndex[id].SetParamData(id_param, dataid, p4, team, true);
+
+	return true;
+}
+
 //! ゲームクリアー・ゲームオーバーの判定
 //! @return ゲームクリアー：1　ゲームオーバー：2　判定なし：0
 //! @attention ゲームクリア―とゲームオーバーが同時に成立する条件では、本家XOPSと同様に「ゲームクリアー」と判定されます。
@@ -1662,6 +1728,129 @@
 	return 0;
 }
 
+//! オブジェクトの情報を取得
+//! @param camera_x カメラのX座標
+//! @param camera_y カメラのY座標
+//! @param camera_z カメラのZ座標
+//! @param camera_rx カメラの横軸角度
+//! @param camera_ry カメラの縦軸角度
+//! @param color 色を取得するポインタ
+//! @param infostr 文字を取得するポインタ
+//! @return 表示情報あり：true　表示情報なし：false
+bool ObjectManager::GetObjectInfoTag(float camera_x, float camera_y, float camera_z, float camera_rx, float camera_ry, int *color, char *infostr)
+{
+	float dist = 50.0f * 50.0f;
+	float px, py, pz;
+	float x, y, z, r;
+	int Player_teamID;
+
+	//文字を初期化
+	infostr[0] = NULL;
+
+	//プレイヤーのチーム番号を取得
+	HumanIndex[Player_HumanID].GetParamData(NULL, NULL, NULL, &Player_teamID);
+
+	//人
+	for(int i=0; i<MAX_HUMAN; i++){
+		//プレイヤー自身なら処理しない
+		if( i == Player_HumanID ){ continue; }
+
+		if( HumanIndex[i].GetDrawFlag() == true ){
+			HumanIndex[i].GetPosData(&px, &py, &pz, NULL);
+			x = px - camera_x;
+			y = py - camera_y;
+			z = pz - camera_z;
+			r = x*x + y*y + z*z;
+			if( r < dist ){
+				float rx;
+				int team;
+
+				//視点を基準に対象までの角度を算出（-π〜π）
+				rx = atan2(z, x) - camera_rx;
+				for(; rx > (float)M_PI; rx -= (float)M_PI*2){}
+				for(; rx < (float)M_PI*-1; rx += (float)M_PI*2){}
+
+				//角度上、視界に入っていれば
+				if( abs(rx) < (float)M_PI/18 ){
+					HumanIndex[i].GetParamData(NULL, NULL, NULL, &team);
+					if( team == Player_teamID ){
+						*color = D3DCOLOR_COLORVALUE(0.0f,0.0f,1.0f,1.0f);
+						sprintf(infostr, "Human[%d]  HP %d : Friend", i, HumanIndex[i].GetHP());
+					}
+					else{
+						*color = D3DCOLOR_COLORVALUE(1.0f,0.0f,0.0f,1.0f);
+						sprintf(infostr, "Human[%d]  HP %d : Enemy", i, HumanIndex[i].GetHP());
+					}
+					dist = r;
+				}
+			}
+		}
+	}
+
+	//武器
+	for(int i=0; i<MAX_WEAPON; i++){
+		if( (WeaponIndex[i].GetDrawFlag() == true)&&(WeaponIndex[i].GetUsingFlag() == false) ){
+			int lnbs, nbs;
+
+			WeaponIndex[i].GetPosData(&px, &py, &pz, NULL);
+			WeaponIndex[i].GetParamData(NULL, &lnbs, &nbs);
+			x = px - camera_x;
+			y = py - camera_y;
+			z = pz - camera_z;
+			r = x*x + y*y + z*z;
+			if( r < dist ){
+				float rx, ry;
+
+				//視点を基準に対象までの角度を算出（-π〜π）
+				rx = atan2(z, x) - camera_rx;
+				for(; rx > (float)M_PI; rx -= (float)M_PI*2){}
+				for(; rx < (float)M_PI*-1; rx += (float)M_PI*2){}
+				ry = atan2(y, sqrt(x*x + z*z))  - camera_ry;
+
+				//角度上、視界に入っていれば
+				if( (abs(rx) < (float)M_PI/18)&&(abs(ry) < (float)M_PI/18) ){
+					*color = D3DCOLOR_COLORVALUE(0.0f,1.0f,0.0f,1.0f);
+					sprintf(infostr, "WeaponIndex[%d]  %d:%d", i, lnbs, (nbs - lnbs));
+					dist = r;
+				}
+			}
+		}
+	}
+
+	//小物
+	for(int i=0; i<MAX_SMALLOBJECT; i++){
+		if( SmallObjectIndex[i].GetDrawFlag() == true ){
+			SmallObjectIndex[i].GetPosData(&px, &py, &pz, NULL);
+			x = px - camera_x;
+			y = py - camera_y;
+			z = pz - camera_z;
+			r = x*x + y*y + z*z;
+			if( r < dist ){
+				float rx, ry;
+
+				//視点を基準に対象までの角度を算出（-π〜π）
+				rx = atan2(z, x) - camera_rx;
+				for(; rx > (float)M_PI; rx -= (float)M_PI*2){}
+				for(; rx < (float)M_PI*-1; rx += (float)M_PI*2){}
+				ry = atan2(y, sqrt(x*x + z*z))  - camera_ry;
+
+				//角度上、視界に入っていれば
+				if( (abs(rx) < (float)M_PI/18)&&(abs(ry) < (float)M_PI/18) ){
+					*color = D3DCOLOR_COLORVALUE(1.0f,1.0f,0.0f,1.0f);
+					sprintf(infostr, "SmallObject[%d]  HP %d", i, SmallObjectIndex[i].GetHP());
+					dist = r;
+				}
+			}
+		}
+	}
+
+	//文字が設定されているかどうかで、有効な処理がされたか判定。
+	if( infostr[0] == NULL ){
+		return false;
+	}
+	return true;
+}
+
 //! オブジェクトの主計算処理
 //! @param cmdF5id 上昇機能（F5裏技）させる人データ番号（-1で機能無効）
 //! @param camera_x カメラのX座標
@@ -1682,12 +1871,16 @@
 
 	//人オブジェクトの処理
 	for(int i=0; i<MAX_HUMAN; i++){
+		bool cmdF5;
+
 		if( i == cmdF5id ){
-			HumanIndex[i].RunFrame(CollD, BlockData, true);
+			cmdF5 = true;
 		}
 		else{
-			HumanIndex[i].RunFrame(CollD, BlockData, false);
+			cmdF5 = false;
 		}
+
+		HumanIndex[i].RunFrame(CollD, BlockData, cmdF5);
 	}
 
 	//武器オブジェクトの処理

--- trunk/window.cpp	(revision 21)
+++ trunk/window.cpp	(revision 22)
@@ -175,6 +175,19 @@
 	return time;
 }
 
+//! 日時による文字列を取得
+//! @param str 文字列を受け取るポインタ
+void GetTimeName(char *str)
+{
+	time_t timer;
+	struct tm *local;
+
+	timer = time(NULL);
+	local = localtime(&timer);
+
+	sprintf(str, "%04d%02d%02d%02d%02d%02d", local->tm_year + 1900, local->tm_mon + 1, local->tm_mday, local->tm_hour, local->tm_min, local->tm_sec);
+}
+
 //! 乱数を初期化
 void InitRand()
 {

--- trunk/object.h	(revision 21)
+++ trunk/object.h	(revision 22)
@@ -153,6 +153,7 @@
 	float totalmove;	//!< 合計移動量
 	int StateGunsightErrorRange;		//!< 照準の状態誤差
 	int ReactionGunsightErrorRange;		//!< 照準の反動誤差
+	bool Invincible;	//!< 無敵フラグ
 
 	void GunsightErrorRange();
 	int CheckAndProcessDead(class Collision *CollD);
@@ -168,8 +169,11 @@
 	virtual void GetMovePos(float *x, float *y, float *z);
 	virtual void SetModel(int upmodel, int armmodel[], int legmodel, int walkmodel[], int runmodel[]);
 	virtual int GetHP();
+	virtual bool SetHP(int in_hp);
 	virtual bool GetDeadFlag();
 	virtual void SetTeamID(int id);
+	virtual bool GetInvincibleFlag();
+	virtual void SetInvincibleFlag(bool flag);
 	virtual void SetWeapon(class weapon *in_weapon[]);
 	virtual int PickupWeapon(class weapon *in_weapon);
 	virtual void ChangeWeapon(int id = -1);

--- trunk/gamemain.h	(revision 21)
+++ trunk/gamemain.h	(revision 22)
@@ -32,6 +32,8 @@
 #ifndef GAMEMAIN_H
 #define GAMEMAIN_H
 
+#define ENABLE_DEBUGCONSOLE	//!< @brief デバック用コンソールの有効化（コメント化で機能無効）
+
 #define MAINMENU_X 280		//!< メニューの表示 X座標（左上基準）
 #define MAINMENU_Y 140		//!< メニューの表示 Y座標（〃）
 #define TOTAL_MENUITEMS 8	//!< メニュー1画面に表示するミッション数
@@ -38,7 +40,7 @@
 #define MAINMENU_H (TOTAL_MENUITEMS+2)*30 + 25	//!< メニューの表示サイズ・高さ
 
 #define HUDA_WEAPON_POSX (SCREEN_WIDTH - 255)	//!< 武器情報を表示する領域・X座標
-#define HUDA_WEAPON_POSY (SCREEN_HEIGTH - 98)	//!< 武器情報を表示する領域・Y座標
+#define HUDA_WEAPON_POSY (SCREEN_HEIGHT - 98)	//!< 武器情報を表示する領域・Y座標
 #define HUDA_WEAPON_SIZEW 8		//!< 武器情報を表示する領域・横サイズ（32ピクセルの配置個数）
 #define HUDA_WEAPON_SIZEH 3		//!< 武器情報を表示する領域・縦サイズ（32ピクセルの配置個数）
 
@@ -54,6 +56,12 @@
 
 #define TOTAL_EVENTENT_SHOWMESSEC 5.0f		//!< イベントメッセージを表示する秒数
 
+#ifdef ENABLE_DEBUGCONSOLE
+ #define MAX_CONSOLELEN 45		//!< デバック用コンソールの文字数（行）
+ #define MAX_CONSOLELINES 8		//!< デバック用コンソールの行数
+ #define CONSOLE_PROMPT ">"		//!< デバック用コンソールのプロンプト
+#endif
+
 #ifndef H_LAYERLEVEL
  #define H_LAYERLEVEL 3		//!< Select include file.
 #endif
@@ -73,6 +81,14 @@
 	int headshot;	//!< 敵の頭部に命中した数
 };
 
+#ifdef ENABLE_DEBUGCONSOLE
+//! コンソールを管理する構造体
+struct ConsoleData{
+	int color;						//!< 色
+	char textdata[MAX_CONSOLELEN];	//!< 文字列
+};
+#endif
+
 //! @brief オープニング画面管理クラス
 //! @details オープニング画面を管理します。
 class opening : public D3Dscene
@@ -143,11 +159,18 @@
 	float view_rx;		//!< マウス角度とカメラ角度の差（水平軸）
 	float view_ry;		//!< マウス角度とカメラ角度の差（垂直軸） 
 	bool ShowInfo_Debugmode;	//!< 座標などを表示するデバックモード
-	bool Camera_Debugmode;	//!< カメラデバックモード
-	bool Camera_F1mode;		//!< カメラF1モード
-	int Camera_F2mode;		//!< カメラF2モード
+	bool Camera_Debugmode;		//!< カメラデバックモード
+	bool tag;					//!< オブジェクトのタグを表示
+	bool wireframe;				//!< マップをワイヤーフレーム表示
+	bool CenterLine;			//!< 3D空間に中心線を表示
+	bool Camera_F1mode;			//!< カメラF1モード
+	int Camera_F2mode;			//!< カメラF2モード
 	bool Camera_HOMEmode;		//!< カメラHOMEモード
 	bool Cmd_F5;				//!< 裏技F5モード
+	int InvincibleID;			//!< 無敵な人の判定
+	bool PlayerAI;				//!< プレイヤー操作をAIに委ねる
+	bool AIstop;				//!< AI処理を停止する
+	bool AINoFight;				//!< AIが非戦闘化する（戦わない）
 	int start_framecnt;			//!< メインゲーム開始時のカウント
 	int end_framecnt;			//!< メインゲーム終了のカウント
 	int message_id;				//!< 表示中のイベントメッセージ番号
@@ -165,6 +188,21 @@
 	void Render3D();
 	void Render2D();
 
+#ifdef ENABLE_DEBUGCONSOLE
+	bool Show_Console;			//!< デバック用コンソールを表示
+	ConsoleData *InfoConsoleData;			//!< デバック用コンソールデータ（表示済み）
+	ConsoleData *InputConsoleData;			//!< デバック用コンソールデータ（入力中）
+	char NewCommand[MAX_CONSOLELEN];	//!< 新たに入力された未処理のコマンド
+	bool ScreenShot;		//!< SSを撮影する
+	void AddInfoConsole(int color, char *str);
+	void ConsoleInputText(char inchar);
+	void ConsoleDeleteText();
+	bool GetCommandNum(char *cmd, int *num);
+	void InputConsole();
+	void ProcessConsole();
+	void RenderConsole();
+#endif
+
 public:
 	maingame();
 	~maingame();

--- trunk/ai.cpp	(revision 21)
+++ trunk/ai.cpp	(revision 22)
@@ -865,6 +865,11 @@
 //! 攻撃をキャンセル
 bool AIcontrol::ActionCancel()
 {
+	//非戦闘化フラグが有効なら終了
+	if( NoFight == true ){
+		return true;
+	}
+
 	//敵が死亡したら終了
 	if( enemyhuman->GetDeadFlag() == true ){
 		return true;
@@ -1333,6 +1338,11 @@
 //! 敵を探す
 int AIcontrol::SearchEnemy()
 {
+	//非戦闘化フラグが有効なら敵を見つけない
+	if( NoFight == true ){
+		return 0;
+	}
+
 	if( battlemode == AI_ACTION ){ return 0; }
 
 	int weaponid = ctrlhuman->GetMainWeaponTypeNO();
@@ -1630,6 +1640,11 @@
 	soundlist soundlist[MAX_SOUNDMGR_LIST];
 	int soundlists = GameSound->GetWorldSound(posx, posy + VIEW_HEIGHT, posz, teamid, soundlist);
 
+	//非戦闘化フラグが有効なら、音は聞こえないことにする
+	if( NoFight == true ){
+		soundlists = 0;
+	}
+
 	//回転と腕の角度
 	TurnSeen();
 	ArmAngle();
@@ -1708,6 +1723,11 @@
 	soundlist soundlist[MAX_SOUNDMGR_LIST];
 	int soundlists = GameSound->GetWorldSound(posx, posy + VIEW_HEIGHT, posz, teamid, soundlist);
 
+	//非戦闘化フラグが有効なら、音は聞こえないことにする
+	if( NoFight == true ){
+		soundlists = 0;
+	}
+
 	//ランダムパスなら処理実行
 	if( movemode == AI_RANDOM ){
 		SearchTarget(true);
@@ -1766,6 +1786,7 @@
 
 	//ステートを初期化
 	hold = false;
+	NoFight = false;
 	battlemode = AI_NORMAL;
 	movemode = AI_NULL;
 	enemyhuman = NULL;
@@ -1813,6 +1834,29 @@
 	target_pointid = id;
 }
 
+//! 強制的に警戒させる
+//! @warning 優先的な走り を実行中の場合、この関数は何もしません。
+void AIcontrol::SetCautionMode()
+{
+	//優先的な走りならば何もしない
+	if( movemode == AI_RUN2 ){ return; }
+
+	if( battlemode == AI_NORMAL ){
+		target_posx = posx;
+		target_posz = posz;
+	}
+	battlemode = AI_CAUTION;
+	cautioncnt = 160;
+}
+
+//! 非戦闘化フラグを設定
+//! @param flag true：戦闘を行わない（非戦闘化）　false：戦闘を行う（通常）
+//! @attention フラグを有効にすると敵を認識しなくなります。
+void AIcontrol::SetNoFightFlag(bool flag)
+{
+	NoFight = flag;
+}
+
 //! 処理系関数
 void AIcontrol::Process()
 {

--- trunk/d3dgraphics.h	(revision 21)
+++ trunk/d3dgraphics.h	(revision 22)
@@ -133,7 +133,7 @@
 	void SetFog(int skynumber);
 	void SetCamera(float camera_x, float camera_y, float camera_z, float camera_rx, float camera_ry, float viewangle);
 	void LoadMapdata(class BlockDataInterface* in_blockdata, char *directory);
-	void DrawMapdata();
+	void DrawMapdata(bool wireframe);
 	int GetMapTextureID(int id);
 	void CleanupMapdata();
 	void RenderModel(int id_model, int id_texture);
@@ -147,6 +147,7 @@
 	void Draw2DLine(int x1, int y1, int x2, int y2, int color);
 	void Draw2DBox(int x1, int y1, int x2, int y2, int color);
 	void Draw2DTexture(int x, int y, int id, int width, int height, float alpha);
+	bool SaveScreenShot(char *fname);
 };
 
 #endif
\ No newline at end of file

--- trunk/objectmanager.h	(revision 21)
+++ trunk/objectmanager.h	(revision 22)
@@ -108,13 +108,15 @@
 	void SetClass(ParameterInfo *in_GameParamInfo, D3DGraphics *in_d3dg, ResourceManager *in_Resource, BlockDataInterface *in_BlockData, PointDataInterface *in_PointData, Collision *in_CollD, SoundManager *in_GameSound, MIFInterface *in_MIFdata);
 	int AddHumanIndex(float px, float py, float pz, float rx, int CharacterID, int TeamID, int WeaponID[]);
 	int AddVisualWeaponIndex(int WeaponID, bool loadbullet);
+	int AddSmallObjectIndex(float px, float py, float pz, float rx, int paramID, bool MapColl);
 	void LoadPointData();
 	int GetPlayerID();
 	void SetPlayerID(int id);
 	human* GeHumanObject(int id);
 	human* GetPlayerHumanObject();
-	weapon* GeWeaponObject(int id);
-	bullet* GeBulletObject(int id);
+	weapon* GetWeaponObject(int id);
+	smallobject* GetSmallObject(int id);
+	bullet* GetBulletObject(int id);
 	bullet* GetNewBulletObject();
 	grenade* GetNewGrenadeObject();
 	human* SearchHuman(signed char p4);
@@ -135,7 +137,9 @@
 	bool CheatNewWeapon(int human_id, int new_weaponID);
 	bool CheckZombieAttack(human* MyHuman, human* EnemyHuman);
 	void HitZombieAttack(human* EnemyHuman);
+	bool HumanResuscitation(int id);
 	int CheckGameOverorComplete();
+	bool GetObjectInfoTag(float camera_x, float camera_y, float camera_z, float camera_rx, float camera_ry, int *color, char *infostr);
 	int Process(int cmdF5id, float camera_x, float camera_y, float camera_z, float camera_rx, float camera_ry);
 	bool GetHumanShotInfo(int id, int *ontarget, int *kill, int *headshot);
 	void Render(float camera_x, float camera_y, float camera_z, int HidePlayer);

--- trunk/object.cpp	(revision 21)
+++ trunk/object.cpp	(revision 22)
@@ -243,6 +243,7 @@
 		scopemode = 0;
 		HitFlag = false;
 		totalmove = 0.0f;
+		Invincible = false;
 	}
 }
 
@@ -266,6 +267,20 @@
 	return hp;
 }
 
+//! HPを設定
+//! @param in_hp 新たに設定するHP
+//! @return 成功：true　失敗：false
+//! @attention HPが1以上の人に対して実行しないと失敗します。
+bool human::SetHP(int in_hp)
+{
+	if( hp > 0 ){
+		hp = in_hp;
+		return true;
+	}
+	return false;
+}
+
+
 //! 死体かどうか判定
 //! @return 死体：true　死体でない：false
 //! @warning 完全に静止した状態を「死体」と判定します。倒れている最中の人は対象に含まれないため、hp <= 0 が全て死体と判定されるとは限りません。
@@ -287,6 +302,22 @@
 	teamid = id;
 }
 
+//! 無敵フラグを取得
+//! @return true：無敵　false：通常
+//! @attention 無敵状態の場合、銃弾・手榴弾の爆発・落下　によるダメージを一切受けません。
+bool human::GetInvincibleFlag()
+{
+	return Invincible;
+}
+
+//! 無敵フラグを設定
+//! @param flag true：無敵　false：通常
+//! @attention 無敵状態の場合、銃弾・手榴弾の爆発・落下　によるダメージを一切受けません。
+void human::SetInvincibleFlag(bool flag)
+{
+	Invincible = flag;
+}
+
 //! 前処理の移動量を取得
 //! @param *x X軸移動量を取得するポインタ（NULL可）
 //! @param *y Y軸移動量を取得するポインタ（NULL可）
@@ -752,7 +783,9 @@
 //! @param attacks 弾の攻撃力
 void human::HitBulletHead(int attacks)
 {
-	hp -= (int)((float)attacks * HUMAN_DAMAGE_HEAD);
+	if( Invincible == false ){
+		hp -= (int)((float)attacks * HUMAN_DAMAGE_HEAD);
+	}
 	HitFlag = true;
 }
 
@@ -760,7 +793,9 @@
 //! @param attacks 弾の攻撃力
 void human::HitBulletUp(int attacks)
 {
-	hp -= (int)((float)attacks * HUMAN_DAMAGE_UP);
+	if( Invincible == false ){
+		hp -= (int)((float)attacks * HUMAN_DAMAGE_UP);
+	}
 	HitFlag = true;
 }
 
@@ -768,7 +803,9 @@
 //! @param attacks 弾の攻撃力
 void human::HitBulletLeg(int attacks)
 {
-	hp -= (int)((float)attacks * HUMAN_DAMAGE_LEG);
+	if( Invincible == false ){
+		hp -= (int)((float)attacks * HUMAN_DAMAGE_LEG);
+	}
 	HitFlag = true;
 }
 
@@ -775,7 +812,9 @@
 //! ゾンビの攻撃がヒット
 void human::HitZombieAttack()
 {
-	hp -= HUMAN_DAMAGE_ZOMBIEU + GetRand(HUMAN_DAMAGE_ZOMBIEA);
+	if( Invincible == false ){
+		hp -= HUMAN_DAMAGE_ZOMBIEU + GetRand(HUMAN_DAMAGE_ZOMBIEA);
+	}
 	HitFlag = true;
 }
 
@@ -813,7 +852,7 @@
 		//ダメージ量を計算し、反映
 		damage = HUMAN_DAMAGE_GRENADE_LEG - (int)((float)HUMAN_DAMAGE_GRENADE_LEG/MAX_DAMAGE_GRENADE_DISTANCE * r);
 		if( damage > 0 ){
-			hp -= damage;
+			if( Invincible == false ){ hp -= damage; }
 			HitFlag = true;
 			returncode = 1;
 		}
@@ -827,7 +866,7 @@
 		//ダメージ量を計算し、反映
 		damage = HUMAN_DAMAGE_GRENADE_HEAD - (int)((float)HUMAN_DAMAGE_GRENADE_HEAD/MAX_DAMAGE_GRENADE_DISTANCE * r);
 		if( damage > 0 ){
-			hp -= damage;
+			if( Invincible == false ){ hp -= damage; }
 			HitFlag = true;
 			returncode = 1;
 		}
@@ -1277,9 +1316,11 @@
 			if( CollD->CheckALLBlockIntersectDummyRay(pos_x, pos_y + offset, pos_z, 0, -1, 0, NULL, NULL, &Dist, move_y*-1 + offset) == true ){
 				CollD->CheckALLBlockIntersectRay(pos_x, pos_y + offset, pos_z, 0, -1, 0, &id, &face, &Dist, move_y + offset);
 
-				//ダメージ計算
-				if( move_y > HUMAN_DAMAGE_MINSPEED ){ hp -= 0; }
-				else{ hp -= (int)((float)HUMAN_DAMAGE_MAXFALL / abs(HUMAN_DAMAGE_MAXSPEED - (HUMAN_DAMAGE_MINSPEED)) * abs(move_y - (HUMAN_DAMAGE_MINSPEED))); }
+				if( Invincible == false ){
+					//ダメージ計算
+					if( move_y > HUMAN_DAMAGE_MINSPEED ){ hp -= 0; }
+					else{ hp -= (int)((float)HUMAN_DAMAGE_MAXFALL / abs(HUMAN_DAMAGE_MAXSPEED - (HUMAN_DAMAGE_MINSPEED)) * abs(move_y - (HUMAN_DAMAGE_MINSPEED))); }
+				}
 
 				FallDistance = (Dist - offset) * -1;
 				move_y = 0.0f;