X operations(XOPS)に非常に近いFPSゲームを制作・リメイクし、成果物をオープンソースとして公開することを目的としたプロジェクトです。
| Revision | 125 (tree) |
|---|---|
| Time | 2016-03-20 11:24:39 |
| Author | |
文字列へのヌル文字代入を \0 へ統一
| @@ -309,7 +309,7 @@ | ||
| 309 | 309 | |
| 310 | 310 | //マジックコード取得 |
| 311 | 311 | fgets(buf, 256, fp); |
| 312 | - buf[ strlen("xof 0302txt") ] = 0x00; | |
| 312 | + buf[ strlen("xof 0302txt") ] = '\0'; | |
| 313 | 313 | if( strcmp(buf, "xof 0302txt") != 0 ){ |
| 314 | 314 | fclose( fp ); |
| 315 | 315 | return -1; //Xファイルでない |
| @@ -317,7 +317,7 @@ | ||
| 317 | 317 | |
| 318 | 318 | while( fgets(buf, 256, fp) != NULL ){ |
| 319 | 319 | strcpy(str, buf); |
| 320 | - str[ strlen("Mesh") ] = 0x00; | |
| 320 | + str[ strlen("Mesh") ] = '\0'; | |
| 321 | 321 | if( strcmp(str, "Mesh") == 0 ){ |
| 322 | 322 | |
| 323 | 323 | fgets(buf, 256, fp); |
| @@ -369,7 +369,7 @@ | ||
| 369 | 369 | |
| 370 | 370 | while( fgets(buf, 256, fp) != NULL ){ |
| 371 | 371 | strcpy(str, buf); |
| 372 | - str[ strlen(" MeshTextureCoords") ] = 0x00; | |
| 372 | + str[ strlen(" MeshTextureCoords") ] = '\0'; | |
| 373 | 373 | if( strcmp(str, " MeshTextureCoords") == 0 ){ |
| 374 | 374 | |
| 375 | 375 | fgets(buf, 256, fp); |
| @@ -606,7 +606,7 @@ | ||
| 606 | 606 | for(int i=0; i<strlen(filename); i++){ |
| 607 | 607 | filename2[i] = (char)tolower(filename[i]); |
| 608 | 608 | } |
| 609 | - filename2[ strlen(filename) ] = NULL; | |
| 609 | + filename2[ strlen(filename) ] = '\0'; | |
| 610 | 610 | |
| 611 | 611 | //拡張子でファイルフォーマットを判定 |
| 612 | 612 | for(int i=strlen(filename2)-1; i>0; i--){ |
| @@ -39,15 +39,15 @@ | ||
| 39 | 39 | { |
| 40 | 40 | Human = NULL; |
| 41 | 41 | for(int i=0; i<TOTAL_HUMANTEXTURE; i++){ |
| 42 | - HumanTexturePath[i] = NULL; | |
| 42 | + HumanTexturePath[i] = '\0'; | |
| 43 | 43 | } |
| 44 | 44 | Weapon = NULL; |
| 45 | 45 | SmallObject = NULL; |
| 46 | 46 | for(int i=0; i<TOTAL_OFFICIALMISSION; i++){ |
| 47 | - missionname[i] = NULL; | |
| 48 | - missionfullname[i] = NULL; | |
| 49 | - missiondirectory[i] = NULL; | |
| 50 | - missiontxt[i] = NULL; | |
| 47 | + missionname[i] = '\0'; | |
| 48 | + missionfullname[i] = '\0'; | |
| 49 | + missiondirectory[i] = '\0'; | |
| 50 | + missiontxt[i] = '\0'; | |
| 51 | 51 | } |
| 52 | 52 | AIlevel = NULL; |
| 53 | 53 | } |
| @@ -2124,7 +2124,7 @@ | ||
| 2124 | 2124 | int Player_teamID; |
| 2125 | 2125 | |
| 2126 | 2126 | //文字を初期化 |
| 2127 | - infostr[0] = NULL; | |
| 2127 | + infostr[0] = '\0'; | |
| 2128 | 2128 | |
| 2129 | 2129 | //プレイヤーのチーム番号を取得 |
| 2130 | 2130 | HumanIndex[Player_HumanID].GetParamData(NULL, NULL, NULL, &Player_teamID); |
| @@ -365,7 +365,7 @@ | ||
| 365 | 365 | //イベントメッセージ初期化 |
| 366 | 366 | for(int i=0; i<MAX_POINTMESSAGES; i++){ |
| 367 | 367 | text[i] = new char[MAX_POINTMESSAGEBYTE]; |
| 368 | - text[i][0] = NULL; | |
| 368 | + text[i][0] = '\0'; | |
| 369 | 369 | } |
| 370 | 370 | } |
| 371 | 371 |
| @@ -453,7 +453,7 @@ | ||
| 453 | 453 | //PathRemoveExtension(fname2); |
| 454 | 454 | for(int i=strlen(fname2)-1; i>0; i--){ |
| 455 | 455 | if( fname2[i] == '.' ){ |
| 456 | - fname2[i] = 0x00; | |
| 456 | + fname2[i] = '\0'; | |
| 457 | 457 | break; |
| 458 | 458 | } |
| 459 | 459 | } |
| @@ -1069,7 +1069,7 @@ | ||
| 1069 | 1069 | for(int j=0; j<(int)strlen(mission_name[i]); j++){ |
| 1070 | 1070 | mission_name_c[i][j] = (char)tolower(mission_name[i][j]); |
| 1071 | 1071 | } |
| 1072 | - mission_name_c[i][strlen(mission_name[i])] = 0x00; | |
| 1072 | + mission_name_c[i][strlen(mission_name[i])] = '\0'; | |
| 1073 | 1073 | } |
| 1074 | 1074 | |
| 1075 | 1075 | //低速なバブルソート (^^; |
| @@ -410,7 +410,7 @@ | ||
| 410 | 410 | //! @brief コンストラクタ |
| 411 | 411 | mainmenu::mainmenu() |
| 412 | 412 | { |
| 413 | - demopath[0] = 0x00; | |
| 413 | + demopath[0] = '\0'; | |
| 414 | 414 | mainmenu_scrollitems_official = 0; |
| 415 | 415 | mainmenu_scrollitems_addon = 0; |
| 416 | 416 | } |
| @@ -1065,7 +1065,7 @@ | ||
| 1065 | 1065 | strcpy(path, bdata); |
| 1066 | 1066 | for(int i=strlen(path)-1; i>0; i--){ |
| 1067 | 1067 | if( path[i] == '\\' ){ |
| 1068 | - path[i+1] = 0x00; | |
| 1068 | + path[i+1] = '\0'; | |
| 1069 | 1069 | break; |
| 1070 | 1070 | } |
| 1071 | 1071 | } |
| @@ -1155,10 +1155,10 @@ | ||
| 1155 | 1155 | InputConsoleData = new ConsoleData; |
| 1156 | 1156 | for(int i=0; i<MAX_CONSOLELINES; i++){ |
| 1157 | 1157 | InfoConsoleData[i].color = d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f); |
| 1158 | - InfoConsoleData[i].textdata[0] = NULL; | |
| 1158 | + InfoConsoleData[i].textdata[0] = '\0'; | |
| 1159 | 1159 | } |
| 1160 | 1160 | InputConsoleData->color = d3dg->GetColorCode(1.0f,1.0f,0.0f,1.0f); |
| 1161 | - InputConsoleData->textdata[0] = NULL; | |
| 1161 | + InputConsoleData->textdata[0] = '\0'; | |
| 1162 | 1162 | AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), "Game Debug Console."); |
| 1163 | 1163 | AddInfoConsole(d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f), " Command list >help"); |
| 1164 | 1164 | #endif |
| @@ -1186,7 +1186,7 @@ | ||
| 1186 | 1186 | strcpy(path, bdata); |
| 1187 | 1187 | for(int i=strlen(path)-1; i>0; i--){ |
| 1188 | 1188 | if( path[i] == '\\' ){ |
| 1189 | - path[i+1] = 0x00; | |
| 1189 | + path[i+1] = '\0'; | |
| 1190 | 1190 | break; |
| 1191 | 1191 | } |
| 1192 | 1192 | } |
| @@ -2128,7 +2128,7 @@ | ||
| 2128 | 2128 | //左下エリア描画 |
| 2129 | 2129 | //"ウエエエエエエオ" |
| 2130 | 2130 | stru[0] = 0xB3; stru[1] = 0xB4; stru[2] = 0xB4; stru[3] = 0xB4; stru[4] = 0xB4; |
| 2131 | - stru[5] = 0xB4; stru[6] = 0xB4; stru[7] = 0xB5; stru[8] = 0x00; | |
| 2131 | + stru[5] = 0xB4; stru[6] = 0xB4; stru[7] = 0xB5; stru[8] = '\0'; | |
| 2132 | 2132 | d3dg->Draw2DTextureFontText(15, SCREEN_HEIGHT - 105, (char*)stru, d3dg->GetColorCode(1.0f,1.0f,1.0f,0.5f), 32, 32); |
| 2133 | 2133 | //"テトトトトトトナ" |
| 2134 | 2134 | for(int i=0; stru[i] != 0x00; i++){ stru[i] += 0x10; } |
| @@ -2135,7 +2135,7 @@ | ||
| 2135 | 2135 | d3dg->Draw2DTextureFontText(15, SCREEN_HEIGHT - 105 +32, (char*)stru, d3dg->GetColorCode(1.0f,1.0f,1.0f,0.5f), 32, 32); |
| 2136 | 2136 | //"ウエエカキキキクケ" |
| 2137 | 2137 | stru[0] = 0xB3; stru[1] = 0xB4; stru[2] = 0xB4; stru[3] = 0xB6; stru[4] = 0xB7; |
| 2138 | - stru[5] = 0xB7; stru[6] = 0xB7; stru[7] = 0xB8; stru[8] = 0xB9; stru[9] = 0x00; | |
| 2138 | + stru[5] = 0xB7; stru[6] = 0xB7; stru[7] = 0xB8; stru[8] = 0xB9; stru[9] = '\0'; | |
| 2139 | 2139 | d3dg->Draw2DTextureFontText(15, SCREEN_HEIGHT - 55, (char*)stru, d3dg->GetColorCode(1.0f,1.0f,1.0f,0.5f), 32, 32); |
| 2140 | 2140 | //"テトトニヌヌヌネノ" |
| 2141 | 2141 | for(int i=0; stru[i] != 0x00; i++){ stru[i] += 0x10; } |
| @@ -2147,7 +2147,7 @@ | ||
| 2147 | 2147 | stru[i] = 0xB1;//'ア'; |
| 2148 | 2148 | } |
| 2149 | 2149 | stru[HUDA_WEAPON_SIZEW-1] = 0xB2;//'イ'; |
| 2150 | - stru[HUDA_WEAPON_SIZEW] = 0x00; | |
| 2150 | + stru[HUDA_WEAPON_SIZEW] = '\0'; | |
| 2151 | 2151 | |
| 2152 | 2152 | //右下エリア描画 |
| 2153 | 2153 | d3dg->Draw2DTextureFontText(HUDA_WEAPON_POSX, HUDA_WEAPON_POSY, (char*)stru, d3dg->GetColorCode(1.0f,1.0f,1.0f,0.5f), 32, 32); |
| @@ -2267,9 +2267,9 @@ | ||
| 2267 | 2267 | d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGHT/2-13, SCREEN_WIDTH/2, SCREEN_HEIGHT/2-3, d3dg->GetColorCode(1.0f,0.0f,0.0f,1.0f)); |
| 2268 | 2268 | d3dg->Draw2DLine(SCREEN_WIDTH/2, SCREEN_HEIGHT/2+13, SCREEN_WIDTH/2, SCREEN_HEIGHT/2+3, d3dg->GetColorCode(1.0f,0.0f,0.0f,1.0f)); |
| 2269 | 2269 | |
| 2270 | - stru[0] = 0xBD; stru[1] = 0x00; //"ス" | |
| 2270 | + stru[0] = 0xBD; stru[1] = '\0'; //"ス" | |
| 2271 | 2271 | d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 16 - ErrorRange, SCREEN_HEIGHT/2 - 16, (char*)stru, d3dg->GetColorCode(1.0f,0.0f,0.0f,0.5f), 32, 32); |
| 2272 | - stru[0] = 0xBE; stru[1] = 0x00; //"セ" | |
| 2272 | + stru[0] = 0xBE; stru[1] = '\0'; //"セ" | |
| 2273 | 2273 | d3dg->Draw2DTextureFontText(SCREEN_WIDTH/2 - 16 + ErrorRange, SCREEN_HEIGHT/2 - 16, (char*)stru, d3dg->GetColorCode(1.0f,0.0f,0.0f,0.5f), 32, 32); |
| 2274 | 2274 | } |
| 2275 | 2275 | } |
| @@ -2586,9 +2586,9 @@ | ||
| 2586 | 2586 | void maingame::ConsoleInputText(char inchar) |
| 2587 | 2587 | { |
| 2588 | 2588 | for(int i=0; i<MAX_CONSOLELEN; i++){ |
| 2589 | - if( InputConsoleData->textdata[i] == NULL ){ | |
| 2589 | + if( InputConsoleData->textdata[i] == '\0' ){ | |
| 2590 | 2590 | InputConsoleData->textdata[i] = inchar; |
| 2591 | - InputConsoleData->textdata[i+1] = NULL; | |
| 2591 | + InputConsoleData->textdata[i+1] = '\0'; | |
| 2592 | 2592 | return; |
| 2593 | 2593 | } |
| 2594 | 2594 | } |
| @@ -2599,7 +2599,7 @@ | ||
| 2599 | 2599 | { |
| 2600 | 2600 | int s = strlen(InputConsoleData->textdata); |
| 2601 | 2601 | if( s == (int)strlen(CONSOLE_PROMPT) ){ return; } |
| 2602 | - InputConsoleData->textdata[ s-1 ] = NULL; | |
| 2602 | + InputConsoleData->textdata[ s-1 ] = '\0'; | |
| 2603 | 2603 | } |
| 2604 | 2604 | |
| 2605 | 2605 | //! @brief コマンドの判定および引数(整数値)を取得 |
| @@ -2612,7 +2612,7 @@ | ||
| 2612 | 2612 | |
| 2613 | 2613 | //コマンド名を調べる |
| 2614 | 2614 | strcpy(str, NewCommand); |
| 2615 | - str[ strlen(cmd) ] = NULL; | |
| 2615 | + str[ strlen(cmd) ] = '\0'; | |
| 2616 | 2616 | if( strcmp(str, cmd) != 0 ){ return false; } |
| 2617 | 2617 | |
| 2618 | 2618 | //「コマンド名_X」分の文字数に達しているかどうか |
| @@ -2626,7 +2626,7 @@ | ||
| 2626 | 2626 | //! @brief デバック用コンソールの入力処理 |
| 2627 | 2627 | void maingame::InputConsole() |
| 2628 | 2628 | { |
| 2629 | - NewCommand[0] = NULL; | |
| 2629 | + NewCommand[0] = '\0'; | |
| 2630 | 2630 | |
| 2631 | 2631 | if( inputCtrl->CheckKeyDown(OriginalkeycodeToDinputdef(0x0F)) ){ // [ENTER] |
| 2632 | 2632 | //何か入力されていれば〜 |
| @@ -3079,7 +3079,7 @@ | ||
| 3079 | 3079 | if( strcmp(NewCommand, "clear") == 0 ){ |
| 3080 | 3080 | for(int i=0; i<MAX_CONSOLELINES; i++){ |
| 3081 | 3081 | InfoConsoleData[i].color = d3dg->GetColorCode(1.0f,1.0f,1.0f,1.0f); |
| 3082 | - InfoConsoleData[i].textdata[0] = NULL; | |
| 3082 | + InfoConsoleData[i].textdata[0] = '\0'; | |
| 3083 | 3083 | } |
| 3084 | 3084 | } |
| 3085 | 3085 |