• 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

Revision237 (tree)
Time2020-04-05 03:10:08
Authorxops-mikan

Log Message

連射モード切替時にカウントを設定できるように(デフォルト"0")、不要な処理を削除、コメント修正

Change Summary

Incremental Difference

--- trunk/ai.cpp (revision 236)
+++ trunk/ai.cpp (revision 237)
@@ -1095,12 +1095,12 @@
10951095 }
10961096
10971097 //連射切り替えが可能な武器なら
1098- if( paramdata.ChangeWeapon != -1 ){
1098+ if( paramdata.ChangeWeaponID != -1 ){
10991099 //現在の武器の連射設定を取得
11001100 blazingmodeS = paramdata.blazingmode;
11011101
11021102 //新たな武器の連射設定を取得
1103- if( Param->GetWeapon(paramdata.ChangeWeapon, &paramdata) == 1 ){ return 0; }
1103+ if( Param->GetWeapon(paramdata.ChangeWeaponID, &paramdata) == 1 ){ return 0; }
11041104 blazingmodeN = paramdata.blazingmode;
11051105
11061106 if( longattack == false ){
--- trunk/gamemain.cpp (revision 236)
+++ trunk/gamemain.cpp (revision 237)
@@ -2406,12 +2406,6 @@
24062406
24072407 time = GetTimeMS();
24082408
2409- //武器の持ち方を取得
2410- int weaponid;
2411- WeaponParameter data;
2412- weaponid = myHuman->GetMainWeaponTypeNO();
2413- GameParamInfo.GetWeapon(weaponid, &data);
2414-
24152409 //オブジェクトマネージャーを実行
24162410 int cmdF5id;
24172411 if( Cmd_F5 == true ){
@@ -2765,7 +2759,7 @@
27652759 }
27662760 }
27672761 reloadcnt = myHuman->GetWeaponReloadCnt();
2768- selectweaponcnt = myHuman->GetChangeWeaponCnt();
2762+ selectweaponcnt = myHuman->GetChangeWeaponCnt() + myHuman->GetChangeWeaponIDCnt();
27692763 GameParamInfo.GetWeapon(weapon_paramid[selectweapon], &weapon_paramdata);
27702764 strcpy(weaponname, weapon_paramdata.name);
27712765 hp = myHuman->GetHP();
--- trunk/object.cpp (revision 236)
+++ trunk/object.cpp (revision 237)
@@ -189,6 +189,7 @@
189189 selectweaponcnt = 0;
190190 weaponshotcnt = 0;
191191 weaponreloadcnt = 0;
192+ changeweaponidcnt = 0;
192193 //if( Param->GetHuman(id_param, &data) == 0 ){
193194 // hp = data.hp;
194195 //}
@@ -260,6 +261,7 @@
260261 selectweaponcnt = 0;
261262 weaponshotcnt = 0;
262263 weaponreloadcnt = 0;
264+ changeweaponidcnt = 0;
263265 if( Param->GetHuman(id_param, &data) == 0 ){
264266 hp = data.hp;
265267 }
@@ -440,6 +442,7 @@
440442
441443 //武器切り替え中なら失敗
442444 if( selectweaponcnt > 0 ){ return; }
445+ if( changeweaponidcnt > 0 ){ return; }
443446
444447 if( id == -1 ){
445448 //次の武器番号を選択
@@ -489,6 +492,13 @@
489492 return weaponreloadcnt;
490493 }
491494
495+//! @brief 武器の切り替えカウントを取得
496+//! @return カウント数 (1以上で切り替え中)
497+int human::GetChangeWeaponIDCnt()
498+{
499+ return changeweaponidcnt;
500+}
501+
492502 //! @brief 武器を取得
493503 //! @param out_selectweapon 選択されている武器 (0 〜 [TOTAL_HAVEWEAPON]-1)
494504 //! @param out_weapon 受け取るweaponクラスのポインタ配列 (配列数:TOTAL_HAVEWEAPON)
@@ -548,6 +558,7 @@
548558
549559 //武器切り替え中なら失敗
550560 if( selectweaponcnt > 0 ){ return false; }
561+ if( changeweaponidcnt > 0 ){ return false; }
551562
552563 //武器を装備していなければ、失敗
553564 if( weapon[selectweapon] == NULL ){ return false; }
@@ -642,6 +653,7 @@
642653 {
643654 //武器切り替え中なら失敗
644655 if( selectweaponcnt > 0 ){ return false; }
656+ if( changeweaponidcnt > 0 ){ return false; }
645657
646658 //何かしらの武器を装備していれば〜
647659 if( weapon[selectweapon] != NULL ){
@@ -682,6 +694,7 @@
682694 {
683695 //武器切り替え中なら失敗
684696 if( selectweaponcnt > 0 ){ return false; }
697+ if( changeweaponidcnt > 0 ){ return false; }
685698
686699 //何かしらの武器を装備していれば〜
687700 if( weapon[selectweapon] != NULL ){
@@ -713,6 +726,10 @@
713726 //! @attention ゲーム上から直接呼び出すことは避け、ObjectManagerクラスから呼び出してください。
714727 int human::ChangeShotMode()
715728 {
729+ //武器切り替え中なら失敗
730+ //if( selectweaponcnt > 0 ){ return 1; }
731+ if( changeweaponidcnt > 0 ){ return 1; }
732+
716733 //武器を装備してなければ失敗
717734 if( weapon[selectweapon] == NULL ){ return 1; }
718735
@@ -724,7 +741,7 @@
724741 WeaponParameter ParamData;
725742 int ChangeWeapon;
726743 if( Param->GetWeapon(param_id, &ParamData) != 0 ){ return 1; }
727- ChangeWeapon = ParamData.ChangeWeapon;
744+ ChangeWeapon = ParamData.ChangeWeaponID;
728745
729746 //新しい武器番号が正しいか確認
730747 if( ChangeWeapon == param_id ){ return 1; }
@@ -754,6 +771,9 @@
754771 //モーション実行
755772 MotionCtrl->ChangeShotMode(ChangeWeapon);
756773
774+ //切り替え完了のカウント
775+ changeweaponidcnt = ParamData.ChangeWeaponCnt;
776+
757777 return 0;
758778 }
759779
@@ -1675,6 +1695,9 @@
16751695 if( selectweaponcnt > 0 ){
16761696 selectweaponcnt -= 1;
16771697 }
1698+ if( changeweaponidcnt > 0 ){
1699+ changeweaponidcnt -= 1;
1700+ }
16781701
16791702 //連射カウントが残っていれば、1 減らす
16801703 if( weaponshotcnt > 0 ){
--- trunk/object.h (revision 236)
+++ trunk/object.h (revision 237)
@@ -147,6 +147,7 @@
147147 int selectweaponcnt; //!< 武器の切り替えカウント
148148 int weaponshotcnt; //!< 武器の連射カウント
149149 int weaponreloadcnt; //!< 武器のリロードカウント
150+ int changeweaponidcnt; //!< 武器のショットモード切り替えカウント
150151 int hp; //!< 体力
151152 int deadstate; //!< 死体になっているか
152153 float add_ry; //!< 死体の倒れる加速度
@@ -187,6 +188,7 @@
187188 virtual void ChangeWeapon(int id = -1);
188189 virtual int GetChangeWeaponCnt();
189190 virtual int GetWeaponReloadCnt();
191+ virtual int GetChangeWeaponIDCnt();
190192 virtual void GetWeapon(int *out_selectweapon, class weapon *out_weapon[], int nlnbs[], int nnbs[]);
191193 virtual int GetMainWeaponTypeNO();
192194 virtual bool GetWeaponBlazingmode();
@@ -254,7 +256,7 @@
254256 class smallobject : public object
255257 {
256258 protected:
257- class MIFInterface *MIFdata; //!< 設定値を管理するクラスへのポインタ
259+ class MIFInterface *MIFdata; //!< MIFを管理するクラスへのポインタ
258260 float rotation_y; //!< 回転角度
259261 signed char point_p4; //!< ポイントの認識番号
260262 int hp; //!< 体力
--- trunk/parameter.cpp (revision 236)
+++ trunk/parameter.cpp (revision 237)
@@ -483,7 +483,8 @@
483483 Weapon[0].soundvolume = 0;
484484 Weapon[0].silencer = false;
485485 Weapon[0].WeaponP = 2;
486- Weapon[0].ChangeWeapon = -1;
486+ Weapon[0].ChangeWeaponID = -1;
487+ Weapon[0].ChangeWeaponCnt = 0;
487488 Weapon[0].burst = 0;
488489 Weapon[1].name = "MP5";
489490 Weapon[1].model = "./data/model/weapon/mp5.x";
@@ -515,7 +516,8 @@
515516 Weapon[1].soundvolume = 92;
516517 Weapon[1].silencer = false;
517518 Weapon[1].WeaponP = 0;
518- Weapon[1].ChangeWeapon = -1;
519+ Weapon[1].ChangeWeaponID = -1;
520+ Weapon[1].ChangeWeaponCnt = 0;
519521 Weapon[1].burst = 1;
520522 Weapon[2].name = "PSG1";
521523 Weapon[2].model = "./data/model/weapon/psg1.x";
@@ -547,7 +549,8 @@
547549 Weapon[2].soundvolume = 98;
548550 Weapon[2].silencer = false;
549551 Weapon[2].WeaponP = 0;
550- Weapon[2].ChangeWeapon = -1;
552+ Weapon[2].ChangeWeaponID = -1;
553+ Weapon[2].ChangeWeaponCnt = 0;
551554 Weapon[2].burst = 1;
552555 Weapon[3].name = "M92F";
553556 Weapon[3].model = "./data/model/weapon/m92f.x";
@@ -579,7 +582,8 @@
579582 Weapon[3].soundvolume = 90;
580583 Weapon[3].silencer = false;
581584 Weapon[3].WeaponP = 1;
582- Weapon[3].ChangeWeapon = -1;
585+ Weapon[3].ChangeWeaponID = -1;
586+ Weapon[3].ChangeWeaponCnt = 0;
583587 Weapon[3].burst = 1;
584588 Weapon[4].name = "GLOCK18 SEMI";
585589 Weapon[4].model = "./data/model/weapon/glock18.x";
@@ -611,7 +615,8 @@
611615 Weapon[4].soundvolume = 90;
612616 Weapon[4].silencer = false;
613617 Weapon[4].WeaponP = 1;
614- Weapon[4].ChangeWeapon = 16;
618+ Weapon[4].ChangeWeaponID = 16;
619+ Weapon[4].ChangeWeaponCnt = 0;
615620 Weapon[4].burst = 1;
616621 Weapon[5].name = "DESERT EAGLE";
617622 Weapon[5].model = "./data/model/weapon/de.x";
@@ -643,7 +648,8 @@
643648 Weapon[5].soundvolume = 96;
644649 Weapon[5].silencer = false;
645650 Weapon[5].WeaponP = 1;
646- Weapon[5].ChangeWeapon = -1;
651+ Weapon[5].ChangeWeaponID = -1;
652+ Weapon[5].ChangeWeaponCnt = 0;
647653 Weapon[5].burst = 1;
648654 Weapon[6].name = "MAC10";
649655 Weapon[6].model = "./data/model/weapon/mac10.x";
@@ -675,7 +681,8 @@
675681 Weapon[6].soundvolume = 90;
676682 Weapon[6].silencer = false;
677683 Weapon[6].WeaponP = 1;
678- Weapon[6].ChangeWeapon = -1;
684+ Weapon[6].ChangeWeaponID = -1;
685+ Weapon[6].ChangeWeaponCnt = 0;
679686 Weapon[6].burst = 1;
680687 Weapon[7].name = "UMP";
681688 Weapon[7].model = "./data/model/weapon/ump.x";
@@ -707,7 +714,8 @@
707714 Weapon[7].soundvolume = 94;
708715 Weapon[7].silencer = false;
709716 Weapon[7].WeaponP = 0;
710- Weapon[7].ChangeWeapon = -1;
717+ Weapon[7].ChangeWeaponID = -1;
718+ Weapon[7].ChangeWeaponCnt = 0;
711719 Weapon[7].burst = 1;
712720 Weapon[8].name = "P90";
713721 Weapon[8].model = "./data/model/weapon/p90.x";
@@ -739,7 +747,8 @@
739747 Weapon[8].soundvolume = 92;
740748 Weapon[8].silencer = false;
741749 Weapon[8].WeaponP = 0;
742- Weapon[8].ChangeWeapon = -1;
750+ Weapon[8].ChangeWeaponID = -1;
751+ Weapon[8].ChangeWeaponCnt = 0;
743752 Weapon[8].burst = 1;
744753 Weapon[9].name = "M4";
745754 Weapon[9].model = "./data/model/weapon/m4.x";
@@ -771,7 +780,8 @@
771780 Weapon[9].soundvolume = 96;
772781 Weapon[9].silencer = false;
773782 Weapon[9].WeaponP = 0;
774- Weapon[9].ChangeWeapon = -1;
783+ Weapon[9].ChangeWeaponID = -1;
784+ Weapon[9].ChangeWeaponCnt = 0;
775785 Weapon[9].burst = 1;
776786 Weapon[10].name = "AK47";
777787 Weapon[10].model = "./data/model/weapon/ak47.x";
@@ -803,7 +813,8 @@
803813 Weapon[10].soundvolume = 96;
804814 Weapon[10].silencer = false;
805815 Weapon[10].WeaponP = 0;
806- Weapon[10].ChangeWeapon = -1;
816+ Weapon[10].ChangeWeaponID = -1;
817+ Weapon[10].ChangeWeaponCnt = 0;
807818 Weapon[10].burst = 1;
808819 Weapon[11].name = "AUG";
809820 Weapon[11].model = "./data/model/weapon/aug.x";
@@ -835,7 +846,8 @@
835846 Weapon[11].soundvolume = 98;
836847 Weapon[11].silencer = false;
837848 Weapon[11].WeaponP = 0;
838- Weapon[11].ChangeWeapon = -1;
849+ Weapon[11].ChangeWeaponID = -1;
850+ Weapon[11].ChangeWeaponCnt = 0;
839851 Weapon[11].burst = 1;
840852 Weapon[12].name = "M249";
841853 Weapon[12].model = "./data/model/weapon/m249.x";
@@ -867,7 +879,8 @@
867879 Weapon[12].soundvolume = 98;
868880 Weapon[12].silencer = false;
869881 Weapon[12].WeaponP = 0;
870- Weapon[12].ChangeWeapon = -1;
882+ Weapon[12].ChangeWeaponID = -1;
883+ Weapon[12].ChangeWeaponCnt = 0;
871884 Weapon[12].burst = 1;
872885 Weapon[13].name = "GRENADE"; // ID_WEAPON_GRENADE 定数を要設定
873886 Weapon[13].model = "./data/model/weapon/grenade.x";
@@ -899,7 +912,8 @@
899912 Weapon[13].soundvolume = 0;
900913 Weapon[13].silencer = false;
901914 Weapon[13].WeaponP = 1;
902- Weapon[13].ChangeWeapon = -1;
915+ Weapon[13].ChangeWeaponID = -1;
916+ Weapon[13].ChangeWeaponCnt = 0;
903917 Weapon[13].burst = 1;
904918 Weapon[14].name = "MP5SD";
905919 Weapon[14].model = "./data/model/weapon/mp5sd.x";
@@ -931,7 +945,8 @@
931945 Weapon[14].soundvolume = 84;
932946 Weapon[14].silencer = true;
933947 Weapon[14].WeaponP = 0;
934- Weapon[14].ChangeWeapon = -1;
948+ Weapon[14].ChangeWeaponID = -1;
949+ Weapon[14].ChangeWeaponCnt = 0;
935950 Weapon[14].burst = 1;
936951 Weapon[15].name = "CASE"; // ID_WEAPON_CASE 定数を要設定
937952 Weapon[15].model = "./data/model/weapon/case.x";
@@ -963,7 +978,8 @@
963978 Weapon[15].soundvolume = 0;
964979 Weapon[15].silencer = false;
965980 Weapon[15].WeaponP = 2;
966- Weapon[15].ChangeWeapon = -1;
981+ Weapon[15].ChangeWeaponID = -1;
982+ Weapon[15].ChangeWeaponCnt = 0;
967983 Weapon[15].burst = 1;
968984 Weapon[16].name = "GLOCK18 FULL";
969985 Weapon[16].model = "./data/model/weapon/glock18.x";
@@ -995,7 +1011,8 @@
9951011 Weapon[16].soundvolume = 90;
9961012 Weapon[16].silencer = false;
9971013 Weapon[16].WeaponP = 1;
998- Weapon[16].ChangeWeapon = 4;
1014+ Weapon[16].ChangeWeaponID = 4;
1015+ Weapon[16].ChangeWeaponCnt = 0;
9991016 Weapon[16].burst = 1;
10001017 Weapon[17].name = "M1911";
10011018 Weapon[17].model = "./data/model/weapon/cg.x";
@@ -1027,7 +1044,8 @@
10271044 Weapon[17].soundvolume = 94;
10281045 Weapon[17].silencer = false;
10291046 Weapon[17].WeaponP = 1;
1030- Weapon[17].ChangeWeapon = -1;
1047+ Weapon[17].ChangeWeaponID = -1;
1048+ Weapon[17].ChangeWeaponCnt = 0;
10311049 Weapon[17].burst = 1;
10321050 Weapon[18].name = "GLOCK17";
10331051 Weapon[18].model = "./data/model/weapon/glock18.x";
@@ -1059,7 +1077,8 @@
10591077 Weapon[18].soundvolume = 90;
10601078 Weapon[18].silencer = false;
10611079 Weapon[18].WeaponP = 1;
1062- Weapon[18].ChangeWeapon = -1;
1080+ Weapon[18].ChangeWeaponID = -1;
1081+ Weapon[18].ChangeWeaponCnt = 0;
10631082 Weapon[18].burst = 1;
10641083 Weapon[19].name = "M1";
10651084 Weapon[19].model = "./data/model/weapon/m1.x";
@@ -1091,7 +1110,8 @@
10911110 Weapon[19].soundvolume = 98;
10921111 Weapon[19].silencer = false;
10931112 Weapon[19].WeaponP = 0;
1094- Weapon[19].ChangeWeapon = -1;
1113+ Weapon[19].ChangeWeaponID = -1;
1114+ Weapon[19].ChangeWeaponCnt = 0;
10951115 Weapon[19].burst = 6;
10961116 Weapon[20].name = "FAMAS";
10971117 Weapon[20].model = "./data/model/weapon/famas.x";
@@ -1123,7 +1143,8 @@
11231143 Weapon[20].soundvolume = 96;
11241144 Weapon[20].silencer = false;
11251145 Weapon[20].WeaponP = 0;
1126- Weapon[20].ChangeWeapon = -1;
1146+ Weapon[20].ChangeWeaponID = -1;
1147+ Weapon[20].ChangeWeaponCnt = 0;
11271148 Weapon[20].burst = 1;
11281149 Weapon[21].name = "MK23";
11291150 Weapon[21].model = "./data/model/weapon/mk23.x";
@@ -1155,7 +1176,8 @@
11551176 Weapon[21].soundvolume = 92;
11561177 Weapon[21].silencer = false;
11571178 Weapon[21].WeaponP = 1;
1158- Weapon[21].ChangeWeapon = -1;
1179+ Weapon[21].ChangeWeaponID = -1;
1180+ Weapon[21].ChangeWeaponCnt = 0;
11591181 Weapon[21].burst = 1;
11601182 Weapon[22].name = "MK23 SD";
11611183 Weapon[22].model = "./data/model/weapon/mk23sd.x";
@@ -1187,7 +1209,8 @@
11871209 Weapon[22].soundvolume = 86;
11881210 Weapon[22].silencer = true;
11891211 Weapon[22].WeaponP = 1;
1190- Weapon[22].ChangeWeapon = -1;
1212+ Weapon[22].ChangeWeaponID = -1;
1213+ Weapon[22].ChangeWeaponCnt = 0;
11911214 Weapon[22].burst = 1;
11921215
11931216 #ifdef ENABLE_BUG_HUMANWEAPON
@@ -1222,7 +1245,8 @@
12221245 BugWeapon[0].soundvolume = 0;
12231246 BugWeapon[0].silencer = false;
12241247 BugWeapon[0].WeaponP = 1;
1225- BugWeapon[0].ChangeWeapon = -1;
1248+ BugWeapon[0].ChangeWeaponID = -1;
1249+ BugWeapon[0].ChangeWeaponCnt = 0;
12261250 BugWeapon[0].burst = 0;
12271251 #endif
12281252
--- trunk/parameter.h (revision 236)
+++ trunk/parameter.h (revision 237)
@@ -68,15 +68,15 @@
6868
6969 //! 武器設定用の構造体
7070 struct WeaponParameter{
71- char *name; //!< 武器名
72- char *model; //!< モデルファイル名
73- char *texture; //!< テクスチャファイル名
74- int attacks; //!< 攻撃力
71+ char *name; //!< 武器名
72+ char *model; //!< モデルファイル名
73+ char *texture; //!< テクスチャファイル名
74+ int attacks; //!< 攻撃力
7575 int penetration; //!< 貫通力
76- int blazings; //!< 連射間隔
77- int speed; //!< 弾速
78- int nbsmax; //!< 装弾数
79- int reloads; //!< リロード時間
76+ int blazings; //!< 連射間隔
77+ int speed; //!< 弾速
78+ int nbsmax; //!< 装弾数
79+ int reloads; //!< リロード時間
8080 int reaction; //!< 反動角度
8181 int ErrorRangeMIN; //!< 弾道誤差 最小
8282 int ErrorRangeMAX; //!< 弾道誤差 最大
@@ -92,13 +92,14 @@
9292 float yakkyou_sx; //!< 薬莢排出 初速:X
9393 float yakkyou_sy; //!< 薬莢排出 初速:Y
9494 bool blazingmode; //!< 連射
95- int scopemode; //!< スコープモード
96- float size; //!< 描画倍率
97- int soundid; //!< 発砲音の番号
95+ int scopemode; //!< スコープモード
96+ float size; //!< 描画倍率
97+ int soundid; //!< 発砲音の番号
9898 int soundvolume; //!< 発砲音の音量
99- bool silencer; //!< サイレンサーの有無
100- int WeaponP; //!< 装備方法
101- int ChangeWeapon; //!< 切り替える武器対象
99+ bool silencer; //!< サイレンサーの有無
100+ int WeaponP; //!< 装備方法
101+ int ChangeWeaponID; //!< 切り替える武器対象
102+ int ChangeWeaponCnt; //!< 武器切り替え時間
102103 int burst; //!< 発射弾数
103104 };
104105