• 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

Revision175 (tree)
Time2017-05-28 16:10:30
Authorxops-mikan

Log Message

一部の標準ミッションで「画面を暗く」フラグが使用・有効化されるように

Change Summary

Incremental Difference

--- trunk/gamemain.cpp (revision 174)
+++ trunk/gamemain.cpp (revision 175)
@@ -618,7 +618,7 @@
618618 char name[32];
619619 strcpy(name, "");
620620 if( GameInfoData.selectaddon == false ){
621- GameParamInfo.GetOfficialMission(scrollitems + i, name, NULL, NULL, NULL, NULL);
621+ GameParamInfo.GetOfficialMission(scrollitems + i, name, NULL, NULL, NULL, NULL, NULL);
622622 }
623623 else{
624624 strcpy(name, GameAddon.GetMissionName(scrollitems + i));
@@ -872,7 +872,7 @@
872872
873873 //ミッション名を取得
874874 if( GameInfoData.selectaddon == false ){
875- GameParamInfo.GetOfficialMission(scrollitems + i, name, NULL, NULL, NULL, NULL);
875+ GameParamInfo.GetOfficialMission(scrollitems + i, name, NULL, NULL, NULL, NULL, NULL);
876876 }
877877 else{
878878 strcpy(name, GameAddon.GetMissionName(scrollitems + i));
@@ -946,7 +946,7 @@
946946
947947 //mifファイルのファイルパス取得
948948 if( GameInfoData.selectaddon == false ){
949- GameParamInfo.GetOfficialMission(GameInfoData.selectmission_id, NULL, NULL, path, pdata, NULL);
949+ GameParamInfo.GetOfficialMission(GameInfoData.selectmission_id, NULL, NULL, path, pdata, NULL, NULL);
950950 strcat(path, pdata);
951951 strcat(path, ".txt");
952952 }
@@ -1041,7 +1041,7 @@
10411041 //ミッション名を取得・表示
10421042 char mname[64];
10431043 if( MIFdata.GetFiletype() == false ){
1044- GameParamInfo.GetOfficialMission(GameInfoData.selectmission_id, NULL, mname, NULL, NULL, NULL);
1044+ GameParamInfo.GetOfficialMission(GameInfoData.selectmission_id, NULL, mname, NULL, NULL, NULL, NULL);
10451045 }
10461046 else{
10471047 strcpy(mname, MIFdata.GetMissionFullname());
@@ -1096,11 +1096,11 @@
10961096 char pdata[MAX_PATH];
10971097 char pdata2[MAX_PATH];
10981098 int blockflag, pointflag;
1099- bool collisionflag;
1099+ bool collisionflag, screenflag;
11001100
11011101 //.bd1と.pd1のファイルパスを求める
11021102 if( MIFdata.GetFiletype() == false ){
1103- GameParamInfo.GetOfficialMission(MainGameInfo.selectmission_id, NULL, NULL, path, pdata2, &collisionflag);
1103+ GameParamInfo.GetOfficialMission(MainGameInfo.selectmission_id, NULL, NULL, path, pdata2, &collisionflag, &screenflag);
11041104
11051105 strcpy(bdata, path);
11061106 strcat(bdata, OFFICIALMISSION_BD1);
@@ -1111,6 +1111,7 @@
11111111 else{
11121112 MIFdata.GetDatafilePath(bdata, pdata);
11131113 collisionflag = MIFdata.GetCollisionFlag();
1114+ screenflag = MIFdata.GetScreenFlag();
11141115
11151116 strcpy(path, bdata);
11161117 for(int i=strlen(path)-1; i>0; i--){
@@ -1138,7 +1139,7 @@
11381139 }
11391140
11401141 //ブロックデータ初期化
1141- BlockData.CalculationBlockdata(MIFdata.GetScreenFlag());
1142+ BlockData.CalculationBlockdata(screenflag);
11421143 d3dg->LoadMapdata(&BlockData, path);
11431144 CollD.InitCollision(&BlockData);
11441145
@@ -1233,7 +1234,7 @@
12331234
12341235 //.bd1と.pd1のファイルパスを求める
12351236 if( MIFdata.GetFiletype() == false ){
1236- GameParamInfo.GetOfficialMission(MainGameInfo.selectmission_id, NULL, NULL, path, NULL, NULL);
1237+ GameParamInfo.GetOfficialMission(MainGameInfo.selectmission_id, NULL, NULL, path, NULL, NULL, NULL);
12371238 }
12381239 else{
12391240 MIFdata.GetDatafilePath(bdata, pdata);
@@ -2881,7 +2882,7 @@
28812882 //ミッション識別名
28822883 strcpy(str, "Name : ");
28832884 if( AddonFlag == true ){ strcpy(str2, MIFdata.GetMissionName()); }
2884- else{ GameParamInfo.GetOfficialMission(MissionID, str2, NULL, NULL, NULL, NULL); }
2885+ else{ GameParamInfo.GetOfficialMission(MissionID, str2, NULL, NULL, NULL, NULL, NULL); }
28852886 str2[(MAX_CONSOLELEN - strlen(str) - 1)] = '\0';
28862887 strcat(str, str2);
28872888 AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), str);
@@ -2889,7 +2890,7 @@
28892890 //ミッション正式名称
28902891 strcpy(str, "FullName : ");
28912892 if( AddonFlag == true ){ strcpy(str2, MIFdata.GetMissionFullname()); }
2892- else{ GameParamInfo.GetOfficialMission(MissionID, NULL, str2, NULL, NULL, NULL); }
2893+ else{ GameParamInfo.GetOfficialMission(MissionID, NULL, str2, NULL, NULL, NULL, NULL); }
28932894 str2[(MAX_CONSOLELEN - strlen(str) - 1)] = '\0';
28942895 strcat(str, str2);
28952896 AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), str);
@@ -2902,7 +2903,7 @@
29022903 strcat(str, str2);
29032904 }
29042905 else{
2905- GameParamInfo.GetOfficialMission(MissionID, NULL, NULL, str2, NULL, NULL);
2906+ GameParamInfo.GetOfficialMission(MissionID, NULL, NULL, str2, NULL, NULL, NULL);
29062907 str2[(MAX_CONSOLELEN - strlen(str) - 8 - 1)] = '\0';
29072908 strcat(str, str2);
29082909 strcat(str, OFFICIALMISSION_BD1);
@@ -2917,7 +2918,7 @@
29172918 strcat(str, str2);
29182919 }
29192920 else{
2920- GameParamInfo.GetOfficialMission(MissionID, NULL, NULL, str2, str3, NULL);
2921+ GameParamInfo.GetOfficialMission(MissionID, NULL, NULL, str2, str3, NULL, NULL);
29212922 strcat(str2, str3);
29222923 str2[(MAX_CONSOLELEN - strlen(str) - 4 - 1)] = '\0';
29232924 strcat(str, str2);
@@ -2937,7 +2938,7 @@
29372938 collisionflag = MIFdata.GetCollisionFlag();
29382939 }
29392940 else{
2940- GameParamInfo.GetOfficialMission(MissionID, NULL, NULL, NULL, NULL, &collisionflag);
2941+ GameParamInfo.GetOfficialMission(MissionID, NULL, NULL, NULL, NULL, &collisionflag, NULL);
29412942 }
29422943 sprintf(str, "Sky:%d CollisionFlag:%d NightFlag:%d", MIFdata.GetSkynumber(), (int)collisionflag, (int)MIFdata.GetScreenFlag());
29432944 AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), str);
@@ -2962,7 +2963,7 @@
29622963 strcat(str, str2);
29632964 }
29642965 else{
2965- GameParamInfo.GetOfficialMission(MissionID, NULL, NULL, str2, NULL, NULL);
2966+ GameParamInfo.GetOfficialMission(MissionID, NULL, NULL, str2, NULL, NULL, NULL);
29662967 str2[(MAX_CONSOLELEN - strlen(str) - 8 - 1)] = '\0';
29672968 strcat(str, str2);
29682969 strcat(str, OFFICIALMISSION_BD1);
@@ -3015,7 +3016,7 @@
30153016 strcat(str, str2);
30163017 }
30173018 else{
3018- GameParamInfo.GetOfficialMission(MissionID, NULL, NULL, str2, str3, NULL);
3019+ GameParamInfo.GetOfficialMission(MissionID, NULL, NULL, str2, str3, NULL, NULL);
30193020 strcat(str2, str3);
30203021 str2[(MAX_CONSOLELEN - strlen(str) - 4 - 1)] = '\0';
30213022 strcat(str, str2);
@@ -3556,7 +3557,7 @@
35563557
35573558 //ミッション名を取得し表示
35583559 if( MIFdata.GetFiletype() == false ){
3559- GameParamInfo.GetOfficialMission(GameInfoData.selectmission_id, NULL, mname, NULL, NULL, NULL);
3560+ GameParamInfo.GetOfficialMission(GameInfoData.selectmission_id, NULL, mname, NULL, NULL, NULL, NULL);
35603561 }
35613562 else{
35623563 strcpy(mname, MIFdata.GetMissionFullname());
--- trunk/parameter.cpp (revision 174)
+++ trunk/parameter.cpp (revision 175)
@@ -47,6 +47,7 @@
4747 #endif
4848 SmallObject = NULL;
4949 Bullet = NULL;
50+ MissionData = NULL;
5051 for(int i=0; i<TOTAL_OFFICIALMISSION; i++){
5152 missionname[i] = '\0';
5253 missionfullname[i] = '\0';
@@ -78,6 +79,7 @@
7879 #endif
7980 SmallObject = new SmallObjectParameter[TOTAL_PARAMETERINFO_SMALLOBJECT];
8081 Bullet = new BulletParameter[TOTAL_PARAMETERINFO_BULLET];
82+ MissionData = new OfficialMissionParameter[TOTAL_OFFICIALMISSION];
8183 AIlevel = new AIParameter[TOTAL_PARAMETERINFO_AILEVEL];
8284
8385 //特殊 黒 A
@@ -1327,296 +1329,354 @@
13271329 Bullet[1].size = Weapon[ID_WEAPON_GRENADE].size;
13281330
13291331
1330- missionname[0] = "TRAINING YARD";
1331- missionfullname[0] = "TRAINING YARD training";
1332- missiondirectory[0] = "data\\map0\\";
1333- missiontxt[0] = "tr";
1334- missioncollisionflag[0] = false;
1335- missionname[1] = "UNDERGROUND_EXT";
1336- missionfullname[1] = "UNDERGROUND extermination";
1337- missiondirectory[1] = "data\\map5\\";
1338- missiontxt[1] = "ext";
1339- missioncollisionflag[1] = false;
1340- missionname[2] = "BUILDING_EXT";
1341- missionfullname[2] = "BUILDING extermination";
1342- missiondirectory[2] = "data\\map1\\";
1343- missiontxt[2] = "ext";
1344- missioncollisionflag[2] = false;
1345- missionname[3] = "SNOW BASE_EXT";
1346- missionfullname[3] = "SNOW BASE extermination";
1347- missiondirectory[3] = "data\\map2\\";
1348- missiontxt[3] = "ext";
1349- missioncollisionflag[3] = false;
1350- missionname[4] = "MBASE_EXT";
1351- missionfullname[4] = "MILITARY BASE extermination";
1352- missiondirectory[4] = "data\\map4\\";
1353- missiontxt[4] = "ext";
1354- missioncollisionflag[4] = false;
1355- missionname[5] = "WAREHOUSE_EXT";
1356- missionfullname[5] = "WAREHOUSE AREA extermination";
1357- missiondirectory[5] = "data\\map7\\";
1358- missiontxt[5] = "ext";
1359- missioncollisionflag[5] = false;
1360- missionname[6] = "DUEL_EXT";
1361- missionfullname[6] = "DUEL extermination";
1362- missiondirectory[6] = "data\\map9\\";
1363- missiontxt[6] = "ext";
1364- missioncollisionflag[6] = false;
1365- missionname[7] = "STATION_EXT";
1366- missionfullname[7] = "SUBWAY STATION extermination";
1367- missiondirectory[7] = "data\\map6\\";
1368- missiontxt[7] = "ext";
1369- missioncollisionflag[7] = false;
1370- missionname[8] = "MAZE_EXT";
1371- missionfullname[8] = "MAZE extermination";
1372- missiondirectory[8] = "data\\map13\\";
1373- missiontxt[8] = "ext";
1374- missioncollisionflag[8] = false;
1375- missionname[9] = "RUINS_EXT";
1376- missionfullname[9] = "RUINS extermination";
1377- missiondirectory[9] = "data\\map14\\";
1378- missiontxt[9] = "ext";
1379- missioncollisionflag[9] = false;
1380- missionname[10] = "URBAN_EXT";
1381- missionfullname[10] = "URBAN extermination";
1382- missiondirectory[10] = "data\\map8\\";
1383- missiontxt[10] = "ext";
1384- missioncollisionflag[10]= false;
1385- missionname[11] = "UNDERGROUND_EXT2";
1386- missionfullname[11] = "UNDERGROUND extermination2";
1387- missiondirectory[11] = "data\\map5\\";
1388- missiontxt[11] = "ext2";
1389- missioncollisionflag[11]= false;
1390- missionname[12] = "TUNNEL_EXT";
1391- missionfullname[12] = "TUNNEL extermination";
1392- missiondirectory[12] = "data\\map12\\";
1393- missiontxt[12] = "ext";
1394- missioncollisionflag[12]= false;
1395- missionname[13] = "URBAN_DEF";
1396- missionfullname[13] = "URBAN defend target";
1397- missiondirectory[13] = "data\\map8\\";
1398- missiontxt[13] = "def";
1399- missioncollisionflag[13]= false;
1400- missionname[14] = "DTOWN_EXT";
1401- missionfullname[14] = "DESERT TOWN extermination";
1402- missiondirectory[14] = "data\\map3\\";
1403- missiontxt[14] = "ext";
1404- missioncollisionflag[14]= false;
1405- missionname[15] = "URBAN_DEF2";
1406- missionfullname[15] = "URBAN defend target2";
1407- missiondirectory[15] = "data\\map8\\";
1408- missiontxt[15] = "def2";
1409- missioncollisionflag[15]= false;
1410- missionname[16] = "WAREHOUSE_KT";
1411- missionfullname[16] = "WAREHOUSE AREA kill the target";
1412- missiondirectory[16] = "data\\map7\\";
1413- missiontxt[16] = "kt";
1414- missioncollisionflag[16]= false;
1415- missionname[17] = "RUINS_RE";
1416- missionfullname[17] = "RUINS release";
1417- missiondirectory[17] = "data\\map14\\";
1418- missiontxt[17] = "re";
1419- missioncollisionflag[17]= false;
1420- missionname[18] = "RELIC_CAP";
1421- missionfullname[18] = "RELIC capture";
1422- missiondirectory[18] = "data\\map16\\";
1423- missiontxt[18] = "cap";
1424- missioncollisionflag[18]= false;
1425- missionname[19] = "MBASE_DE";
1426- missionfullname[19] = "MILITARY BASE destroy";
1427- missiondirectory[19] = "data\\map4\\";
1428- missiontxt[19] = "de";
1429- missioncollisionflag[19]= false;
1430- missionname[20] = "RUINS_CAP";
1431- missionfullname[20] = "RUINS capture";
1432- missiondirectory[20] = "data\\map14\\";
1433- missiontxt[20] = "cap";
1434- missioncollisionflag[20]= false;
1435- missionname[21] = "DTOWN_KT";
1436- missionfullname[21] = "DESERT TOWN kill the target";
1437- missiondirectory[21] = "data\\map3\\";
1438- missiontxt[21] = "kt";
1439- missioncollisionflag[21]= false;
1440- missionname[22] = "SNOW BASE_RE";
1441- missionfullname[22] = "SNOW BASE release";
1442- missiondirectory[22] = "data\\map2\\";
1443- missiontxt[22] = "re";
1444- missioncollisionflag[22]= false;
1445- missionname[23] = "UNDERGROUND_DEF";
1446- missionfullname[23] = "UNDERGROUND defend target";
1447- missiondirectory[23] = "data\\map5\\";
1448- missiontxt[23] = "def";
1449- missioncollisionflag[23]= false;
1450- missionname[24] = "TUNNEL_EXT2";
1451- missionfullname[24] = "TUNNEL extermination2";
1452- missiondirectory[24] = "data\\map12\\";
1453- missiontxt[24] = "ext2";
1454- missioncollisionflag[24]= false;
1455- missionname[25] = "RELIC_DEF";
1456- missionfullname[25] = "RELIC defend target";
1457- missiondirectory[25] = "data\\map16\\";
1458- missiontxt[25] = "def";
1459- missioncollisionflag[25]= false;
1460- missionname[26] = "URBAN_KT";
1461- missionfullname[26] = "URBAN kill the target";
1462- missiondirectory[26] = "data\\map8\\";
1463- missiontxt[26] = "kt";
1464- missioncollisionflag[26]= false;
1465- missionname[27] = "ALLEY_KT";
1466- missionfullname[27] = "ALLEY kill the target";
1467- missiondirectory[27] = "data\\map10\\";
1468- missiontxt[27] = "kt";
1469- missioncollisionflag[27]= false;
1470- missionname[28] = "STATION_KT";
1471- missionfullname[28] = "SUBWAY STATION kill the target";
1472- missiondirectory[28] = "data\\map6\\";
1473- missiontxt[28] = "kt";
1474- missioncollisionflag[28]= false;
1475- missionname[29] = "WAREHOUSE_DEF";
1476- missionfullname[29] = "WAREHOUSE AREA defend target";
1477- missiondirectory[29] = "data\\map7\\";
1478- missiontxt[29] = "def";
1479- missioncollisionflag[29]= false;
1480- missionname[30] = "URBAN_KT2";
1481- missionfullname[30] = "URBAN kill the target2";
1482- missiondirectory[30] = "data\\map8\\";
1483- missiontxt[30] = "kt2";
1484- missioncollisionflag[30]= false;
1485- missionname[31] = "OFFICE_DEF";
1486- missionfullname[31] = "OFFICE defend target";
1487- missiondirectory[31] = "data\\map15\\";
1488- missiontxt[31] = "def";
1489- missioncollisionflag[31]= false;
1490- missionname[32] = "URBAN_CAP";
1491- missionfullname[32] = "URBAN capture";
1492- missiondirectory[32] = "data\\map8\\";
1493- missiontxt[32] = "cap";
1494- missioncollisionflag[32]= false;
1495- missionname[33] = "ALLEY_EXT";
1496- missionfullname[33] = "ALLEY extermination";
1497- missiondirectory[33] = "data\\map10\\";
1498- missiontxt[33] = "ext";
1499- missioncollisionflag[33]= false;
1500- missionname[34] = "TUNNEL_ESC";
1501- missionfullname[34] = "TUNNEL escape";
1502- missiondirectory[34] = "data\\map12\\";
1503- missiontxt[34] = "esc";
1504- missioncollisionflag[34]= false;
1505- missionname[35] = "MAZE_CAP";
1506- missionfullname[35] = "MAZE capture";
1507- missiondirectory[35] = "data\\map13\\";
1508- missiontxt[35] = "cap";
1509- missioncollisionflag[35]= false;
1510- missionname[36] = "WAREHOUSE_DEF2";
1511- missionfullname[36] = "WAREHOUSE AREA defend target2";
1512- missiondirectory[36] = "data\\map7\\";
1513- missiontxt[36] = "def2";
1514- missioncollisionflag[36]= false;
1515- missionname[37] = "RUINS_DE";
1516- missionfullname[37] = "RUINS destroy";
1517- missiondirectory[37] = "data\\map14\\";
1518- missiontxt[37] = "de";
1519- missioncollisionflag[37]= false;
1520- missionname[38] = "URBAN_KT3";
1521- missionfullname[38] = "URBAN kill the target3";
1522- missiondirectory[38] = "data\\map8\\";
1523- missiontxt[38] = "kt3";
1524- missioncollisionflag[38]= false;
1525- missionname[39] = "DUEL_EXT2";
1526- missionfullname[39] = "DUEL extermination2";
1527- missiondirectory[39] = "data\\map9\\";
1528- missiontxt[39] = "ext2";
1529- missioncollisionflag[39]= false;
1530- missionname[40] = "RELIC_EXT";
1531- missionfullname[40] = "RELIC extermination";
1532- missiondirectory[40] = "data\\map16\\";
1533- missiontxt[40] = "ext";
1534- missioncollisionflag[40]= false;
1535- missionname[41] = "SNOW BASE_DEF";
1536- missionfullname[41] = "SNOW BASE defend target";
1537- missiondirectory[41] = "data\\map2\\";
1538- missiontxt[41] = "def";
1539- missioncollisionflag[41]= false;
1540- missionname[42] = "BUILDING_KT";
1541- missionfullname[42] = "BUILDING kill the target";
1542- missiondirectory[42] = "data\\map1\\";
1543- missiontxt[42] = "kt";
1544- missioncollisionflag[42]= false;
1545- missionname[43] = "MAZE_ESC";
1546- missionfullname[43] = "MAZE escape";
1547- missiondirectory[43] = "data\\map13\\";
1548- missiontxt[43] = "esc";
1549- missioncollisionflag[43]= false;
1550- missionname[44] = "ALLEY_EXT2";
1551- missionfullname[44] = "ALLEY extermination2";
1552- missiondirectory[44] = "data\\map10\\";
1553- missiontxt[44] = "ext2";
1554- missioncollisionflag[44]= false;
1555- missionname[45] = "MBASE_ESC";
1556- missionfullname[45] = "MILITARY BASE escape";
1557- missiondirectory[45] = "data\\map4\\";
1558- missiontxt[45] = "esc";
1559- missioncollisionflag[45]= false;
1560- missionname[46] = "DTOWN_DEF";
1561- missionfullname[46] = "DESERT TOWN defend target";
1562- missiondirectory[46] = "data\\map3\\";
1563- missiontxt[46] = "def";
1564- missioncollisionflag[46]= false;
1565- missionname[47] = "OFFICE_KT";
1566- missionfullname[47] = "OFFICE kill the target";
1567- missiondirectory[47] = "data\\map15\\";
1568- missiontxt[47] = "kt";
1569- missioncollisionflag[47]= false;
1570- missionname[48] = "BUILDING_DEF";
1571- missionfullname[48] = "BUILDING defend target";
1572- missiondirectory[48] = "data\\map1\\";
1573- missiontxt[48] = "def";
1574- missioncollisionflag[48]= false;
1575- missionname[49] = "OFFICE_KT2";
1576- missionfullname[49] = "OFFICE kill the target2";
1577- missiondirectory[49] = "data\\map15\\";
1578- missiontxt[49] = "kt2";
1579- missioncollisionflag[49]= false;
1580- missionname[50] = "MBASE_CAP";
1581- missionfullname[50] = "MILITARY BASE capture";
1582- missiondirectory[50] = "data\\map4\\";
1583- missiontxt[50] = "cap";
1584- missioncollisionflag[50]= false;
1585- missionname[51] = "TUNNEL_KT";
1586- missionfullname[51] = "TUNNEL kill the target";
1587- missiondirectory[51] = "data\\map12\\";
1588- missiontxt[51] = "kt";
1589- missioncollisionflag[51]= false;
1590- missionname[52] = "OFFICE_RE";
1591- missionfullname[52] = "OFFICE release";
1592- missiondirectory[52] = "data\\map15\\";
1593- missiontxt[52] = "re";
1594- missioncollisionflag[52]= false;
1595- missionname[53] = "URBAN_KT4";
1596- missionfullname[53] = "URBAN kill the target4";
1597- missiondirectory[53] = "data\\map8\\";
1598- missiontxt[53] = "kt4";
1599- missioncollisionflag[53]= false;
1600- missionname[54] = "UNDERGROUND_EXT3";
1601- missionfullname[54] = "UNDERGROUND extermination3";
1602- missiondirectory[54] = "data\\map5\\";
1603- missiontxt[54] = "ext3";
1604- missioncollisionflag[54]= false;
1605- missionname[55] = "SCHOOL_EXT";
1606- missionfullname[55] = "SCHOOL extermination";
1607- missiondirectory[55] = "data\\map11\\";
1608- missiontxt[55] = "ext";
1609- missioncollisionflag[55]= true;
1610- missionname[56] = "SCHOOL_EXT2";
1611- missionfullname[56] = "SCHOOL extermination2";
1612- missiondirectory[56] = "data\\map11\\";
1613- missiontxt[56] = "ext2";
1614- missioncollisionflag[56]= true;
1615- missionname[57] = "SCHOOL_DE";
1616- missionfullname[57] = "SCHOOL destroy";
1617- missiondirectory[57] = "data\\map11\\";
1618- missiontxt[57] = "de";
1619- missioncollisionflag[57]= true;
1332+ MissionData[0].name = "TRAINING YARD";
1333+ MissionData[0].fullname = "TRAINING YARD training";
1334+ MissionData[0].directory = "data\\map0\\";
1335+ MissionData[0].txt = "tr";
1336+ MissionData[0].collision = false;
1337+ MissionData[0].screen = false;
1338+ MissionData[1].name = "UNDERGROUND_EXT";
1339+ MissionData[1].fullname = "UNDERGROUND extermination";
1340+ MissionData[1].directory = "data\\map5\\";
1341+ MissionData[1].txt = "ext";
1342+ MissionData[1].collision = false;
1343+ MissionData[1].screen = false;
1344+ MissionData[2].name = "BUILDING_EXT";
1345+ MissionData[2].fullname = "BUILDING extermination";
1346+ MissionData[2].directory = "data\\map1\\";
1347+ MissionData[2].txt = "ext";
1348+ MissionData[2].collision = false;
1349+ MissionData[2].screen = false;
1350+ MissionData[3].name = "SNOW BASE_EXT";
1351+ MissionData[3].fullname = "SNOW BASE extermination";
1352+ MissionData[3].directory = "data\\map2\\";
1353+ MissionData[3].txt = "ext";
1354+ MissionData[3].collision = false;
1355+ MissionData[3].screen = false;
1356+ MissionData[4].name = "MBASE_EXT";
1357+ MissionData[4].fullname = "MILITARY BASE extermination";
1358+ MissionData[4].directory = "data\\map4\\";
1359+ MissionData[4].txt = "ext";
1360+ MissionData[4].collision = false;
1361+ MissionData[4].screen = false;
1362+ MissionData[5].name = "WAREHOUSE_EXT";
1363+ MissionData[5].fullname = "WAREHOUSE AREA extermination";
1364+ MissionData[5].directory = "data\\map7\\";
1365+ MissionData[5].txt = "ext";
1366+ MissionData[5].collision = false;
1367+ MissionData[5].screen = false;
1368+ MissionData[6].name = "DUEL_EXT";
1369+ MissionData[6].fullname = "DUEL extermination";
1370+ MissionData[6].directory = "data\\map9\\";
1371+ MissionData[6].txt = "ext";
1372+ MissionData[6].collision = false;
1373+ MissionData[6].screen = false;
1374+ MissionData[7].name = "STATION_EXT";
1375+ MissionData[7].fullname = "SUBWAY STATION extermination";
1376+ MissionData[7].directory = "data\\map6\\";
1377+ MissionData[7].txt = "ext";
1378+ MissionData[7].collision = false;
1379+ MissionData[7].screen = false;
1380+ MissionData[8].name = "MAZE_EXT";
1381+ MissionData[8].fullname = "MAZE extermination";
1382+ MissionData[8].directory = "data\\map13\\";
1383+ MissionData[8].txt = "ext";
1384+ MissionData[8].collision = false;
1385+ MissionData[8].screen = false;
1386+ MissionData[9].name = "RUINS_EXT";
1387+ MissionData[9].fullname = "RUINS extermination";
1388+ MissionData[9].directory = "data\\map14\\";
1389+ MissionData[9].txt = "ext";
1390+ MissionData[9].collision = false;
1391+ MissionData[9].screen = false;
1392+ MissionData[10].name = "URBAN_EXT";
1393+ MissionData[10].fullname = "URBAN extermination";
1394+ MissionData[10].directory = "data\\map8\\";
1395+ MissionData[10].txt = "ext";
1396+ MissionData[10].collision = false;
1397+ MissionData[10].screen = false;
1398+ MissionData[11].name = "UNDERGROUND_EXT2";
1399+ MissionData[11].fullname = "UNDERGROUND extermination2";
1400+ MissionData[11].directory = "data\\map5\\";
1401+ MissionData[11].txt = "ext2";
1402+ MissionData[11].collision = false;
1403+ MissionData[11].screen = false;
1404+ MissionData[12].name = "TUNNEL_EXT";
1405+ MissionData[12].fullname = "TUNNEL extermination";
1406+ MissionData[12].directory = "data\\map12\\";
1407+ MissionData[12].txt = "ext";
1408+ MissionData[12].collision = false;
1409+ MissionData[12].screen = false;
1410+ MissionData[13].name = "URBAN_DEF";
1411+ MissionData[13].fullname = "URBAN defend target";
1412+ MissionData[13].directory = "data\\map8\\";
1413+ MissionData[13].txt = "def";
1414+ MissionData[13].collision = false;
1415+ MissionData[13].screen = false;
1416+ MissionData[14].name = "DTOWN_EXT";
1417+ MissionData[14].fullname = "DESERT TOWN extermination";
1418+ MissionData[14].directory = "data\\map3\\";
1419+ MissionData[14].txt = "ext";
1420+ MissionData[14].collision = false;
1421+ MissionData[14].screen = false;
1422+ MissionData[15].name = "URBAN_DEF2";
1423+ MissionData[15].fullname = "URBAN defend target2";
1424+ MissionData[15].directory = "data\\map8\\";
1425+ MissionData[15].txt = "def2";
1426+ MissionData[15].collision = false;
1427+ MissionData[15].screen = false;
1428+ MissionData[16].name = "WAREHOUSE_KT";
1429+ MissionData[16].fullname = "WAREHOUSE AREA kill the target";
1430+ MissionData[16].directory = "data\\map7\\";
1431+ MissionData[16].txt = "kt";
1432+ MissionData[16].collision = false;
1433+ MissionData[16].screen = false;
1434+ MissionData[17].name = "RUINS_RE";
1435+ MissionData[17].fullname = "RUINS release";
1436+ MissionData[17].directory = "data\\map14\\";
1437+ MissionData[17].txt = "re";
1438+ MissionData[17].collision = false;
1439+ MissionData[17].screen = false;
1440+ MissionData[18].name = "RELIC_CAP";
1441+ MissionData[18].fullname = "RELIC capture";
1442+ MissionData[18].directory = "data\\map16\\";
1443+ MissionData[18].txt = "cap";
1444+ MissionData[18].collision = false;
1445+ MissionData[18].screen = false;
1446+ MissionData[19].name = "MBASE_DE";
1447+ MissionData[19].fullname = "MILITARY BASE destroy";
1448+ MissionData[19].directory = "data\\map4\\";
1449+ MissionData[19].txt = "de";
1450+ MissionData[19].collision = false;
1451+ MissionData[19].screen = false;
1452+ MissionData[20].name = "RUINS_CAP";
1453+ MissionData[20].fullname = "RUINS capture";
1454+ MissionData[20].directory = "data\\map14\\";
1455+ MissionData[20].txt = "cap";
1456+ MissionData[20].collision = false;
1457+ MissionData[20].screen = false;
1458+ MissionData[21].name = "DTOWN_KT";
1459+ MissionData[21].fullname = "DESERT TOWN kill the target";
1460+ MissionData[21].directory = "data\\map3\\";
1461+ MissionData[21].txt = "kt";
1462+ MissionData[21].collision = false;
1463+ MissionData[21].screen = false;
1464+ MissionData[22].name = "SNOW BASE_RE";
1465+ MissionData[22].fullname = "SNOW BASE release";
1466+ MissionData[22].directory = "data\\map2\\";
1467+ MissionData[22].txt = "re";
1468+ MissionData[22].collision = false;
1469+ MissionData[22].screen = false;
1470+ MissionData[23].name = "UNDERGROUND_DEF";
1471+ MissionData[23].fullname = "UNDERGROUND defend target";
1472+ MissionData[23].directory = "data\\map5\\";
1473+ MissionData[23].txt = "def";
1474+ MissionData[23].collision = false;
1475+ MissionData[23].screen = false;
1476+ MissionData[24].name = "TUNNEL_EXT2";
1477+ MissionData[24].fullname = "TUNNEL extermination2";
1478+ MissionData[24].directory = "data\\map12\\";
1479+ MissionData[24].txt = "ext2";
1480+ MissionData[24].collision = false;
1481+ MissionData[24].screen = false;
1482+ MissionData[25].name = "RELIC_DEF";
1483+ MissionData[25].fullname = "RELIC defend target";
1484+ MissionData[25].directory = "data\\map16\\";
1485+ MissionData[25].txt = "def";
1486+ MissionData[25].collision = false;
1487+ MissionData[25].screen = false;
1488+ MissionData[26].name = "URBAN_KT";
1489+ MissionData[26].fullname = "URBAN kill the target";
1490+ MissionData[26].directory = "data\\map8\\";
1491+ MissionData[26].txt = "kt";
1492+ MissionData[26].collision = false;
1493+ MissionData[26].screen = false;
1494+ MissionData[27].name = "ALLEY_KT";
1495+ MissionData[27].fullname = "ALLEY kill the target";
1496+ MissionData[27].directory = "data\\map10\\";
1497+ MissionData[27].txt = "kt";
1498+ MissionData[27].collision = false;
1499+ MissionData[27].screen = false;
1500+ MissionData[28].name = "STATION_KT";
1501+ MissionData[28].fullname = "SUBWAY STATION kill the target";
1502+ MissionData[28].directory = "data\\map6\\";
1503+ MissionData[28].txt = "kt";
1504+ MissionData[28].collision = false;
1505+ MissionData[28].screen = false;
1506+ MissionData[29].name = "WAREHOUSE_DEF";
1507+ MissionData[29].fullname = "WAREHOUSE AREA defend target";
1508+ MissionData[29].directory = "data\\map7\\";
1509+ MissionData[29].txt = "def";
1510+ MissionData[29].collision = false;
1511+ MissionData[29].screen = false;
1512+ MissionData[30].name = "URBAN_KT2";
1513+ MissionData[30].fullname = "URBAN kill the target2";
1514+ MissionData[30].directory = "data\\map8\\";
1515+ MissionData[30].txt = "kt2";
1516+ MissionData[30].collision = false;
1517+ MissionData[30].screen = false;
1518+ MissionData[31].name = "OFFICE_DEF";
1519+ MissionData[31].fullname = "OFFICE defend target";
1520+ MissionData[31].directory = "data\\map15\\";
1521+ MissionData[31].txt = "def";
1522+ MissionData[31].collision = false;
1523+ MissionData[31].screen = false;
1524+ MissionData[32].name = "URBAN_CAP";
1525+ MissionData[32].fullname = "URBAN capture";
1526+ MissionData[32].directory = "data\\map8\\";
1527+ MissionData[32].txt = "cap";
1528+ MissionData[32].collision = false;
1529+ MissionData[32].screen = false;
1530+ MissionData[33].name = "ALLEY_EXT";
1531+ MissionData[33].fullname = "ALLEY extermination";
1532+ MissionData[33].directory = "data\\map10\\";
1533+ MissionData[33].txt = "ext";
1534+ MissionData[33].collision = false;
1535+ MissionData[33].screen = true;
1536+ MissionData[34].name = "TUNNEL_ESC";
1537+ MissionData[34].fullname = "TUNNEL escape";
1538+ MissionData[34].directory = "data\\map12\\";
1539+ MissionData[34].txt = "esc";
1540+ MissionData[34].collision = false;
1541+ MissionData[34].screen = true;
1542+ MissionData[35].name = "MAZE_CAP";
1543+ MissionData[35].fullname = "MAZE capture";
1544+ MissionData[35].directory = "data\\map13\\";
1545+ MissionData[35].txt = "cap";
1546+ MissionData[35].collision = false;
1547+ MissionData[35].screen = true;
1548+ MissionData[36].name = "WAREHOUSE_DEF2";
1549+ MissionData[36].fullname = "WAREHOUSE AREA defend target2";
1550+ MissionData[36].directory = "data\\map7\\";
1551+ MissionData[36].txt = "def2";
1552+ MissionData[36].collision = false;
1553+ MissionData[36].screen = false;
1554+ MissionData[37].name = "RUINS_DE";
1555+ MissionData[37].fullname = "RUINS destroy";
1556+ MissionData[37].directory = "data\\map14\\";
1557+ MissionData[37].txt = "de";
1558+ MissionData[37].collision = false;
1559+ MissionData[37].screen = false;
1560+ MissionData[38].name = "URBAN_KT3";
1561+ MissionData[38].fullname = "URBAN kill the target3";
1562+ MissionData[38].directory = "data\\map8\\";
1563+ MissionData[38].txt = "kt3";
1564+ MissionData[38].collision = false;
1565+ MissionData[38].screen = false;
1566+ MissionData[39].name = "DUEL_EXT2";
1567+ MissionData[39].fullname = "DUEL extermination2";
1568+ MissionData[39].directory = "data\\map9\\";
1569+ MissionData[39].txt = "ext2";
1570+ MissionData[39].collision = false;
1571+ MissionData[39].screen = false;
1572+ MissionData[40].name = "RELIC_EXT";
1573+ MissionData[40].fullname = "RELIC extermination";
1574+ MissionData[40].directory = "data\\map16\\";
1575+ MissionData[40].txt = "ext";
1576+ MissionData[40].collision = false;
1577+ MissionData[40].screen = false;
1578+ MissionData[41].name = "SNOW BASE_DEF";
1579+ MissionData[41].fullname = "SNOW BASE defend target";
1580+ MissionData[41].directory = "data\\map2\\";
1581+ MissionData[41].txt = "def";
1582+ MissionData[41].collision = false;
1583+ MissionData[41].screen = false;
1584+ MissionData[42].name = "BUILDING_KT";
1585+ MissionData[42].fullname = "BUILDING kill the target";
1586+ MissionData[42].directory = "data\\map1\\";
1587+ MissionData[42].txt = "kt";
1588+ MissionData[42].collision = false;
1589+ MissionData[42].screen = false;
1590+ MissionData[43].name = "MAZE_ESC";
1591+ MissionData[43].fullname = "MAZE escape";
1592+ MissionData[43].directory = "data\\map13\\";
1593+ MissionData[43].txt = "esc";
1594+ MissionData[43].collision = false;
1595+ MissionData[43].screen = true;
1596+ MissionData[44].name = "ALLEY_EXT2";
1597+ MissionData[44].fullname = "ALLEY extermination2";
1598+ MissionData[44].directory = "data\\map10\\";
1599+ MissionData[44].txt = "ext2";
1600+ MissionData[44].collision = false;
1601+ MissionData[44].screen = false;
1602+ MissionData[45].name = "MBASE_ESC";
1603+ MissionData[45].fullname = "MILITARY BASE escape";
1604+ MissionData[45].directory = "data\\map4\\";
1605+ MissionData[45].txt = "esc";
1606+ MissionData[45].collision = false;
1607+ MissionData[45].screen = false;
1608+ MissionData[46].name = "DTOWN_DEF";
1609+ MissionData[46].fullname = "DESERT TOWN defend target";
1610+ MissionData[46].directory = "data\\map3\\";
1611+ MissionData[46].txt = "def";
1612+ MissionData[46].collision = false;
1613+ MissionData[46].screen = false;
1614+ MissionData[47].name = "OFFICE_KT";
1615+ MissionData[47].fullname = "OFFICE kill the target";
1616+ MissionData[47].directory = "data\\map15\\";
1617+ MissionData[47].txt = "kt";
1618+ MissionData[47].collision = false;
1619+ MissionData[47].screen = false;
1620+ MissionData[48].name = "BUILDING_DEF";
1621+ MissionData[48].fullname = "BUILDING defend target";
1622+ MissionData[48].directory = "data\\map1\\";
1623+ MissionData[48].txt = "def";
1624+ MissionData[48].collision = false;
1625+ MissionData[48].screen = false;
1626+ MissionData[49].name = "OFFICE_KT2";
1627+ MissionData[49].fullname = "OFFICE kill the target2";
1628+ MissionData[49].directory = "data\\map15\\";
1629+ MissionData[49].txt = "kt2";
1630+ MissionData[49].collision = false;
1631+ MissionData[49].screen = false;
1632+ MissionData[50].name = "MBASE_CAP";
1633+ MissionData[50].fullname = "MILITARY BASE capture";
1634+ MissionData[50].directory = "data\\map4\\";
1635+ MissionData[50].txt = "cap";
1636+ MissionData[50].collision = false;
1637+ MissionData[50].screen = false;
1638+ MissionData[51].name = "TUNNEL_KT";
1639+ MissionData[51].fullname = "TUNNEL kill the target";
1640+ MissionData[51].directory = "data\\map12\\";
1641+ MissionData[51].txt = "kt";
1642+ MissionData[51].collision = false;
1643+ MissionData[51].screen = false;
1644+ MissionData[52].name = "OFFICE_RE";
1645+ MissionData[52].fullname = "OFFICE release";
1646+ MissionData[52].directory = "data\\map15\\";
1647+ MissionData[52].txt = "re";
1648+ MissionData[52].collision = false;
1649+ MissionData[52].screen = false;
1650+ MissionData[53].name = "URBAN_KT4";
1651+ MissionData[53].fullname = "URBAN kill the target4";
1652+ MissionData[53].directory = "data\\map8\\";
1653+ MissionData[53].txt = "kt4";
1654+ MissionData[53].collision = false;
1655+ MissionData[53].screen = false;
1656+ MissionData[54].name = "UNDERGROUND_EXT3";
1657+ MissionData[54].fullname = "UNDERGROUND extermination3";
1658+ MissionData[54].directory = "data\\map5\\";
1659+ MissionData[54].txt = "ext3";
1660+ MissionData[54].collision = false;
1661+ MissionData[54].screen = false;
1662+ MissionData[55].name = "SCHOOL_EXT";
1663+ MissionData[55].fullname = "SCHOOL extermination";
1664+ MissionData[55].directory = "data\\map11\\";
1665+ MissionData[55].txt = "ext";
1666+ MissionData[55].collision = true;
1667+ MissionData[55].screen = false;
1668+ MissionData[56].name = "SCHOOL_EXT2";
1669+ MissionData[56].fullname = "SCHOOL extermination2";
1670+ MissionData[56].directory = "data\\map11\\";
1671+ MissionData[56].txt = "ext2";
1672+ MissionData[56].collision = true;
1673+ MissionData[56].screen = false;
1674+ MissionData[57].name = "SCHOOL_DE";
1675+ MissionData[57].fullname = "SCHOOL destroy";
1676+ MissionData[57].directory = "data\\map11\\";
1677+ MissionData[57].txt = "de";
1678+ MissionData[57].collision = true;
1679+ MissionData[57].screen = false;
16201680
16211681
16221682 AIlevel[0].aiming = 1;
@@ -1681,6 +1741,10 @@
16811741 delete [] Bullet;
16821742 Bullet = NULL;
16831743 }
1744+ if( MissionData != NULL ){
1745+ delete [] MissionData;
1746+ MissionData = NULL;
1747+ }
16841748 if( AIlevel != NULL ){
16851749 delete [] AIlevel;
16861750 AIlevel = NULL;
@@ -1785,17 +1849,19 @@
17851849 //! @param directory データの格納先を受け取るポインタ (NULL可)
17861850 //! @param txt ファイル名を受け取るポインタ (NULL可)
17871851 //! @param collisionflag 追加の当たり判定を示すフラグを受け取るポインタ (NULL可)
1852+//! @param screenflag 画面を暗くするフラグを受け取るポインタ (NULL可)
17881853 //! @return 成功:0 失敗:1
17891854 //! @note ファイル名・・・ミッション情報ファイル(.txt)とポイントデータファイル(.pd1)に使われる名前
1790-int ParameterInfo::GetOfficialMission(int id, char *name, char *fullname, char* directory, char *txt, bool *collisionflag)
1855+int ParameterInfo::GetOfficialMission(int id, char *name, char *fullname, char* directory, char *txt, bool *collisionflag, bool *screenflag)
17911856 {
17921857 if( (id < 0)||((TOTAL_OFFICIALMISSION -1) < id ) ){ return 1; }
17931858
1794- if( name != NULL ){ strcpy(name, missionname[id]); }
1795- if( fullname != NULL ){ strcpy(fullname, missionfullname[id]); }
1796- if( directory != NULL ){ strcpy(directory, missiondirectory[id]); }
1797- if( txt != NULL ){ strcpy(txt, missiontxt[id]); }
1798- if( collisionflag != NULL ){ *collisionflag = missioncollisionflag[id]; }
1859+ if( name != NULL ){ strcpy(name, MissionData[id].name); }
1860+ if( fullname != NULL ){ strcpy(fullname, MissionData[id].fullname); }
1861+ if( directory != NULL ){ strcpy(directory, MissionData[id].directory); }
1862+ if( txt != NULL ){ strcpy(txt, MissionData[id].txt); }
1863+ if( collisionflag != NULL ){ *collisionflag = MissionData[id].screen; }
1864+ if( screenflag != NULL ){ *screenflag = MissionData[id].screen; }
17991865 return 0;
18001866 }
18011867
--- trunk/parameter.h (revision 174)
+++ trunk/parameter.h (revision 175)
@@ -119,6 +119,16 @@
119119 float size; //!< 描画倍率
120120 };
121121
122+//! 標準ミッション設定用の構造体
123+struct OfficialMissionParameter{
124+ char *name; //!< ミッション識別名
125+ char *fullname; //!< ミッション正式名称
126+ char *directory; //!< データディレクトリ
127+ char *txt; //!< ファイル名(.pd1/.txt)
128+ bool collision; //!< 追加の当たり判定を示すフラグ
129+ bool screen; //!< 画面を暗くするフラグ
130+};
131+
122132 //! AIレベルによる設定(性能値)用構造体
123133 struct AIParameter{
124134 int aiming; //!< エイミング能力
@@ -140,6 +150,7 @@
140150 #endif
141151 SmallObjectParameter *SmallObject; //!< 小物の情報を格納するポインタ
142152 BulletParameter *Bullet; //!< 銃弾オブジェクトの情報を格納するポインタ
153+ OfficialMissionParameter *MissionData; //!< 標準ミッションの情報を格納するポインタ
143154 char *missionname[TOTAL_OFFICIALMISSION]; //!< 標準ミッションのミッション識別名
144155 char *missionfullname[TOTAL_OFFICIALMISSION]; //!< 標準ミッションのミッション正式名称
145156 char *missiondirectory[TOTAL_OFFICIALMISSION]; //!< 標準ミッションのデータディレクトリ
@@ -160,7 +171,7 @@
160171 #endif
161172 int GetSmallObject(int id, SmallObjectParameter *out_data);
162173 int GetBullet(int id, BulletParameter *out_data);
163- int GetOfficialMission(int id, char *name, char *fullname, char* directory, char *txt, bool *collisionflag);
174+ int GetOfficialMission(int id, char *name, char *fullname, char* directory, char *txt, bool *collisionflag, bool *screenflag);
164175 int GetAIlevel(int level, AIParameter **out_AIlevel);
165176 };
166177