• R/O
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


Commit MetaInfo

Revision326 (tree)
Time2022-08-30 02:07:52
Authorxops-mikan

Log Message

韓国語設定におけるメニューのライセンス表示を改善、コンパイラの警告対策

Change Summary

Incremental Difference

--- trunk/d3dgraphics-directx.cpp (revision 325)
+++ trunk/d3dgraphics-directx.cpp (revision 326)
@@ -1996,7 +1996,7 @@
19961996 if( str == NULL ){ return; }
19971997 if( limitlen <= 0 ){ return; }
19981998
1999- if( strlen(str) <= limitlen ){ return; }
1999+ if( (int)strlen(str) <= limitlen ){ return; }
20002000
20012001 float percent = (float)limitlen / strlen(str);
20022002
--- trunk/d3dgraphics-opengl.cpp (revision 325)
+++ trunk/d3dgraphics-opengl.cpp (revision 326)
@@ -2695,7 +2695,7 @@
26952695 if( str == NULL ){ return; }
26962696 if( limitlen <= 0 ){ return; }
26972697
2698- if( strlen(str) <= limitlen ){ return; }
2698+ if( (int)strlen(str) <= limitlen ){ return; }
26992699
27002700 float percent = (float)limitlen / strlen(str);
27012701
--- trunk/gamemain.cpp (revision 325)
+++ trunk/gamemain.cpp (revision 326)
@@ -1089,7 +1089,14 @@
10891089 Options_p3LinkTextData[0].text_cursorcolor = d3dg->GetColorCode(0.0f,1.0f,1.0f,1.0f);
10901090 strcpy(Options_p3LinkTextData[0].text, "< EXIT >");
10911091
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);
10931100 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),
10941101 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));
10951102
--- trunk/objectmanager.cpp (revision 325)
+++ trunk/objectmanager.cpp (revision 326)
@@ -829,11 +829,11 @@
829829 //当たり判定
830830 if( CollideSphereInside(ox, oy, oz, decide, bvx, bvy, bvz) == true ){
831831 //小物に当たった処理
832- int attack2 = (int)(floor( (float)attacks * 0.25f ));
832+ int attack2 = (int)(floorf( (float)attacks * 0.25f ));
833833 HitBulletSmallObject(i, bvx, bvy, bvz, attack2, teamid);
834834
835835 //攻撃力を計算
836- attacks = (int)(floor( (float)attacks * 0.7f ));
836+ attacks = (int)(floorf( (float)attacks * 0.7f ));
837837
838838 CollideFlag = true;
839839 }
--- trunk/sound-ezds.cpp (revision 325)
+++ trunk/sound-ezds.cpp (revision 326)
@@ -233,7 +233,7 @@
233233 //サウンドを再生
234234 if( DSplay == NULL ){ return 0; }
235235 //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);
237237 return DSplay(id, volume2, pan);
238238 }
239239