Commit: 292 - OpenXOPS (svn)

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

Commit MetaInfo

• Revision: 292 (tree)
• Zeit: 2022-03-12 17:11:50
• Autor: xops-mikan

Log Message

各クラスにおけるメンバー変数の初期化処理を追加、算術関数をfloat型へ変更、当たり判定関数の仕様修正

Ändern Zusammenfassung

• modified: trunk/ai.cpp
• modified: trunk/collision.cpp
• modified: trunk/d3dgraphics-directx.cpp
• modified: trunk/d3dgraphics-opengl.cpp
• modified: trunk/datafile.cpp
• modified: trunk/event.cpp
• modified: trunk/gamemain.cpp
• modified: trunk/main.h
• modified: trunk/object.cpp
• modified: trunk/objectmanager.cpp
• modified: trunk/sound-directsound.cpp
• modified: trunk/sound-ezds.cpp
• modified: trunk/soundmanager.cpp
• modified: trunk/window.cpp

Diff

--- trunk/ai.cpp	(revision 291)
+++ trunk/ai.cpp	(revision 292)
@@ -38,12 +38,20 @@
 	ctrlid = in_ctrlid;
 	if( in_ObjMgr != NULL ){ ctrlhuman = in_ObjMgr->GetHumanObject(in_ctrlid); }
 	else{ ctrlhuman = NULL; }
+	enemyhuman = NULL;
 	blocks = in_blocks;
 	Param = in_Param;
 	CollD = in_CollD;
 	GameSound = in_GameSound;
 
+	AIlevel = 0;
 	battlemode = AI_NORMAL;
+	NoFight = false;
+	posx = 0.0f;
+	posy = 0.0f;
+	posz = 0.0f;
+	rx = 0.0f;
+	ry = 0.0f;
 	cautionback_posx = 0.0f;
 	cautionback_posz = 0.0f;
 	FaceCaution_flag = false;
@@ -52,7 +60,10 @@
 	waitcnt = 0;
 	movejumpcnt = 1*((int)GAMEFPS);
 	gotocnt = 0;
+	cautioncnt = 0;
+	actioncnt = 0;
 	longattack = false;
+	LevelParam = NULL;
 
 	MoveNavi = new AIMoveNavi;
 	ObjDriver = new AIObjectDriver;
@@ -304,8 +315,8 @@
 
 		if( GetRand(2) == 0 ){
 			//前方向のベクトルを計算
-			vx = cos(rx*-1 + (float)M_PI/2);
-			vz = sin(rx*-1 + (float)M_PI/2);
+			vx = cosf(rx*-1 + (float)M_PI/2);
+			vz = sinf(rx*-1 + (float)M_PI/2);
 			if(
 				(CollD->CheckALLBlockIntersectDummyRay(posx, posy + HUMAN_MAPCOLLISION_HEIGHT, posz, vx, 0, vz, NULL, NULL, &Dist, HUMAN_MAPCOLLISION_R) == true)||		//腰の高さにブロックがある（ぶつかる）
 				(CollD->CheckALLBlockIntersectDummyRay(posx, posy - 1.0f, posz, vx, 0, vz, NULL, NULL, &Dist, HUMAN_MAPCOLLISION_R) == false)							//足元にブロックがない（落ちる）
@@ -316,8 +327,8 @@
 			}
 
 			//後方向のベクトルを計算
-			vx = cos(rx*-1 + (float)M_PI/2 + (float)M_PI);
-			vz = sin(rx*-1 + (float)M_PI/2 + (float)M_PI);
+			vx = cosf(rx*-1 + (float)M_PI/2 + (float)M_PI);
+			vz = sinf(rx*-1 + (float)M_PI/2 + (float)M_PI);
 			if(
 				(CollD->CheckALLBlockIntersectDummyRay(posx, posy + HUMAN_MAPCOLLISION_HEIGHT, posz, vx, 0, vz, NULL, NULL, &Dist, HUMAN_MAPCOLLISION_R) == true)||		//腰の高さにブロックがある（ぶつかる）
 				(CollD->CheckALLBlockIntersectDummyRay(posx, posy - 1.0f, posz, vx, 0, vz, NULL, NULL, &Dist, HUMAN_MAPCOLLISION_R) == false)							//足元にブロックがない（落ちる）
@@ -329,8 +340,8 @@
 		}
 		else{
 			//
-			vx = cos(rx*-1);
-			vz = sin(rx*-1);
+			vx = cosf(rx*-1);
+			vz = sinf(rx*-1);
 			if(
 				(CollD->CheckALLBlockIntersectDummyRay(posx, posy + HUMAN_MAPCOLLISION_HEIGHT, posz, vx, 0, vz, NULL, NULL, &Dist, HUMAN_MAPCOLLISION_R) == true)||		//腰の高さにブロックがある（ぶつかる）
 				(CollD->CheckALLBlockIntersectDummyRay(posx, posy - 1.0f, posz, vx, 0, vz, NULL, NULL, &Dist, HUMAN_MAPCOLLISION_R) == false)							//足元にブロックがない（落ちる）
@@ -340,8 +351,8 @@
 				ObjDriver->SetModeFlag(AI_CTRL_MOVELEFT);
 			}
 
-			vx = cos(rx*-1 + (float)M_PI);
-			vz = sin(rx*-1 + (float)M_PI);
+			vx = cosf(rx*-1 + (float)M_PI);
+			vz = sinf(rx*-1 + (float)M_PI);
 			if(
 				(CollD->CheckALLBlockIntersectDummyRay(posx, posy + HUMAN_MAPCOLLISION_HEIGHT, posz, vx, 0, vz, NULL, NULL, &Dist, HUMAN_MAPCOLLISION_R) == true)||		//腰の高さにブロックがある（ぶつかる）
 				(CollD->CheckALLBlockIntersectDummyRay(posx, posy - 1.0f, posz, vx, 0, vz, NULL, NULL, &Dist, HUMAN_MAPCOLLISION_R) == false)							//足元にブロックがない（落ちる）
@@ -502,9 +513,9 @@
 	float new_posx, new_posy, new_posz;
 
 	//腰付近の当たり判定
-	new_posx = posx + cos(rx*-1 + (float)M_PI/2) * (AI_CHECKJUMP_DIST + HUMAN_MAPCOLLISION_R);
+	new_posx = posx + cosf(rx*-1 + (float)M_PI/2) * (AI_CHECKJUMP_DIST + HUMAN_MAPCOLLISION_R);
 	new_posy = posy + HUMAN_MAPCOLLISION_HEIGHT;
-	new_posz = posz + sin(rx*-1 + (float)M_PI/2) * (AI_CHECKJUMP_DIST + HUMAN_MAPCOLLISION_R);
+	new_posz = posz + sinf(rx*-1 + (float)M_PI/2) * (AI_CHECKJUMP_DIST + HUMAN_MAPCOLLISION_R);
 	if( CollD->CheckALLBlockInside(new_posx, new_posy, new_posz) == true ){
 		ObjMgr->MoveJump(ctrlid);
 		return true;
@@ -511,9 +522,9 @@
 	}
 
 	//体全体の当たり判定
-	new_posx = posx + cos(rx*-1 + (float)M_PI/2) * AI_CHECKJUMP_DIST;
+	new_posx = posx + cosf(rx*-1 + (float)M_PI/2) * AI_CHECKJUMP_DIST;
 	new_posy = posy + AI_CHECKJUMP_HEIGHT;
-	new_posz = posz + sin(rx*-1 + (float)M_PI/2) * AI_CHECKJUMP_DIST;
+	new_posz = posz + sinf(rx*-1 + (float)M_PI/2) * AI_CHECKJUMP_DIST;
 	if( CollD->CheckALLBlockInside(new_posx, new_posy, new_posz) == true ){
 		ObjMgr->MoveJump(ctrlid);
 		return true;
@@ -570,7 +581,7 @@
 			else{ scale = 0.4f; }
 
 			//距離に応じて高さを変える
-			ty += (sqrt(r) - 200.0f) * scale;
+			ty += (sqrtf(r) - 200.0f) * scale;
 		}
 	}
 	else{
@@ -583,7 +594,7 @@
 			float z = posz - tz;
 			float r = x * x + z * z;
 
-			scale = sqrt(r) * 0.12f;
+			scale = sqrtf(r) * 0.12f;
 		}
 
 		//敵の移動を見超す
@@ -696,7 +707,7 @@
 			float z = posz - tz;
 
 			//捕まえる　（敵を引き付ける）
-			EnemyHuman->AddPosOrder(atan2(z, x), 0.0f, 0.5f);
+			EnemyHuman->AddPosOrder(atan2f(z, x), 0.0f, 0.5f);
 
 			//敵の視点をランダムに動かす
 			float erx, ery;
@@ -762,7 +773,7 @@
 		}
 
 		//敵を捉えていれば
-		float atanxy = fabs(atanx) + fabs(atany);
+		float atanxy = fabsf(atanx) + fabsf(atany);
 		if( atanxy < ShotAngle ){
 			int rand = LevelParam->attack;
 			if( longattack == true ){ rand += 1; }
@@ -1374,7 +1385,7 @@
 			if( (fabs(mrx) < search_rx/2)&&(fabs(mry) < search_ry/2) ){
 				float vx, vy, vz;
 
-				Dist = sqrt(Dist2);
+				Dist = sqrtf(Dist2);
 
 				//ベクトルを取得
 				vx = (tx - posx)/Dist;

--- trunk/collision.cpp	(revision 291)
+++ trunk/collision.cpp	(revision 292)
@@ -95,17 +95,17 @@
 			x = data.x[j] - cx;
 			y = data.y[j] - cy;
 			z = data.z[j] - cz;
-			rx = atan2(z, x);
-			ry = atan2(y, sqrt(x*x + z*z));
-			r = sqrt(x*x + y*y + z*z);
+			rx = atan2f(z, x);
+			ry = atan2f(y, sqrtf(x*x + z*z));
+			r = sqrtf(x*x + y*y + z*z);
 
 			//大きくする
 			r += COLLISION_ADDSIZE;
 
 			//座標を再計算
-			cbdata[i].x[j] = cx + cos(rx) * cos(ry) * r;
-			cbdata[i].y[j] = cy + sin(ry) * r;
-			cbdata[i].z[j] = cz + sin(rx) * cos(ry) * r;
+			cbdata[i].x[j] = cx + cosf(rx) * cosf(ry) * r;
+			cbdata[i].y[j] = cy + sinf(ry) * r;
+			cbdata[i].z[j] = cz + sinf(rx) * cosf(ry) * r;
 		}
 	}
 
@@ -285,8 +285,8 @@
 	blockdata->Getdata(&bdata, id);
 
 	//ベクトル算出
-	vx = cos(rx);
-	vz = sin(rx);
+	vx = cosf(rx);
+	vz = sinf(rx);
 
 	//内積
 	d = bdata.material[face].vx*vx + bdata.material[face].vz*vz;
@@ -864,7 +864,7 @@
 	struct blockdata bdata;
 	blockdata->Getdata(&bdata, id);
 
-	float maxDist = sqrt(in_vx*in_vx + in_vy*in_vy + in_vz*in_vz);
+	float maxDist = sqrtf(in_vx*in_vx + in_vy*in_vy + in_vz*in_vz);
 	if( maxDist == 0.0f ){ return false; }
 
 	//内積
@@ -871,7 +871,7 @@
 	float Dot = in_vx/maxDist * bdata.material[face].vx + in_vy/maxDist * bdata.material[face].vy + in_vz/maxDist * bdata.material[face].vz;
 
 	//角度を求める
-	*out_angle = asin(Dot) * -1;
+	*out_angle = asinf(Dot) * -1;
 
 	return true;
 }
@@ -901,7 +901,7 @@
 	if( out_vz != NULL ){ *out_vz = in_vz - Dot * bdata.material[face].vz; }
 
 	//角度を求める
-	if( out_angle != NULL ){ *out_angle = asin(Dot) * -1; }
+	if( out_angle != NULL ){ *out_angle = asinf(Dot) * -1; }
 	//if( out_angle != NULL ){ *out_angle = Dot * -1; }
 
 	return true;
@@ -968,8 +968,8 @@
 		float caser = x*x + z*z;
 		float minr = (c1_r+c2_r) * (c1_r+c2_r);
 		if( caser < minr ){
-			if( angle != NULL ){ *angle = atan2(z, x); }
-			if( length != NULL ){ *length = sqrt(minr) - sqrt(caser); }
+			if( angle != NULL ){ *angle = atan2f(z, x); }
+			if( length != NULL ){ *length = sqrtf(minr) - sqrtf(caser); }
 			return true;
 		}
 	}
@@ -1061,7 +1061,7 @@
 	x = s_x - RayPos_x;
 	y = s_y - RayPos_y;
 	z = s_z - RayPos_z;
-	d = sqrt(x*x + y*y + z*z);
+	d = sqrtf(x*x + y*y + z*z);
 
 	//レイ始点が半径より近い（＝めり込んでいる）
 	if( d < s_r ){
@@ -1073,8 +1073,8 @@
 	MinDist = DistancePosRay(s_x, s_y, s_z, RayPos_x, RayPos_y, RayPos_z, RayDir_x, RayDir_y, RayDir_z);
 
 	if( MinDist <= s_r ){
-		RayDist = sqrt(d*d - MinDist*MinDist);		//（レイ始点から）点に最も近づく距離
-		RDist = sqrt(s_r*s_r - MinDist*MinDist);	//（点半径から）点に最も近づく距離
+		RayDist = sqrtf(d*d - MinDist*MinDist);		//（レイ始点から）点に最も近づく距離
+		RDist = sqrtf(s_r*s_r - MinDist*MinDist);	//（点半径から）点に最も近づく距離
 
 		*Dist = RayDist - RDist;	//レイ視点最短 - 半径最短 = レイ視点から半径までの最短
 
@@ -1288,7 +1288,7 @@
 	//点とレイ始点の距離
 	x = c_x - RayPos_x;
 	z = c_z - RayPos_z;
-	d = sqrt(x*x + z*z);
+	d = sqrtf(x*x + z*z);
 
 	//点（円柱の中心）とレイの最短距離を求める
 	cMinDist = DistancePosRay(c_x, 0.0f, c_z, RayPos_x, 0.0f, RayPos_z, RayDir_x, 0.0f, RayDir_z);
@@ -1298,8 +1298,8 @@
 		return false;
 	}
 
-	cRayDist = sqrt(d*d - cMinDist*cMinDist);		//（レイ始点から）点に最も近づく距離
-	cRDist = sqrt(c_r*c_r - cMinDist*cMinDist);	//（点半径から）点に最も近づく距離
+	cRayDist = sqrtf(d*d - cMinDist*cMinDist);		//（レイ始点から）点に最も近づく距離
+	cRDist = sqrtf(c_r*c_r - cMinDist*cMinDist);	//（点半径から）点に最も近づく距離
 
 	if( d < c_r ){
 		RayXZ_min = 0;		//始点が円の中なら距離ゼロ
@@ -1311,7 +1311,7 @@
 	//点とレイ終点の距離
 	x = c_x - RayPos_x + RayDir_x*maxDist;
 	z = c_z - RayPos_z + RayDir_x*maxDist;
-	d = sqrt(x*x + z*z);
+	d = sqrtf(x*x + z*z);
 
 	if( d < c_r ){
 		RayXZ_max = maxDist;		//終点が円の中なら最大距離
@@ -1321,9 +1321,9 @@
 	}
 
 	//Y軸と比べる前に、Y軸と比較できるよう変換　（底辺の値を斜辺へ変換）
-	float Ray_ry = atan2(RayDir_y, sqrt(RayDir_x*RayDir_x + RayDir_z*RayDir_z));
-	Ray_min[0] = RayXZ_min / cos(Ray_ry);
-	Ray_max[0] = RayXZ_max / cos(Ray_ry);
+	float Ray_ry = atan2f(RayDir_y, sqrtf(RayDir_x*RayDir_x + RayDir_z*RayDir_z));
+	Ray_min[0] = RayXZ_min / cosf(Ray_ry);
+	Ray_max[0] = RayXZ_max / cosf(Ray_ry);
 
 
 	//Y軸のみAABBと同様の処理
@@ -1414,7 +1414,7 @@
 
 	//レイのベクトルが逆方向なら
 	if( Dot < 0.0f ){
-		return sqrt(x1*x1 + y1*y1 + z1*z1);
+		return sqrtf(x1*x1 + y1*y1 + z1*z1);
 	}
 
 	//外積
@@ -1422,7 +1422,7 @@
 	y3 = z1 * x2 - x1 * z2;
 	z3 = x1 * y2 - y1 * x2;
 
-	return sqrt(x3*x3 + y3*y3 + z3*z3) / sqrt(RayDir_x*RayDir_x + RayDir_y*RayDir_y + RayDir_z*RayDir_z);
+	return sqrtf(x3*x3 + y3*y3 + z3*z3) / sqrtf(RayDir_x*RayDir_x + RayDir_y*RayDir_y + RayDir_z*RayDir_z);
 }
 
 //! @brief 線分と線分の当たり判定（2D）
@@ -1486,7 +1486,7 @@
 bool Get2DLineInBox(int line_x1, int line_y1, int line_x2, int line_y2, int box_x1, int box_y1, int box_x2, int box_y2, int *out_line_x1, int *out_line_y1, int *out_line_x2, int *out_line_y2)
 {
 	//四角形指定が異常
-	if( (box_x1 >= box_x2)||(box_x1 >= box_x2) ){ return false; }
+	if( (box_x1 >= box_x2)||(box_y1 >= box_y2) ){ return false; }
 
 	//上下左右の空間にあるなら、的外れ
 	if( (line_x1 < box_x1)&&(line_x2 < box_x1) ){ return false; }
@@ -1584,7 +1584,7 @@
 //! @param out_ry 対象点への垂直角度を受け取るポインタ（NULL可）
 //! @param out_dist2 対象点への距離<b>の二乗</b>を受け取るポインタ（NULL可）
 //! @return 成功：true 失敗：false
-//! @warning out_dist2は距離の<b>二乗</b>です。必要に応じて改めて sqrt()関数 などを用いてください。
+//! @warning out_dist2は距離の<b>二乗</b>です。必要に応じて改めて sqrtf()関数 などを用いてください。
 //! @attention 引数 checkdist に有効な距離を与えた場合は、観測点から対象点への距離判定も行います。指定された距離より離れている場合、角度を計算せずに false を返します。
 //! @attention 逆に、引数 checkdist に0.0f以下を与えた場合、距離による判定を行いません。関数は常に true を返します。
 bool CheckTargetAngle(float pos_x, float pos_y, float pos_z, float rx, float ry, float target_x, float target_y, float target_z, float checkdist, float *out_rx, float *out_ry, float *out_dist2)
@@ -1608,7 +1608,7 @@
 	}
 
 	if( out_rx != NULL ){
-		angleX = atan2(z, x) - rx;
+		angleX = atan2f(z, x) - rx;
 		for(; angleX > (float)M_PI; angleX -= (float)M_PI*2){}
 		for(; angleX < (float)M_PI*-1; angleX += (float)M_PI*2){}
 
@@ -1615,7 +1615,7 @@
 		*out_rx = angleX;
 	}
 	if( out_ry != NULL ){
-		angleY = atan2(y, sqrt(x*x + z*z))  - ry;
+		angleY = atan2f(y, sqrtf(x*x + z*z))  - ry;
 
 		*out_ry = angleY;
 	}
@@ -1631,7 +1631,7 @@
 //! @return 正規化前のベクトルの長さ
 float VectorNormalization(float *vx, float *vy, float *vz)
 {
-	float r = sqrt((*vx) * (*vx) + (*vy) * (*vy) + (*vz) * (*vz));
+	float r = sqrtf((*vx) * (*vx) + (*vy) * (*vy) + (*vz) * (*vz));
 	if( r > 0.0f ){
 		*vx /= r;
 		*vy /= r;

--- trunk/d3dgraphics-directx.cpp	(revision 291)
+++ trunk/d3dgraphics-directx.cpp	(revision 292)
@@ -1211,7 +1211,7 @@
 	//カメラの向きを決定
 	if( fabs(camera_ry) == D3DX_PI/2 ){
 		//真上or真下を向いているならば、カメラの上部指定を横向きにする。
-		vUpVecF_x = cos(camera_rx); vUpVecF_y = 0.0f; vUpVecF_z = sin(camera_rx);
+		vUpVecF_x = cosf(camera_rx); vUpVecF_y = 0.0f; vUpVecF_z = sinf(camera_rx);
 	}
 	else{
 		if( fabs(camera_ry) < D3DX_PI/2 ){
@@ -1232,7 +1232,7 @@
 
 	//カメラ座標
 	D3DXVECTOR3 vEyePt( camera_x, camera_y, camera_z );
-	D3DXVECTOR3 vLookatPt( cos(camera_rx)*cos(camera_ry) + camera_x, sin(camera_ry) + camera_y, sin(camera_rx)*cos(camera_ry) + camera_z );
+	D3DXVECTOR3 vLookatPt( cosf(camera_rx)*cosf(camera_ry) + camera_x, sinf(camera_ry) + camera_y, sinf(camera_rx)*cosf(camera_ry) + camera_z );
 	D3DXVECTOR3 vUpVec( vUpVecF_x, vUpVecF_y, vUpVecF_z );
 	D3DXMatrixLookAtLH( &matView, &vEyePt, &vLookatPt, &vUpVec );
 #if GRAPHIC_ENGINE == 0
@@ -2162,8 +2162,8 @@
 
 	//頂点座標と色などを設定
 	for(int i=0; i<16+1; i++){
-		pLineVertices[i].x = (float)x + cos(DegreeToRadian((360.0f/16.0f)) * i) * r;
-		pLineVertices[i].y = (float)y + sin(DegreeToRadian((360.0f/16.0f)) * i) * r;
+		pLineVertices[i].x = (float)x + cosf(DegreeToRadian((360.0f/16.0f)) * i) * r;
+		pLineVertices[i].y = (float)y + sinf(DegreeToRadian((360.0f/16.0f)) * i) * r;
 
 		pLineVertices[i].z = 0.0f;
 		pLineVertices[i].rhw = 1.0f;

--- trunk/d3dgraphics-opengl.cpp	(revision 291)
+++ trunk/d3dgraphics-opengl.cpp	(revision 292)
@@ -1756,7 +1756,7 @@
 
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
-	gluLookAt(camera_x*-1, camera_y, camera_z, camera_x*-1 + cos(camera_rx*-1 + (float)M_PI)*cos(camera_ry), camera_y + sin(camera_ry), camera_z + sin(camera_rx*-1 + (float)M_PI)*cos(camera_ry), 0.0f, camera_y_flag, 0.0f);
+	gluLookAt(camera_x*-1, camera_y, camera_z, camera_x*-1 + cosf(camera_rx*-1 + (float)M_PI)*cosf(camera_ry), camera_y + sinf(camera_ry), camera_z + sinf(camera_rx*-1 + (float)M_PI)*cosf(camera_ry), 0.0f, camera_y_flag, 0.0f);
 }
 
 //! @brief ワールド空間の座標・角度・拡大率を設定
@@ -2888,8 +2888,8 @@
 	//頂点座標を設定
 	for(int i=0; i<16+1; i++){
 		float x2, y2;
-		x2 = (float)x + cos((float)M_PI*2/16 * i) * r;
-		y2 = (float)y + sin((float)M_PI*2/16 * i) * r;
+		x2 = (float)x + cosf((float)M_PI*2/16 * i) * r;
+		y2 = (float)y + sinf((float)M_PI*2/16 * i) * r;
 		VertexAry[i*2] = x2;	VertexAry[i*2+1] = y2;
 	}
 

--- trunk/datafile.cpp	(revision 291)
+++ trunk/datafile.cpp	(revision 292)
@@ -192,9 +192,9 @@
 	float rx, ry, rz, a;
 
 	//光源の角度を設定
-	lx = cos(LIGHT_RX);
-	ly = sin(LIGHT_RY);
-	lz = sin(LIGHT_RX);
+	lx = cosf(LIGHT_RX);
+	ly = sinf(LIGHT_RY);
+	lz = sinf(LIGHT_RX);
 
 	//各ブロックの面情報分処理する
 	for(int i=0; i<datas; i++){
@@ -222,13 +222,13 @@
 			xs1 = ((data[i].y[ vID[3] ] - data[i].y[ vID[2] ]) * (data[i].z[ vID[0] ] - data[i].z[ vID[2] ])) - ((data[i].y[ vID[0] ] - data[i].y[ vID[2] ]) * (data[i].z[ vID[3] ] - data[i].z[ vID[2] ]));
 			ys1 = ((data[i].z[ vID[3] ] - data[i].z[ vID[2] ]) * (data[i].x[ vID[0] ] - data[i].x[ vID[2] ])) - ((data[i].z[ vID[0] ] - data[i].z[ vID[2] ]) * (data[i].x[ vID[3] ] - data[i].x[ vID[2] ]));
 			zs1 = ((data[i].x[ vID[3] ] - data[i].x[ vID[2] ]) * (data[i].y[ vID[0] ] - data[i].y[ vID[2] ])) - ((data[i].x[ vID[0] ] - data[i].x[ vID[2] ]) * (data[i].y[ vID[3] ] - data[i].y[ vID[2] ]));
-			g1 = (float)sqrt(xs1 * xs1 + ys1 * ys1 + zs1 * zs1);
+			g1 = (float)sqrtf(xs1 * xs1 + ys1 * ys1 + zs1 * zs1);
 
 			//もう一方の三角形でも計算する
 			xs2 = ((data[i].y[ vID[1] ] - data[i].y[ vID[0] ]) * (data[i].z[ vID[2] ] - data[i].z[ vID[0] ])) - ((data[i].y[ vID[2] ] - data[i].y[ vID[0] ]) * (data[i].z[ vID[1] ] - data[i].z[ vID[0] ]));
 			ys2 = ((data[i].z[ vID[1] ] - data[i].z[ vID[0] ]) * (data[i].x[ vID[2] ] - data[i].x[ vID[0] ])) - ((data[i].z[ vID[2] ] - data[i].z[ vID[0] ]) * (data[i].x[ vID[1] ] - data[i].x[ vID[0] ]));
 			zs2 = ((data[i].x[ vID[1] ] - data[i].x[ vID[0] ]) * (data[i].y[ vID[2] ] - data[i].y[ vID[0] ])) - ((data[i].x[ vID[2] ] - data[i].x[ vID[0] ]) * (data[i].y[ vID[1] ] - data[i].y[ vID[0] ]));
-			g2 = (float)sqrt(xs2 * xs2 + ys2 * ys2 + zs2 * zs2);
+			g2 = (float)sqrtf(xs2 * xs2 + ys2 * ys2 + zs2 * zs2);
 
 			//正しい計算結果を採用する
 			if( g1 > g2 ){
@@ -253,9 +253,9 @@
 			rx = data[i].material[j].vx + lx;
 			ry = data[i].material[j].vy + ly;
 			rz = data[i].material[j].vz + lz;
-			//a = sqrt(fabs(rx*rx + ry*ry + rz*rz)) / 2.0f;
+			//a = sqrtf(fabs(rx*rx + ry*ry + rz*rz)) / 2.0f;
 			//data[i].material[j].shadow = a/2 + 0.5f;
-			a = sqrt(rx*rx + ry*ry + rz*rz) / 3.0f;
+			a = sqrtf(rx*rx + ry*ry + rz*rz) / 3.0f;
 			data[i].material[j].shadow = a/2;
 			if( darkflag == false ){
 				data[i].material[j].shadow += 0.5f;

--- trunk/event.cpp	(revision 291)
+++ trunk/event.cpp	(revision 292)
@@ -113,10 +113,10 @@
 	z = hz - pos_z;
 
 	if( reverse == false ){
-		if( sqrt(x*x + y*y+ + z*z) > dist_r ){ return false; }
+		if( sqrtf(x*x + y*y+ + z*z) > dist_r ){ return false; }
 	}
 	else{
-		if( sqrt(x*x + y*y+ + z*z) < dist_r ){ return false; }
+		if( sqrtf(x*x + y*y+ + z*z) < dist_r ){ return false; }
 	}
 	return true;
 }

--- trunk/gamemain.cpp	(revision 291)
+++ trunk/gamemain.cpp	(revision 292)
@@ -474,10 +474,31 @@
 mainmenu::mainmenu()
 {
 	demopath[0] = '\0';
+	modescreen = 0;
+	mainmenu_mouseX = 0;
+	mainmenu_mouseY = 0;
+	mainmenu_mouseY_old = mainmenu_mouseY;
+	gametitle = -1;
 
 #ifdef ENABLE_MENUOPTIONS
+	for( int i=0; i<OPTIONS_P1_DATAS; i++ ){
+		Options_p1LinkTextData[i].enable = false;
+	}
+	for( int i=0; i<OPTIONS_P2_DATAS; i++ ){
+		Options_p2LinkTextData[i].enable = false;
+	}
+	for( int i=0; i<OPTIONS_P3_DATAS; i++ ){
+		Options_p3LinkTextData[i].enable = false;
+	}
+	Options_p2LinkTextID = -1;
+	Options_FullscreenFlag_old = GameConfig.GetFullscreenFlag();
+	Options_KeyConfigID = -1;
+	Options_KeyConfigCnt = 0;
+	licenseinfo[0] = "";
 	licenseinfobuf = new char[100*18];
-	licenseinfobuf[0] = '\0';
+	for( int i=0; i<OPTIONS_LICENSELINE; i++ ){
+		licenseinfobuf[i] = '\0';
+	}
 #endif
 }
 
@@ -1546,7 +1567,11 @@
 
 //! @brief コンストラクタ
 briefing::briefing()
-{}
+{
+	TwoTexture = false;
+	TextureA = -1;
+	TextureB = -1;
+}
 
 //! @brief ディストラクタ
 briefing::~briefing()
@@ -1684,11 +1709,40 @@
 //! @brief コンストラクタ
 maingame::maingame()
 {
+	SkyNumber = 0;
+	DarkScreenFlag = false;
+	FogFlag = true;
+	mouse_rx = 0.0f;
+	mouse_ry = 0.0f;
+	view_rx = 0.0f;
+	view_ry = 0.0f;
 	add_camera_rx = 0.0f;
 	add_camera_ry = 0.0f;
 	ShowInfo_Debugmode = false;
+	Camera_Debugmode = false;
+	tag = false;
+	radar = false;
+	wireframe = false;
+	nomodel = false;
+	CenterLine = false;
+	Camera_Blind = true;
+	Camera_F1mode = false;
 	Camera_F2mode = 0;
 	Camera_HOMEmode = false;
+	Cmd_F5 = false;
+	InvincibleID = -1;
+	PlayerAI = false;
+	AIstop = false;
+	AINoFight = false;
+	AIdebuginfoID = -1;
+	start_framecnt = 0;
+	end_framecnt = 0;
+	EventStop = false;
+	GameSpeed = 1;
+	message_id = -1;
+	message_cnt = 0;
+	redflash_flag = false;
+	time = 0;
 	time_input = 0;
 	time_process_object = 0;
 	time_process_ai = 0;
@@ -1695,6 +1749,15 @@
 	time_process_event = 0;
 	time_sound = 0;
 	time_render = 0;
+	memcpy(&MainGameInfo, &GameInfoData, sizeof(GameInfo));
+
+#ifdef ENABLE_DEBUGCONSOLE
+	Show_Console = false;
+	InfoConsoleData = NULL;
+	InputConsoleData = NULL;
+	NewCommand[0] = '\0';
+	ScreenShot = 0;
+#endif
 }
 
 //! @brief ディストラクタ
@@ -2336,9 +2399,9 @@
 			}
 
 			//プレイヤーの目の前の座標を取得
-			x += cos(r*-1 + (float)M_PI/2)*10.0f;
+			x += cosf(r*-1 + (float)M_PI/2)*10.0f;
 			y += 5.0f;
-			z += sin(r*-1 + (float)M_PI/2)*10.0f;
+			z += sinf(r*-1 + (float)M_PI/2)*10.0f;
 
 			//人を追加
 			id = ObjMgr.AddHumanIndex(x, y, z, r, param, team, weapon_paramid, 0, false);
@@ -2395,22 +2458,22 @@
 
 	//キー操作によりカメラ座標を計算
 	if( CheckInputControl(KEY_MOVEFORWARD, 0) ){
-		camera_x += cos(camera_rx)*cos(camera_ry)*dist;
-		camera_y += sin(camera_ry)*dist;
-		camera_z += sin(camera_rx)*cos(camera_ry)*dist;
+		camera_x += cosf(camera_rx)*cosf(camera_ry)*dist;
+		camera_y += sinf(camera_ry)*dist;
+		camera_z += sinf(camera_rx)*cosf(camera_ry)*dist;
 	}
 	if( CheckInputControl(KEY_MOVEBACKWARD, 0) ){
-		camera_x -= cos(camera_rx)*cos(camera_ry)*dist;
-		camera_y -= sin(camera_ry)*dist;
-		camera_z -= sin(camera_rx)*cos(camera_ry)*dist;
+		camera_x -= cosf(camera_rx)*cosf(camera_ry)*dist;
+		camera_y -= sinf(camera_ry)*dist;
+		camera_z -= sinf(camera_rx)*cosf(camera_ry)*dist;
 	}
 	if( CheckInputControl(KEY_MOVELEFT, 0) ){
-		camera_x += cos(camera_rx + (float)M_PI/2)*dist;
-		camera_z += sin(camera_rx + (float)M_PI/2)*dist;
+		camera_x += cosf(camera_rx + (float)M_PI/2)*dist;
+		camera_z += sinf(camera_rx + (float)M_PI/2)*dist;
 	}
 	if( CheckInputControl(KEY_MOVERIGHT, 0) ){
-		camera_x += cos(camera_rx - (float)M_PI/2)*dist;
-		camera_z += sin(camera_rx - (float)M_PI/2)*dist;
+		camera_x += cosf(camera_rx - (float)M_PI/2)*dist;
+		camera_z += sinf(camera_rx - (float)M_PI/2)*dist;
 	}
 }
 
@@ -2529,9 +2592,9 @@
 
 		camera_rx += DegreeToRadian(1.0f);
 		camera_ry = ry;
-		camera_x = x + cos(camera_rx)*r;
+		camera_x = x + cosf(camera_rx)*r;
 		camera_y = y + 33.3f;
-		camera_z = z + sin(camera_rx)*r;
+		camera_z = z + sinf(camera_rx)*r;
 	}
 	else if( Camera_F1mode == true ){
 		float crx, cry;
@@ -2540,14 +2603,14 @@
 		//カメラの注視点を計算
 		crx = camera_rx*0.8f + (view_rx + mouse_rx*-1 + (float)M_PI/2)*0.2f;	// 8 : 2
 		cry = camera_ry*0.8f + (view_ry + mouse_ry)*0.2f - (float)M_PI/2;		// 8 : 2
-		ccx = x - cos(crx)*cos(cry)*3.0f;
-		ccy = y + HUMAN_HEIGHT-0.5f + sin(cry*-1)*2.5f;
-		ccz = z - sin(crx)*cos(cry)*3.0f;
+		ccx = x - cosf(crx)*cosf(cry)*3.0f;
+		ccy = y + HUMAN_HEIGHT-0.5f + sinf(cry*-1)*2.5f;
+		ccz = z - sinf(crx)*cosf(cry)*3.0f;
 
 		//注視点からカメラまでの当たり判定
 		cry += (float)M_PI/2;
 		float dist;
-		if( CollD.CheckALLBlockIntersectRay(ccx, ccy, ccz, cos(crx)*cos(cry)*-1, sin(cry*-1), sin(crx)*cos(cry)*-1, NULL, NULL, &dist, VIEW_F1MODE_DIST) == true ){
+		if( CollD.CheckALLBlockIntersectRay(ccx, ccy, ccz, cosf(crx)*cosf(cry)*-1, sinf(cry*-1), sinf(crx)*cosf(cry)*-1, NULL, NULL, &dist, VIEW_F1MODE_DIST) == true ){
 			dist -= 1.0f;
 		}
 		else{
@@ -2555,9 +2618,9 @@
 		}
 
 		//カメラ座標を再計算
-		camera_x = ccx - cos(crx)*cos(cry)*(dist);
-		camera_y = ccy + sin(cry*-1)*dist;
-		camera_z = ccz - sin(crx)*cos(cry)*(dist);
+		camera_x = ccx - cosf(crx)*cosf(cry)*(dist);
+		camera_y = ccy + sinf(cry*-1)*dist;
+		camera_z = ccz - sinf(crx)*cosf(cry)*(dist);
 		camera_rx = crx;
 		camera_ry = cry;
 	}
@@ -2565,9 +2628,9 @@
 		float crx = view_rx + mouse_rx*-1 + (float)M_PI/2;
 		float cry = view_ry + mouse_ry;
 
-		camera_x = x + cos(crx)*cos(cry)*VIEW_DIST;
-		camera_y = y + VIEW_HEIGHT + sin(cry)*VIEW_DIST;
-		camera_z = z + sin(crx)*cos(cry)*VIEW_DIST;
+		camera_x = x + cosf(crx)*cosf(cry)*VIEW_DIST;
+		camera_y = y + VIEW_HEIGHT + sinf(cry)*VIEW_DIST;
+		camera_z = z + sinf(crx)*cosf(cry)*VIEW_DIST;
 		camera_rx = crx;
 		camera_ry = cry;
 	}
@@ -2864,22 +2927,22 @@
 		if( scopemode == 2 ){ addang = VIEWANGLE_SCOPE_2 / 4; }
 
 		//上
-		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 ){
+		if( CollD.CheckALLBlockInside(camera_x + cosf(camera_rx)*cosf(camera_ry + addang) * adddist, camera_y + sinf(camera_ry + addang) * adddist, camera_z + sinf(camera_rx)*cosf(camera_ry + addang) * adddist) == true ){
 			d3dg->Draw2DBox(0, 0, GameConfig.GetScreenWidth(), GameConfig.GetScreenHeight()/2, d3dg->GetColorCode(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 ){
+		if( CollD.CheckALLBlockInside(camera_x + cosf(camera_rx)*cosf(camera_ry - addang) * adddist, camera_y + sinf(camera_ry - addang) * adddist, camera_z + sinf(camera_rx)*cosf(camera_ry - addang) * adddist) == true ){
 			d3dg->Draw2DBox(0, GameConfig.GetScreenHeight()/2, GameConfig.GetScreenWidth(), GameConfig.GetScreenHeight(), d3dg->GetColorCode(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 ){
+		if( CollD.CheckALLBlockInside(camera_x + cosf(camera_rx + addang)*cosf(camera_ry) * adddist, camera_y + sinf(camera_ry) * adddist, camera_z + sinf(camera_rx + addang)*cosf(camera_ry) * adddist) == true ){
 			d3dg->Draw2DBox(0, 0, GameConfig.GetScreenWidth()/2, GameConfig.GetScreenHeight(), d3dg->GetColorCode(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 ){
+		if( CollD.CheckALLBlockInside(camera_x + cosf(camera_rx - addang)*cosf(camera_ry) * adddist, camera_y + sinf(camera_ry) * adddist, camera_z + sinf(camera_rx - addang)*cosf(camera_ry) * adddist) == true ){
 			d3dg->Draw2DBox(GameConfig.GetScreenWidth()/2, 0, GameConfig.GetScreenWidth(), GameConfig.GetScreenHeight(), d3dg->GetColorCode(0.0f,0.0f,0.0f,1.0f));
 		}
 	}
@@ -3220,20 +3283,20 @@
 	//近ければ処理する
 	if( (check == false) || ((fabs(x) < RadarWorldR*2)&&(fabs(z) < RadarWorldR*2)&&(fabs(y) < 80.0f)) ){
 		//角度を距離を計算
-		rx = atan2(z, x);
-		r = sqrt(x*x + z*z);
+		rx = atan2f(z, x);
+		r = sqrtf(x*x + z*z);
 
 		//カメラ基準の座標を再計算
 		rx2 = (rx - camera_rx)*-1 - (float)M_PI/2;
-		x2 = cos(rx2) * r;
-		z2 = sin(rx2) * r;
+		x2 = cosf(rx2) * r;
+		z2 = sinf(rx2) * r;
 
 		//収まるか判定
 		if( (check == false) || ((fabs(x2) < RadarWorldR)&&(fabs(z2) < RadarWorldR)) ){
 			//描画座標を計算
 			r2 = r / RadarWorldR * (RadarSize/2);
-			*out_x = (int)(RadarPosX+RadarSize/2 + cos(rx2) * r2);
-			*out_y = (int)(RadarPosY+RadarSize/2 + sin(rx2) * r2);
+			*out_x = (int)(RadarPosX+RadarSize/2 + cosf(rx2) * r2);
+			*out_y = (int)(RadarPosY+RadarSize/2 + sinf(rx2) * r2);
 			if( local_y != NULL ){ *local_y = y; }
 			outf = true;
 		}
@@ -3277,7 +3340,7 @@
 			//各面ごとに処理する
 			for(int j=0; j<6; j++){
 				//登れない斜面か判定　※地面や階段などの傾斜を除外する
-				float angle = acos(bdata.material[j].vy);
+				float angle = acosf(bdata.material[j].vy);
 				if( (HUMAN_MAPCOLLISION_SLOPEANGLE < angle)&&(angle < DegreeToRadian(120)) ){
 
 					//ブロック頂点データの関連付けを取得
@@ -4208,7 +4271,7 @@
 	//小物を新規配置
 	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);
+			int dataid = ObjMgr.AddSmallObjectIndex(camera_x + cosf(camera_rx)*20.0f, camera_y, camera_z + sinf(camera_rx)*20.0f, camera_rx*-1, id, true);
 			if( dataid != -1 ){
 				sprintf(str, "Add SmallObject[%d].", dataid);
 				AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), str);

--- trunk/main.h	(revision 291)
+++ trunk/main.h	(revision 292)
@@ -88,7 +88,7 @@
 
 //BorlandC++ Compiler用の処理
 #ifdef __BORLANDC__
- #define sqrtf(df) sqrt(df)
+ #define sqrtf(df) sqrtf(df)
  int _matherr(struct _exception  *__e) { return 1; }
 #endif
 
@@ -97,6 +97,17 @@
  #define UNREFERENCED_PARAMETER(P) ((P)=(P))
 #endif
 
+//float型の算術関数用意
+#ifndef _MSC_VER
+ #define sinf(x) (float)sin(x)				//!< sinf(x)
+ #define cosf(x) (float)cos(x)				//!< cosf(x)
+ #define atan2f(y,x) (float)atan2(y,x)		//!< atan2f(y,x)
+ #define sqrtf(x) (float)sqrt(x)			//!< sqrtf(x)
+ #define floorf(x) (float)floor(x)			//!< floorf(x)
+ #define ceilf(x) (float)ceil(x)			//!< ceilf(x)
+ #define fabsf(x) (float)fabs(x)			//!< fabsf(x)
+#endif
+
 #define SetFlag(value, bit) value = value | bit		//!< ビットによるフラグ 設定
 #define DelFlag(value, bit) value = value & (~bit)	//!< ビットによるフラグ 解除
 #define GetFlag(value, bit) (value & bit)			//!< ビットによるフラグ 取得

--- trunk/object.cpp	(revision 291)
+++ trunk/object.cpp	(revision 292)
@@ -211,6 +211,7 @@
 	totalmove = 0.0f;
 	StateGunsightErrorRange = 0;
 	ReactionGunsightErrorRange = 0;
+	Invincible = false;
 
 	MotionCtrl = new HumanMotionControl;
 }
@@ -950,9 +951,9 @@
 //! @param speed 速度
 void human::AddPosOrder(float rx, float ry, float speed)
 {
-	move_x += cos(rx) * cos(ry) * speed;
-	move_y += sin(ry) * speed;
-	move_z += sin(rx) * cos(ry) * speed;
+	move_x += cosf(rx) * cosf(ry) * speed;
+	move_y += sinf(ry) * speed;
+	move_z += sinf(rx) * cosf(ry) * speed;
 }
 
 //! @brief 弾が 頭 にヒット
@@ -1164,9 +1165,9 @@
 			weaponreloadcnt = 0;
 
 			//次のフレームの頭の座標を取得
-			check_posx = pos_x + cos(rotation_x*-1 - (float)M_PI/2) * sin(add_ry) * HUMAN_HEIGHT;
-			check_posy = pos_y + cos(add_ry) * HUMAN_HEIGHT;
-			check_posz = pos_z + sin(rotation_x*-1 - (float)M_PI/2) * sin(add_ry) * HUMAN_HEIGHT;
+			check_posx = pos_x + cosf(rotation_x*-1 - (float)M_PI/2) * sinf(add_ry) * HUMAN_HEIGHT;
+			check_posy = pos_y + cosf(add_ry) * HUMAN_HEIGHT;
+			check_posz = pos_z + sinf(rotation_x*-1 - (float)M_PI/2) * sinf(add_ry) * HUMAN_HEIGHT;
 
 			if( CollD->CheckALLBlockInside(check_posx, check_posy, check_posz) == true ){
 				deadstate = 2;
@@ -1209,9 +1210,9 @@
 		}
 		else{
 			//次のフレームの頭の座標を取得
-			check_posx = pos_x + cos(rotation_x*-1 - (float)M_PI/2) * sin(rotation_y + add_ry) * HUMAN_HEIGHT;
-			check_posy = pos_y + cos(rotation_y + add_ry) * HUMAN_HEIGHT;
-			check_posz = pos_z + sin(rotation_x*-1 - (float)M_PI/2) * sin(rotation_y + add_ry) * HUMAN_HEIGHT;
+			check_posx = pos_x + cosf(rotation_x*-1 - (float)M_PI/2) * sinf(rotation_y + add_ry) * HUMAN_HEIGHT;
+			check_posy = pos_y + cosf(rotation_y + add_ry) * HUMAN_HEIGHT;
+			check_posz = pos_z + sinf(rotation_x*-1 - (float)M_PI/2) * sinf(rotation_y + add_ry) * HUMAN_HEIGHT;
 
 			if( CollD->CheckALLBlockInside(check_posx, check_posy, check_posz) == true ){
 				deadstate = 3;
@@ -1267,9 +1268,9 @@
 		}
 
 		//次のフレームの足の座標を取得
-		check_posx = pos_x - cos(rotation_x*-1 - (float)M_PI/2) * sin(rotation_y + add_ry) * HUMAN_HEIGHT;
+		check_posx = pos_x - cosf(rotation_x*-1 - (float)M_PI/2) * sinf(rotation_y + add_ry) * HUMAN_HEIGHT;
 		check_posy = pos_y + 0.1f;
-		check_posz = pos_z - sin(rotation_x*-1 - (float)M_PI/2) * sin(rotation_y + add_ry) * HUMAN_HEIGHT;
+		check_posz = pos_z - sinf(rotation_x*-1 - (float)M_PI/2) * sinf(rotation_y + add_ry) * HUMAN_HEIGHT;
 
 		if( CollD->CheckALLBlockInside(check_posx, check_posy, check_posz) == true ){
 			deadstate = 4;
@@ -1277,9 +1278,9 @@
 		}
 
 		//次のフレームの頭の座標を取得
-		check_posx = pos_x - cos(rotation_x*-1 - (float)M_PI/2) * sin(rotation_y + add_ry) * HUMAN_HEIGHT;
-		check_posy = pos_y + cos(rotation_y + add_ry) * HUMAN_HEIGHT;
-		check_posz = pos_z - sin(rotation_x*-1 - (float)M_PI/2) * sin(rotation_y + add_ry) * HUMAN_HEIGHT;
+		check_posx = pos_x - cosf(rotation_x*-1 - (float)M_PI/2) * sinf(rotation_y + add_ry) * HUMAN_HEIGHT;
+		check_posy = pos_y + cosf(rotation_y + add_ry) * HUMAN_HEIGHT;
+		check_posz = pos_z - sinf(rotation_x*-1 - (float)M_PI/2) * sinf(rotation_y + add_ry) * HUMAN_HEIGHT;
 
 		if( CollD->CheckALLBlockInside(check_posx, check_posy, check_posz) == true ){
 			deadstate = 4;
@@ -1287,8 +1288,8 @@
 		}
 
 		//足の座標を移動
-		pos_x -= cos(rotation_x*-1 - (float)M_PI/2) * sin(add_ry) * HUMAN_HEIGHT;
-		pos_z -= sin(rotation_x*-1 - (float)M_PI/2) * sin(add_ry) * HUMAN_HEIGHT;
+		pos_x -= cosf(rotation_x*-1 - (float)M_PI/2) * sinf(add_ry) * HUMAN_HEIGHT;
+		pos_z -= sinf(rotation_x*-1 - (float)M_PI/2) * sinf(add_ry) * HUMAN_HEIGHT;
 
 		rotation_y += add_ry;
 		return 2;
@@ -1457,7 +1458,7 @@
 	dist_y = pos_y - pos_y2;
 	dist_z = pos_z - pos_z2;
 
-	speed = sqrt(dist_x*dist_x + dist_z*dist_z);
+	speed = sqrtf(dist_x*dist_x + dist_z*dist_z);
 	if( (speed != 0.0f)||(move_y != 0.0f) ){
 
 		//頭部で当たり判定
@@ -1497,7 +1498,7 @@
 						inblockdata->Getdata(&bdata, id);
 
 						//斜面に立っているならば、上昇無効
-						if( acos(bdata.material[face].vy) > HUMAN_MAPCOLLISION_SLOPEANGLE ){
+						if( acosf(bdata.material[face].vy) > HUMAN_MAPCOLLISION_SLOPEANGLE ){
 							flag = true;
 						}
 					}
@@ -1538,7 +1539,7 @@
 	FallFlag = false;
 	for(int i=0; i<3; i++){
 		int cnt = 0;
-		float ang = atan2(move_z, move_x);
+		float ang = atan2f(move_z, move_x);
 		float x, y, z;
 
 		//落下
@@ -1550,32 +1551,32 @@
 			y = pos_y + HUMAN_MAPCOLLISION_GROUND_HEIGHT;
 
 			//4方向判定 No.1
-			x = pos_x + cos(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
-			z = pos_z + sin(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
+			x = pos_x + cosf(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
+			z = pos_z + sinf(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
 			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
-			x = pos_x - cos(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
-			z = pos_z - sin(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
+			x = pos_x - cosf(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
+			z = pos_z - sinf(ang)*HUMAN_MAPCOLLISION_GROUND_R1;
 			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
-			x = pos_x + cos(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
-			z = pos_z + sin(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
+			x = pos_x + cosf(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
+			z = pos_z + sinf(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
 			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
-			x = pos_x + cos(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
-			z = pos_z + sin(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
+			x = pos_x + cosf(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
+			z = pos_z + sinf(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R1;
 			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
 			if( cnt == 4 ){ FallFlag = true; break; }
 
 			//4方向判定 No.2
-			x = pos_x + cos(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
-			z = pos_z + sin(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
+			x = pos_x + cosf(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
+			z = pos_z + sinf(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
 			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
-			x = pos_x - cos(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
-			z = pos_z - sin(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
+			x = pos_x - cosf(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
+			z = pos_z - sinf(ang)*HUMAN_MAPCOLLISION_GROUND_R2;
 			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
-			x = pos_x + cos(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
-			z = pos_z + sin(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
+			x = pos_x + cosf(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
+			z = pos_z + sinf(ang + (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
 			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
-			x = pos_x + cos(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
-			z = pos_z + sin(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
+			x = pos_x + cosf(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
+			z = pos_z + sinf(ang - (float)M_PI/2)*HUMAN_MAPCOLLISION_GROUND_R2;
 			if( CollD->CheckALLBlockInside(x, y, z) == true ){ cnt += 1; }
 			if( cnt == 4 ){ FallFlag = true; break; }
 		}
@@ -1588,8 +1589,8 @@
 			if( CollD->CheckALLBlockInside(x, y, z) == true ){ FallFlag = true; break; }
 
 			//外側へ少し外して判定
-			x = pos_x + cos(ang)*HUMAN_MAPCOLLISION_GROUND_R3;
-			z = pos_z + sin(ang)*HUMAN_MAPCOLLISION_GROUND_R3;
+			x = pos_x + cosf(ang)*HUMAN_MAPCOLLISION_GROUND_R3;
+			z = pos_z + sinf(ang)*HUMAN_MAPCOLLISION_GROUND_R3;
 			if( CollD->CheckALLBlockInside(x, y, z) == true ){ FallFlag = true; break; }
 		}
 
@@ -1633,7 +1634,7 @@
 				inblockdata->Getdata(&bdata, id);
 
 				//斜面に立っているならば、斜面を滑らせる処理
-				if( acos(bdata.material[face].vy) > HUMAN_MAPCOLLISION_SLOPEANGLE ){
+				if( acosf(bdata.material[face].vy) > HUMAN_MAPCOLLISION_SLOPEANGLE ){
 					move_x = bdata.material[face].vx * 1.2f;
 					move_y = bdata.material[face].vy * -0.5f;
 					move_z = bdata.material[face].vz * 1.2f;
@@ -1657,11 +1658,11 @@
 	dist_y = pos_y - pos_y2;
 	dist_z = pos_z - pos_z2;
 
-	Dist = sqrt(dist_x*dist_x + dist_z*dist_z);
-	speed = sqrt((move_x*2)*(move_x*2) + (move_z*2)*(move_z*2));
+	Dist = sqrtf(dist_x*dist_x + dist_z*dist_z);
+	speed = sqrtf((move_x*2)*(move_x*2) + (move_z*2)*(move_z*2));
 
 	//明らかに移動量がおかしいならば元に戻す
-	if( (sqrt(dist_x*dist_x + dist_y*dist_y + dist_z*dist_z) > HUMAN_MAPCOLLISION_CHECK_MAXDIST)||(Dist - speed > 1.0f) ){
+	if( (sqrtf(dist_x*dist_x + dist_y*dist_y + dist_z*dist_z) > HUMAN_MAPCOLLISION_CHECK_MAXDIST)||(Dist - speed > 1.0f) ){
 		pos_x = pos_x2;
 		pos_y = pos_y2;
 		pos_z = pos_z2;
@@ -1668,7 +1669,7 @@
 	}
 
 	if( player == true ){
-		speed = sqrt(dist_x*dist_x + dist_y*dist_y + dist_z*dist_z);
+		speed = sqrtf(dist_x*dist_x + dist_y*dist_y + dist_z*dist_z);
 
 		//移動先との間にブロックがあるならば元に戻す
 		if(
@@ -1910,9 +1911,9 @@
 
 	//腕を描画
 	if( rotation_y != 0.0f ){		//死亡して倒れている or 倒れ始めた
-		float x = pos_x + cos(rotation_x*-1 - (float)M_PI/2)*sin(rotation_y)*16.0f;
-		float y = pos_y + cos(rotation_y)*16.0f;
-		float z = pos_z + sin(rotation_x*-1 - (float)M_PI/2)*sin(rotation_y)*16.0f;
+		float x = pos_x + cosf(rotation_x*-1 - (float)M_PI/2)*sinf(rotation_y)*16.0f;
+		float y = pos_y + cosf(rotation_y)*16.0f;
+		float z = pos_z + sinf(rotation_x*-1 - (float)M_PI/2)*sinf(rotation_y)*16.0f;
 		d3dg->SetWorldTransform(x, y, z, rotation_x + (float)M_PI, armrotation_y + rotation_y, armmodel_size);
 		d3dg->RenderModel(armmodel, id_texture, DarkModelFlag, NoModel);
 	}
@@ -2043,12 +2044,12 @@
 void weapon::Dropoff(float x, float y, float z, float rx, float speed)
 {
 	//描画する座標と角度を設定
-	move_x = cos(rx*-1 + (float)M_PI/2) * speed;
+	move_x = cosf(rx*-1 + (float)M_PI/2) * speed;
 	move_y = 0.0f;
-	move_z = sin(rx*-1 + (float)M_PI/2) * speed;
-	pos_x = x + cos(rx*-1 + (float)M_PI/2) * 5.0f;
+	move_z = sinf(rx*-1 + (float)M_PI/2) * speed;
+	pos_x = x + cosf(rx*-1 + (float)M_PI/2) * 5.0f;
 	pos_y = y + 16.0f + move_y;
-	pos_z = z + sin(rx*-1 + (float)M_PI/2) * 5.0f;
+	pos_z = z + sinf(rx*-1 + (float)M_PI/2) * 5.0f;
 	rotation_x = rx + (float)M_PI;
 
 	//未使用（未装備）に設定し、座標移動を有効に
@@ -2206,7 +2207,7 @@
 		}
 
 		//水平の移動速度を求める
-		maxDist = sqrt(move_x*move_x + move_z*move_z);
+		maxDist = sqrtf(move_x*move_x + move_z*move_z);
 		if( maxDist < 0.1f ){
 			maxDist = 0.0f;
 			move_x = 0.0f;
@@ -2467,9 +2468,9 @@
 	cnt = jump - jump_cnt;
 
 	//姿勢から座標・角度を計算
-	pos_x += cos(jump_rx) * move_rx;
+	pos_x += cosf(jump_rx) * move_rx;
 	pos_y += jump_cnt * 0.1f;
-	pos_z += sin(jump_rx) * move_rx;
+	pos_z += sinf(jump_rx) * move_rx;
 	rotation_x += add_rx;
 	rotation_y += add_ry;
 
@@ -2507,6 +2508,15 @@
 	id_model = modelid;
 	id_texture = textureid;
 	EnableFlag = false;
+
+	rotation_y = 0.0f;
+	attacks = 0;
+	penetration = 0;
+	speed = 0;
+	teamid = 0;
+	humanid = 0;
+	ontargetcnt = 0;
+	cnt = 0;
 }
 
 //! @brief ディストラクタ
@@ -2595,9 +2605,9 @@
 	}
 
 	//移動処理
-	pos_x += cos(rotation_x)*cos(rotation_y)*speed;
-	pos_y += sin(rotation_y)*speed;
-	pos_z += sin(rotation_x)*cos(rotation_y)*speed;
+	pos_x += cosf(rotation_x)*cosf(rotation_y)*speed;
+	pos_y += sinf(rotation_y)*speed;
+	pos_z += sinf(rotation_x)*cosf(rotation_y)*speed;
 	cnt += 1;
 
 	return 0;
@@ -2632,6 +2642,10 @@
 			model_size = ParamData.size;
 		}
 	}
+
+	move_x = 0.0f;
+	move_y = 0.0f;
+	move_z = 0.0f;
 }
 
 //! @brief ディストラクタ
@@ -2647,9 +2661,9 @@
 //! @attention 先に SetPosData() を実行してください。
 void grenade::SetParamData(float speed, int _teamid, int _humanid, float _ontargetcnt, bool init)
 {
-	move_x = cos(rotation_x) * cos(rotation_y) * speed;
-	move_y = sin(rotation_y) * speed;
-	move_z = sin(rotation_x) * cos(rotation_y) * speed;
+	move_x = cosf(rotation_x) * cosf(rotation_y) * speed;
+	move_y = sinf(rotation_y) * speed;
+	move_z = sinf(rotation_x) * cosf(rotation_y) * speed;
 	teamid = _teamid;
 	humanid = _humanid;
 	ontargetcnt = _ontargetcnt;
@@ -2676,7 +2690,7 @@
 //! @return 速度
 float grenade::GetSpeed()
 {
-	return sqrt(move_x*move_x + move_y*move_y + move_z*move_z);
+	return sqrtf(move_x*move_x + move_y*move_y + move_z*move_z);
 }
 
 //! @brief 計算を実行（手榴弾の進行・爆発）
@@ -2700,7 +2714,7 @@
 
 	int id, face;
 	float Dist;
-	float maxDist = sqrt(move_x*move_x + move_y*move_y + move_z*move_z);
+	float maxDist = sqrtf(move_x*move_x + move_y*move_y + move_z*move_z);
 
 	//マップに対して当たり判定を実行
 	if( CollD->CheckALLBlockIntersectRay(pos_x, pos_y, pos_z, move_x/maxDist, move_y/maxDist, move_z/maxDist, &id, &face, &Dist, maxDist) == true ){

--- trunk/objectmanager.cpp	(revision 291)
+++ trunk/objectmanager.cpp	(revision 292)
@@ -582,8 +582,8 @@
 	vz = data.material[face].vz;
 
 	//角度を求める
-	rx = atan2(vz, vx)*-1 + (float)M_PI;
-	ry = atan2(vy, sqrt(vx*vx + vz*vz))*-1;
+	rx = atan2f(vz, vx)*-1 + (float)M_PI;
+	ry = atan2f(vy, sqrtf(vx*vx + vz*vz))*-1;
 
 	//エフェクト作成
 	for(int i=0; i<MAX_EFFECT; i++){
@@ -622,7 +622,7 @@
 		if( flowing == true ){
 			for(int i=0; i<(damage/10); i++){
 				float rx = DegreeToRadian(10)*GetRand(36);
-				AddEffect(x + cos(rx)*1.0f, y + (float)(GetRand(20)-10)/10, z + sin(rx)*1.0f, cos(rx)*0.5f, GetRand(5)*0.1f + 0.5f, sin(rx)*0.5f, -0.09f, DegreeToRadian(10)*GetRand(36), 0.0f, GetRand(40)*0.1f+0.1f, 0.1f, Resource->GetEffectBloodTexture(), 10, 0, 1.0f, 0.0f, addtype, (int)(GAMEFPS * 0.5f));
+				AddEffect(x + cosf(rx)*1.0f, y + (float)(GetRand(20)-10)/10, z + sinf(rx)*1.0f, cosf(rx)*0.5f, GetRand(5)*0.1f + 0.5f, sinf(rx)*0.5f, -0.09f, DegreeToRadian(10)*GetRand(36), 0.0f, GetRand(40)*0.1f+0.1f, 0.1f, Resource->GetEffectBloodTexture(), 10, 0, 1.0f, 0.0f, addtype, (int)(GAMEFPS * 0.5f));
 			}
 		}
 	}
@@ -693,9 +693,9 @@
 	//弾丸の座標を取得し、ベクトルを算出。
 	in_bullet->GetPosData(&bx, &by, &bz, &brx, &bry);
 	in_bullet->GetParamData(&attacks, &penetration, &speed, &teamid, &humanid, &ontargetcnt);
-	vx = cos(brx)*cos(bry);
-	vy = sin(bry);
-	vz = sin(brx)*cos(bry);
+	vx = cosf(brx)*cosf(bry);
+	vy = sinf(bry);
+	vz = sinf(brx)*cosf(bry);
 
 	//マップとの当たり判定（弾道上にブロックがあるか）
 	if( CollD->CheckALLBlockIntersectRay(bx, by, bz, vx, vy, vz, NULL, NULL, &Dist, (float)speed) == true ){
@@ -1051,7 +1051,7 @@
 		x = hx - gx;
 		y = hy - gy;
 		z = hz - gz;
-		r = sqrt(x*x + y*y + z*z);
+		r = sqrtf(x*x + y*y + z*z);
 
 		//100.0より遠ければ計算しない
 		if( r > MAX_DAMAGE_GRENADE_DISTANCE + HUMAN_HEIGHT ){ continue; }
@@ -1062,7 +1062,7 @@
 
 		//足元に当たり判定
 		y = hy + 2.0f - gy;
-		r = sqrt(x*x + y*y + z*z);
+		r = sqrtf(x*x + y*y + z*z);
 		//ブロックが遮っていなければ　（レイで当たり判定を行い、当たっていなければ）
 		if( CollD->CheckALLBlockIntersectRay(gx, gy, gz, x/r, y/r, z/r, NULL, NULL, &dummy, r) == false ){
 			//ダメージ量を計算
@@ -1074,7 +1074,7 @@
 
 		//頭に当たり判定
 		y = hy + (HUMAN_HEIGHT-2.0f) - gy;
-		r = sqrt(x*x + y*y + z*z);
+		r = sqrtf(x*x + y*y + z*z);
 		//ブロックが遮っていなければ　（レイで当たり判定を行い、当たっていなければ）
 		if( CollD->CheckALLBlockIntersectRay(gx, gy, gz, x/r, y/r, z/r, NULL, NULL, &dummy, r) == false ){
 			//ダメージ量を計算
@@ -1112,11 +1112,11 @@
 			z = gz - hz;
 
 			//角度を求める
-			arx = atan2(z, x);
+			arx = atan2f(z, x);
 
-			if( sin(atan2(y, sqrt(x*x + z*z))) < 0.0f ){		//上方向に飛ぶなら、角度を計算
+			if( sinf(atan2f(y, sqrtf(x*x + z*z))) < 0.0f ){		//上方向に飛ぶなら、角度を計算
 				y2 = gy - (hy + HUMAN_HEIGHT);
-				ary = atan2(y2, sqrt(x*x + z*z)) + (float)M_PI;
+				ary = atan2f(y2, sqrtf(x*x + z*z)) + (float)M_PI;
 			}
 			else{		//下方向に飛ぶなら、垂直角度は無効。（爆風で地面にめり込むのを防止）
 				ary = 0.0f;
@@ -1140,7 +1140,7 @@
 #endif
 
 			//爆風による風圧
-			HumanIndex[i].AddPosOrder(arx, ary, 2.2f/MAX_DAMAGE_GRENADE_DISTANCE * (MAX_DAMAGE_GRENADE_DISTANCE - sqrt(x*x + y*y + z*z)));
+			HumanIndex[i].AddPosOrder(arx, ary, 2.2f/MAX_DAMAGE_GRENADE_DISTANCE * (MAX_DAMAGE_GRENADE_DISTANCE - sqrtf(x*x + y*y + z*z)));
 
 			//ログ関係の処理
 			if( (hp_old > 0)&&(HumanIndex[i].GetHP() <= 0) ){
@@ -1169,7 +1169,7 @@
 		x = sx - gx;
 		y = sy - gy;
 		z = sz - gz;
-		r = sqrt(x*x + y*y + z*z);
+		r = sqrtf(x*x + y*y + z*z);
 
 		//100.0より遠ければ計算しない
 		if( r > MAX_DAMAGE_GRENADE_DISTANCE ){ continue; }
@@ -1247,8 +1247,8 @@
 		hry = in_human->GetDeadRy();
 
 		//腰辺りの座標を算出
-		hx += cos(hrx*-1 - (float)M_PI/2) * sin(hry) * HUMAN_HEIGHT/2;
-		hz += sin(hrx*-1 - (float)M_PI/2) * sin(hry) * HUMAN_HEIGHT/2;
+		hx += cosf(hrx*-1 - (float)M_PI/2) * sinf(hry) * HUMAN_HEIGHT/2;
+		hz += sinf(hrx*-1 - (float)M_PI/2) * sinf(hry) * HUMAN_HEIGHT/2;
 
 		//エフェクト（煙）の描画
 		float rnd = DegreeToRadian(10)*GetRand(18);
@@ -1288,7 +1288,7 @@
 	if( (move_x == 0.0f)&&(move_y == 0.0f)&&(move_z == 0.0f) ){ return false; }
 
 	//ベクトルを求める
-	dist = sqrt(move_x*move_x + move_y*move_y + move_z*move_z);
+	dist = sqrtf(move_x*move_x + move_y*move_y + move_z*move_z);
 	vx = move_x / dist;
 	vy = move_y / dist;
 	vz = move_z / dist;
@@ -1976,8 +1976,8 @@
 				int len;
 				float a = DegreeToRadian(10) * GetRand(36);
 				len = GetRand(5)*2+5;
-				rx2 = rx + cos(a)*len * DegreeToRadian(0.15f);
-				ry2 = ry + sin(a)*len * DegreeToRadian(0.15f);
+				rx2 = rx + cosf(a)*len * DegreeToRadian(0.15f);
+				ry2 = ry + sinf(a)*len * DegreeToRadian(0.15f);
 			}
 			else{
 				//そのまま攻撃力と命中時のカウント数を反映
@@ -2062,14 +2062,14 @@
 
 	//煙の移動ベクトルを決定
 	rx = rotation_x*-1 + (float)M_PI/2;
-	emx = cos(rx)*cos(armrotation_y);
-	emy = sin(armrotation_y);
-	emz = sin(rx)*cos(armrotation_y);
+	emx = cosf(rx)*cosf(armrotation_y);
+	emy = sinf(armrotation_y);
+	emz = sinf(rx)*cosf(armrotation_y);
 
 	//薬莢の移動量を決定
-	mx = cos(rx - (float)M_PI/2) * ParamData.yakkyou_sx * 0.12f;
+	mx = cosf(rx - (float)M_PI/2) * ParamData.yakkyou_sx * 0.12f;
 	my = (ParamData.yakkyou_sy + (GetRand(3)-1)) * 0.12f;
-	mz = sin(rx - (float)M_PI/2) * ParamData.yakkyou_sx * 0.12f;
+	mz = sinf(rx - (float)M_PI/2) * ParamData.yakkyou_sx * 0.12f;
 
 	//行列でエフェクト座標を計算
 	d3dg->SetWorldTransformHumanWeapon(pos_x, pos_y + 16.0f, pos_z, ParamData.flashx/10, ParamData.flashy/10, ParamData.flashz/10, rotation_x, armrotation_y*-1, 1.0f);
@@ -2350,9 +2350,9 @@
 	if( mteam == tteam ){ return false; }
 
 	//攻撃ポイント（腕の先端）を求める
-	AttackPoint_x = mx + cos(mrx*-1 + (float)M_PI/2) * 2.0f;
+	AttackPoint_x = mx + cosf(mrx*-1 + (float)M_PI/2) * 2.0f;
 	AttackPoint_y = my + VIEW_HEIGHT - 0.5f;
-	AttackPoint_z = mz + sin(mrx*-1 + (float)M_PI/2) * 2.0f;
+	AttackPoint_z = mz + sinf(mrx*-1 + (float)M_PI/2) * 2.0f;
 	ax = AttackPoint_x - tx;
 	az = AttackPoint_z - tz;
 
@@ -2396,7 +2396,7 @@
 	ty += VIEW_HEIGHT;
 
 	//敵が攻撃を受けた角度を求める
-	arx = atan2(mz - tz, mx - tx);
+	arx = atan2f(mz - tz, mx - tx);
 
 	//ロボットかどうか判定
 	EnemyHuman->GetParamData(&paramid, NULL, NULL, NULL);
@@ -2571,7 +2571,7 @@
 						*color = d3dg->GetColorCode(1.0f,0.0f,0.0f,1.0f);
 						sprintf(infostr, "Human[%d]  HP %d : Enemy", i, HumanIndex[i].GetHP());
 					}
-					dist = sqrt(r);
+					dist = sqrtf(r);
 				}
 			}
 		}
@@ -2591,7 +2591,7 @@
 				if( (fabs(rx) < DegreeToRadian(10))&&(fabs(ry) < DegreeToRadian(10)) ){
 					*color = d3dg->GetColorCode(0.0f,1.0f,0.0f,1.0f);
 					sprintf(infostr, "Weapon[%d]  %d:%d", i, lnbs, (nbs - lnbs));
-					dist = sqrt(r);
+					dist = sqrtf(r);
 				}
 			}
 		}
@@ -2608,7 +2608,7 @@
 				if( (fabs(rx) < DegreeToRadian(10))&&(fabs(ry) < DegreeToRadian(10)) ){
 					*color = d3dg->GetColorCode(1.0f,1.0f,0.0f,1.0f);
 					sprintf(infostr, "SmallObject[%d]  HP %d", i, SmallObjectIndex[i].GetHP());
-					dist = sqrt(r);
+					dist = sqrtf(r);
 				}
 			}
 		}
@@ -2713,9 +2713,9 @@
 				//弾の座標と角度を取得
 				BulletIndex[i].GetParamData(NULL, NULL, &speed, &teamid, NULL, NULL);
 				BulletIndex[i].GetPosData(&bx, &by, &bz, &brx, &bry);
-				mx = cos(brx)*cos(bry)*speed;
-				my = sin(bry)*speed;
-				mz = sin(brx)*cos(bry)*speed;
+				mx = cosf(brx)*cosf(bry)*speed;
+				my = sinf(bry)*speed;
+				mz = sinf(brx)*cosf(bry)*speed;
 				GameSound->PassingBullet(bx, by, bz, mx, my, mz, teamid);
 			}
 		}

--- trunk/sound-directsound.cpp	(revision 291)
+++ trunk/sound-directsound.cpp	(revision 292)
@@ -133,7 +133,7 @@
 void SoundControl::SetCamera(float x, float y, float z, float rx)
 {
 	p3DListener->SetPosition(x, y, z, DS3D_IMMEDIATE);
-	p3DListener->SetOrientation(cos(rx), 0.0f, sin(rx), 0.0f, 1.0f, 0.0f, DS3D_IMMEDIATE);
+	p3DListener->SetOrientation(cosf(rx), 0.0f, sinf(rx), 0.0f, 1.0f, 0.0f, DS3D_IMMEDIATE);
 }
 
 //! @brief サウンドを読み込む
@@ -594,7 +594,7 @@
 		return false;
 	}
 
-	*out_dist = sqrt(dist);
+	*out_dist = sqrtf(dist);
 	return true;
 }
 

--- trunk/sound-ezds.cpp	(revision 291)
+++ trunk/sound-ezds.cpp	(revision 292)
@@ -247,7 +247,7 @@
 	//左右のパン（再生バランス）の決定
 	float vx = x - camera_x;
 	float vz = z - camera_z;
-	float rx = (atan2(vz, vx) - camera_rx) * -1;
+	float rx = (atan2f(vz, vx) - camera_rx) * -1;
 	for(; rx > (float)M_PI; rx -= (float)M_PI*2){}
 	for(; rx < (float)M_PI*-1; rx += (float)M_PI*2){}
 	pan = (int)((float)10 / M_PI * rx);
@@ -319,7 +319,7 @@
 		return false;
 	}
 
-	*out_dist = sqrt(dist);
+	*out_dist = sqrtf(dist);
 	return true;
 }
 

--- trunk/soundmanager.cpp	(revision 291)
+++ trunk/soundmanager.cpp	(revision 292)
@@ -523,13 +523,13 @@
 		float min_dist, dist;
 
 		//移動速度を求める
-		speed = (float)sqrt(plist->move_x*plist->move_x + plist->move_y*plist->move_y + plist->move_z*plist->move_z);
+		speed = (float)sqrtf(plist->move_x*plist->move_x + plist->move_y*plist->move_y + plist->move_z*plist->move_z);
 
 		//最短距離の座標を求める
 		min_dist = DistancePosRay(camera_x, camera_y, camera_z, plist->x, plist->y, plist->z, plist->move_x/speed, plist->move_y/speed, plist->move_z/speed);
 
 		//最短距離時の座標を求める
-		dist = (float)sqrt(dist2 - min_dist*min_dist);
+		dist = (float)sqrtf(dist2 - min_dist*min_dist);
 		*min_x = plist->x + plist->move_x/speed * dist;
 		*min_y = plist->y + plist->move_y/speed * dist;
 		*min_z = plist->z + plist->move_z/speed * dist;

--- trunk/window.cpp	(revision 291)
+++ trunk/window.cpp	(revision 292)
@@ -356,7 +356,7 @@
 //! @return 値
 float Round(float r)
 {
-	return (r > 0.0f) ? floor(r + 0.5f) : ceil(r - 0.5f);
+	return (r > 0.0f) ? floorf(r + 0.5f) : ceilf(r - 0.5f);
 }
 
 #ifdef ENABLE_PATH_DELIMITER_SLASH