X operations(XOPS)に非常に近いFPSゲームを制作・リメイクし、成果物をオープンソースとして公開することを目的としたプロジェクトです。
| Revision | 326 (tree) |
|---|---|
| Time | 2022-08-30 02:07:52 |
| Author | |
韓国語設定におけるメニューのライセンス表示を改善、コンパイラの警告対策
| @@ -1996,7 +1996,7 @@ | ||
| 1996 | 1996 | if( str == NULL ){ return; } |
| 1997 | 1997 | if( limitlen <= 0 ){ return; } |
| 1998 | 1998 | |
| 1999 | - if( strlen(str) <= limitlen ){ return; } | |
| 1999 | + if( (int)strlen(str) <= limitlen ){ return; } | |
| 2000 | 2000 | |
| 2001 | 2001 | float percent = (float)limitlen / strlen(str); |
| 2002 | 2002 |
| @@ -2695,7 +2695,7 @@ | ||
| 2695 | 2695 | if( str == NULL ){ return; } |
| 2696 | 2696 | if( limitlen <= 0 ){ return; } |
| 2697 | 2697 | |
| 2698 | - if( strlen(str) <= limitlen ){ return; } | |
| 2698 | + if( (int)strlen(str) <= limitlen ){ return; } | |
| 2699 | 2699 | |
| 2700 | 2700 | float percent = (float)limitlen / strlen(str); |
| 2701 | 2701 |
| @@ -1089,7 +1089,14 @@ | ||
| 1089 | 1089 | Options_p3LinkTextData[0].text_cursorcolor = d3dg->GetColorCode(0.0f,1.0f,1.0f,1.0f); |
| 1090 | 1090 | strcpy(Options_p3LinkTextData[0].text, "< EXIT >"); |
| 1091 | 1091 | |
| 1092 | - scrollbar_license.Create(OPTIONS_P3_X + OPTIONS_P3_W - 20, OPTIONS_P3_Y+55, 20, 18*12, OPTIONS_LICENSELINE, 18, 0); | |
| 1092 | + int maxline = 18; | |
| 1093 | + | |
| 1094 | + //韓国語であれば表示行数を減らす | |
| 1095 | + if( GameConfig.GetLanguage() == 1 ){ | |
| 1096 | + maxline = 14; | |
| 1097 | + } | |
| 1098 | + | |
| 1099 | + scrollbar_license.Create(OPTIONS_P3_X + OPTIONS_P3_W - 20, OPTIONS_P3_Y+55, 20, 18*12, OPTIONS_LICENSELINE, maxline, 0); | |
| 1093 | 1100 | scrollbar_license.SetColor(d3dg->GetColorCode(0.5f,0.5f,0.5f,0.5f), d3dg->GetColorCode(0.6f,0.6f,0.25f,1.0f), d3dg->GetColorCode(0.8f,0.8f,0.25f,1.0f), |
| 1094 | 1101 | d3dg->GetColorCode(0.4f,0.67f,0.57f,1.0f), d3dg->GetColorCode(0.38f,0.77f,0.64f,1.0f), d3dg->GetColorCode(0.6f,0.3f,0.25f,1.0f), d3dg->GetColorCode(0.8f,0.3f,0.25f,1.0f)); |
| 1095 | 1102 |
| @@ -829,11 +829,11 @@ | ||
| 829 | 829 | //当たり判定 |
| 830 | 830 | if( CollideSphereInside(ox, oy, oz, decide, bvx, bvy, bvz) == true ){ |
| 831 | 831 | //小物に当たった処理 |
| 832 | - int attack2 = (int)(floor( (float)attacks * 0.25f )); | |
| 832 | + int attack2 = (int)(floorf( (float)attacks * 0.25f )); | |
| 833 | 833 | HitBulletSmallObject(i, bvx, bvy, bvz, attack2, teamid); |
| 834 | 834 | |
| 835 | 835 | //攻撃力を計算 |
| 836 | - attacks = (int)(floor( (float)attacks * 0.7f )); | |
| 836 | + attacks = (int)(floorf( (float)attacks * 0.7f )); | |
| 837 | 837 | |
| 838 | 838 | CollideFlag = true; |
| 839 | 839 | } |
| @@ -233,7 +233,7 @@ | ||
| 233 | 233 | //サウンドを再生 |
| 234 | 234 | if( DSplay == NULL ){ return 0; } |
| 235 | 235 | //return DSplay(id, volume, pan); |
| 236 | - int volume2 = 1.0f/200 * (volume + 100) * (volume_max + 100) - 100; | |
| 236 | + int volume2 = (int)(1.0f/200 * (volume + 100) * (volume_max + 100) - 100); | |
| 237 | 237 | return DSplay(id, volume2, pan); |
| 238 | 238 | } |
| 239 | 239 |