From c160418e0689b89f03f87972d593490aff3d7d42 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Sun, 5 Nov 2017 12:57:45 +0100 Subject: [PATCH] Convert sources from SHIFT-JIS to UTF-8. SHIFT-JIS was common in 19990, but in 2017 it's just annoying. Convert the source files with `nkf $file > ${file}_new && mv ${file}_new $file`. --- src/bot.c | 20 ++++++------ src/bot.h | 36 +++++++++++----------- src/bot_fire.c | 82 +++++++++++++++++++++++++------------------------- src/bot_func.c | 18 +++++------ src/bot_za.c | 72 ++++++++++++++++++++++---------------------- src/botstr.h | 8 ++--- src/g_cmds.c | 4 +-- src/g_ctf.c | 20 ++++++------ src/g_items.c | 22 +++++++------- src/g_local.h | 22 +++++++------- src/g_main.c | 8 ++--- src/g_save.c | 6 ++-- src/g_spawn.c | 18 +++++------ src/g_svcmds.c | 10 +++--- src/g_weapon.c | 4 +-- src/p_client.c | 4 +-- src/p_weapon.c | 32 ++++++++++---------- 17 files changed, 193 insertions(+), 193 deletions(-) diff --git a/src/bot.c b/src/bot.c index c16d6a3..6c523c3 100644 --- a/src/bot.c +++ b/src/bot.c @@ -7,19 +7,19 @@ void droptofloor (edict_t *ent); edict_t *bot_team_flag1; edict_t *bot_team_flag2; -void SetBotFlag1(edict_t *ent) //ƒ`[ƒ€1‚ÌŠø +void SetBotFlag1(edict_t *ent) //ãƒãƒ¼ãƒ 1ã®æ—— { bot_team_flag1 = ent; } -void SetBotFlag2(edict_t *ent) //ƒ`[ƒ€2‚ÌŠø +void SetBotFlag2(edict_t *ent) //ãƒãƒ¼ãƒ 2ã®æ—— { bot_team_flag2 = ent; } -edict_t *GetBotFlag1() //ƒ`[ƒ€1‚ÌŠø +edict_t *GetBotFlag1() //ãƒãƒ¼ãƒ 1ã®æ—— { return bot_team_flag1; } -edict_t *GetBotFlag2() //ƒ`[ƒ€2‚ÌŠø +edict_t *GetBotFlag2() //ãƒãƒ¼ãƒ 2ã®æ—— { return bot_team_flag2; } @@ -51,7 +51,7 @@ void SpawnItem2 (edict_t *ent, gitem_t *item) //===================================== // -// BOT—p‰ÂŽ‹”»’è +// BOT用å¯è¦–判定 // qboolean Bot_trace (edict_t *ent,edict_t *other) @@ -140,7 +140,7 @@ qboolean Bot_traceY (edict_t *ent,edict_t *other) } // -// BOT—p‰ÂŽ‹”»’è 2 +// BOT用å¯è¦–判定 2 // qboolean Bot_trace2 (edict_t *ent,vec3_t ttz) @@ -157,7 +157,7 @@ qboolean Bot_trace2 (edict_t *ent,vec3_t ttz) } // -// BOT—p‰ÂŽ‹”»’è 3 +// BOT用å¯è¦–判定 3 // qboolean Bot_traceS (edict_t *ent,edict_t *other) @@ -225,7 +225,7 @@ WATERMODE: // -// VEC’l‚©‚çyaw‚𓾂é +// VEC値ã‹ã‚‰yawã‚’å¾—ã‚‹ // float Get_yaw (vec3_t vec) @@ -266,7 +266,7 @@ float Get_pitch (vec3_t vec) } // -// VEC’l‚Æyaw’l‚ÌŠp“x·‚𓾂é +// VEC値ã¨yaw値ã®è§’度差を得る // float Get_vec_yaw (vec3_t vec,float yaw) @@ -283,7 +283,7 @@ float Get_vec_yaw (vec3_t vec,float yaw) return vecsyaw; } -//yaw ‚ɑ΂·‚évec‚Ì‘Š‘Î +//yaw ã«å¯¾ã™ã‚‹vecã®ç›¸å¯¾ float Get_vec_yaw2 (vec3_t vec,float yaw) { float vecsyaw; diff --git a/src/bot.h b/src/bot.h index 02e06f0..9896c8c 100644 --- a/src/bot.h +++ b/src/bot.h @@ -86,9 +86,9 @@ void BotEndServerFrame (edict_t *ent); void Bots_Move_NORM (edict_t *ent); //normal AI //spawn -void SetBotFlag1(edict_t *ent); //ƒ`[ƒ€1‚ÌŠø -void SetBotFlag2(edict_t *ent); //ƒ`[ƒ€2‚ÌŠø -void CTFSetupNavSpawn(); //ƒiƒr‚ÌÝ’u +void SetBotFlag1(edict_t *ent); //ãƒãƒ¼ãƒ 1ã®æ—— +void SetBotFlag2(edict_t *ent); //ãƒãƒ¼ãƒ 2ã®æ—— +void CTFSetupNavSpawn(); //ナビã®è¨­ç½® //ctf void CTFJobAssign (void); //job assign @@ -208,27 +208,27 @@ void CTFJobAssign (void); //job assign #define FIRE_CHIKEN 0x00000008 //X chiken fire #define FIRE_RUSH 0x00000010 //X rush #define FIRE_JUMPNRUSH 0x00000020 // -#define FIRE_ESTIMATE 0x00000040 //X estimate —\‘ª -#define FIRE_SCATTER 0x00000080 //scatter ƒoƒ‰ŽT‚« +#define FIRE_ESTIMATE 0x00000040 //X estimate 予測 +#define FIRE_SCATTER 0x00000080 //scatter ãƒãƒ©æ’’ã #define FIRE_RUNNIN 0x00000100 //run & shot(normal) -#define FIRE_JUMPROC 0x00000200 //X ƒWƒƒƒ“ƒv‚Ó‚Ÿ‚¢‚  +#define FIRE_JUMPROC 0x00000200 //X ジャンプãµãã„ã‚ -#define FIRE_REFUGE 0x00001000 //X ”ð“ï -#define FIRE_EXPAVOID 0x00002000 //X ”š”­‚悯 +#define FIRE_REFUGE 0x00001000 //X é¿é›£ +#define FIRE_EXPAVOID 0x00002000 //X 爆発よ㑠-#define FIRE_QUADUSE 0x00004000 //X QuadŽž‚̘AŽË•Ší‘I‘ð -#define FIRE_AVOIDINV 0x00008000 //X ‘ŠŽè‚ªƒyƒ“ƒ^‚ÌŽž“¦‚°‚é +#define FIRE_QUADUSE 0x00004000 //X Quad時ã®é€£å°„武器é¸æŠž +#define FIRE_AVOIDINV 0x00008000 //X 相手ãŒãƒšãƒ³ã‚¿ã®æ™‚逃ã’ã‚‹ -#define FIRE_BFG 0x00010000 //X •’Ê‚ÉBFG‚ðŒ‚‚Â +#define FIRE_BFG 0x00010000 //X 普通ã«BFGを撃㤠-#define FIRE_SHIFT_R 0x00020000 //X ‰EƒXƒ‰ƒCƒh -#define FIRE_SHIFT_L 0x00040000 //X ¶ƒXƒ‰ƒCƒh +#define FIRE_SHIFT_R 0x00020000 //X å³ã‚¹ãƒ©ã‚¤ãƒ‰ +#define FIRE_SHIFT_L 0x00040000 //X 左スライド -#define FIRE_SHIFT (FIRE_SHIFT_R | FIRE_SHIFT_L)//X ‰EƒXƒ‰ƒCƒh +#define FIRE_SHIFT (FIRE_SHIFT_R | FIRE_SHIFT_L)//X å³ã‚¹ãƒ©ã‚¤ãƒ‰ -#define FIRE_REFLECT 0x00080000 // •Ç‚É”½ŽË‚³‚¹‚é +#define FIRE_REFLECT 0x00080000 // å£ã«åå°„ã•ã›ã‚‹ -#define FIRE_IGNORE 0x10000000 //–³Ž‹‚µ‚Ä“¦‚°‚é +#define FIRE_IGNORE 0x10000000 //無視ã—ã¦é€ƒã’ã‚‹ // means of death @@ -320,8 +320,8 @@ typedef struct #define BOP_COMBATSKILL 4 //combat skill #define BOP_ROCJ 5 //rocket jump #define BOP_REACTION 6 //reaction skill exp. frq SEARCH ENEMY -#define BOP_VRANGE 7 //V-View of RANGE c -#define BOP_HRANGE 8 //H-View of Range ‰¡ +#define BOP_VRANGE 7 //V-View of RANGE 縦 +#define BOP_HRANGE 8 //H-View of Range 横 #define BOP_PRIWEP 9 //primary weapon #define BOP_SECWEP 10 //secondary weapon #define BOP_DODGE 11 //dodge diff --git a/src/bot_fire.c b/src/bot_fire.c index ce24a06..f8c7f5f 100644 --- a/src/bot_fire.c +++ b/src/bot_fire.c @@ -3,9 +3,9 @@ #include "m_player.h" //====================================================================== -//aimŒˆ’è +//aim決定 //ent entity -//aim aimƒXƒLƒ‹ +//aim aimスキル //yaw dist //wep weapon void Get_AimAngle(edict_t *ent,float aim,float dist,int weapon) @@ -18,7 +18,7 @@ void Get_AimAngle(edict_t *ent,float aim,float dist,int weapon) switch(weapon) { - //‘¦”»’è + //å³åˆ¤å®š case WEAP_SHOTGUN: case WEAP_SUPERSHOTGUN: case WEAP_RAILGUN: @@ -207,7 +207,7 @@ void Get_AimAngle(edict_t *ent,float aim,float dist,int weapon) //====================================================================== -//•ŠíŽg—p‰Â”\H +//武器使用å¯èƒ½ï¼Ÿ int CanUsewep(edict_t *ent,int weapon) { gitem_t *item; @@ -483,13 +483,13 @@ qboolean B_UseBfg(edict_t *ent,edict_t *target,int enewep,float aim,float distan if(k /*&& random() < 0.8*/) { client->buttons |= BUTTON_ATTACK; - zc->battlemode |= FIRE_STAYFIRE; //ƒ‚[ƒh‘JˆÚ + zc->battlemode |= FIRE_STAYFIRE; //モードé·ç§» zc->battlecount = 8 + (int)(10 * random()); trace_priority = TRP_ALLKEEP; return true; } } - //”š”­‰ñ”ð + //çˆ†ç™ºå›žé¿ else if((FFlg[skill] & FIRE_EXPAVOID) && distance < 300 /*&& random() < 0.5 */ && Bot_traceS(ent,target)) @@ -502,7 +502,7 @@ qboolean B_UseBfg(edict_t *ent,edict_t *target,int enewep,float aim,float distan return true; } } - //•’Ê + //普通 else if(!(FFlg[skill] &(FIRE_STAYFIRE | FIRE_EXPAVOID))) { if(k /*&& random() < 0.8*/) @@ -1009,10 +1009,10 @@ void Combat_LevelX(edict_t *ent,int foundedenemy,int enewep target = zc->first_target; //----------------------------------------------------------------------- - //ƒXƒe[ƒ^ƒX‚𔽉f + //ステータスをå映 //----------------------------------------------------------------------- k = false; - //—\‘ª======================== + //予測======================== if(zc->battlemode & FIRE_ESTIMATE) { mywep = Get_KindWeapon(client->pers.weapon); @@ -1077,11 +1077,11 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep //----------------------------------------------------------------------- - //ƒXƒe[ƒ^ƒX‚𔽉f + //ステータスをå映 //----------------------------------------------------------------------- - //ƒ`ƒLƒ“‚Í‘_‚¢‚ªƒLƒcƒC============== + //ãƒã‚­ãƒ³ã¯ç‹™ã„ãŒã‚­ãƒ„イ============== if(zc->battlemode == FIRE_CHIKEN) aim *= 0.7; - //¶‰E‚ɉñ”ð======================== + //å·¦å³ã«å›žé¿======================== if(zc->battlemode & FIRE_SHIFT) { mywep = Get_KindWeapon(client->pers.weapon); @@ -1101,7 +1101,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep zc->moveyaw = ent->s.angles[YAW] - 90; if(zc->moveyaw < -180) zc->moveyaw += 360; } - trace_priority = TRP_MOVEKEEP; //Œã‘Þˆ— + trace_priority = TRP_MOVEKEEP; //å¾Œé€€å‡¦ç† } } else @@ -1150,7 +1150,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep } } } - //–³Ž‹‚µ‚Ä‘–‚é======================== + //無視ã—ã¦èµ°ã‚‹======================== if(zc->battlemode & FIRE_IGNORE) { if(--zc->battlecount > 0) @@ -1164,7 +1164,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep zc->battlemode = 0; } - //—§‚¿Ž~‚Ü‚Á‚ÄŒ‚‚€”õ======================== + //ç«‹ã¡æ­¢ã¾ã£ã¦æ’ƒã¤æº–å‚™======================== if(zc->battlemode & FIRE_PRESTAYFIRE) { if(--zc->battlecount > 0) @@ -1172,14 +1172,14 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep mywep = Get_KindWeapon(client->pers.weapon); Get_AimAngle(ent,aim,distance,mywep); if(target->client->weaponstate == WEAPON_FIRING && ent->groundentity) ent->client->ps.pmove.pm_flags |= PMF_DUCKED; - trace_priority = TRP_ALLKEEP; //“®‚©‚È‚¢ + trace_priority = TRP_ALLKEEP; //å‹•ã‹ãªã„ return; } - if(!(zc->battlemode & FIRE_SHIFT)) zc->battlemode = FIRE_STAYFIRE; //ƒ‚[ƒh‘JˆÚ + if(!(zc->battlemode & FIRE_SHIFT)) zc->battlemode = FIRE_STAYFIRE; //モードé·ç§» zc->battlecount = 5 + (int)(20 * random()); } - //—§‚¿Ž~‚Ü‚Á‚ÄŒ‚‚Â======================== + //ç«‹ã¡æ­¢ã¾ã£ã¦æ’ƒã¤======================== if(zc->battlemode & FIRE_STAYFIRE) { if(--zc->battlecount > 0) @@ -1196,7 +1196,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep } else client->ps.pmove.pm_flags |= PMF_DUCKED; } - if(!(zc->battlemode & FIRE_SHIFT)) trace_priority = TRP_ALLKEEP; //“®‚©‚È‚¢ + if(!(zc->battlemode & FIRE_SHIFT)) trace_priority = TRP_ALLKEEP; //å‹•ã‹ãªã„ if(Bot_traceS(ent,target) || mywep == WEAP_BFG || mywep == WEAP_GRENADELAUNCHER) client->buttons |= BUTTON_ATTACK; @@ -1205,7 +1205,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep zc->battlemode = 0; } - //FIRE_RUSH ‚‚Á‚±‚Þ======================== + //FIRE_RUSH ã¤ã£ã“ã‚€======================== if(zc->battlemode & FIRE_RUSH) { if(--zc->battlecount > 0) @@ -1222,7 +1222,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep } else client->ps.pmove.pm_flags |= PMF_DUCKED; } - trace_priority = TRP_MOVEKEEP; //Œã‘Þˆ— + trace_priority = TRP_MOVEKEEP; //å¾Œé€€å‡¦ç† zc->moveyaw = ent->s.angles[YAW]; if(Bot_traceS(ent,target)) client->buttons |= BUTTON_ATTACK; @@ -1231,7 +1231,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep zc->battlemode = 0; } - //Œã‘Þƒtƒ@ƒCƒA(”š”­‰ñ”ð)======================== + //後退ファイア(爆発回é¿)======================== if(zc->battlemode & FIRE_EXPAVOID) { if(--zc->battlecount > 0) @@ -1248,7 +1248,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep } else client->ps.pmove.pm_flags |= PMF_DUCKED; } - trace_priority = TRP_MOVEKEEP; //Œã‘Þˆ— + trace_priority = TRP_MOVEKEEP; //å¾Œé€€å‡¦ç† zc->moveyaw = ent->s.angles[YAW] + 180; if(zc->moveyaw > 180) zc->moveyaw -= 360; @@ -1259,7 +1259,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep } zc->battlemode = 0; } - //‚a‚e‚fƒtƒ@ƒCƒA(”š”­‰ñ”ð)======================== + //ＢＦＧファイア(爆発回é¿)======================== if(zc->battlemode & FIRE_BFG) { if(--zc->battlecount > 0) @@ -1276,7 +1276,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep } else client->ps.pmove.pm_flags |= PMF_DUCKED; } - trace_priority = TRP_ANGLEKEEP; //Œã‘Þˆ— + trace_priority = TRP_ANGLEKEEP; //å¾Œé€€å‡¦ç† if(Bot_traceS(ent,target) || mywep == WEAP_BFG @@ -1286,7 +1286,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep zc->battlemode = 0; } - //Œ‚‚Á‚Ä”ð“ï======================== + //æ’ƒã£ã¦é¿é›£======================== if(zc->battlemode & FIRE_REFUGE) { if(--zc->battlecount > 0) @@ -1303,8 +1303,8 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep } else client->ps.pmove.pm_flags |= PMF_DUCKED; } - trace_priority = TRP_ANGLEKEEP; //“®‚©‚È‚¢ -// trace_priority = TRP_ALLKEEP; //“®‚©‚È‚¢ + trace_priority = TRP_ANGLEKEEP; //å‹•ã‹ãªã„ +// trace_priority = TRP_ALLKEEP; //å‹•ã‹ãªã„ if(Bot_traceS(ent,target) || mywep == WEAP_BFG || mywep == WEAP_GRENADELAUNCHER) client->buttons |= BUTTON_ATTACK; @@ -1339,11 +1339,11 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep } //----------------------------------------------------------------------- - //“ÁŽêƒtƒ@ƒCƒAƒŠƒ“ƒO + //特殊ファイアリング //----------------------------------------------------------------------- mywep = Get_KindWeapon(client->pers.weapon); - //¶‰E‰ñ”ðƒZƒbƒg======================== + //å·¦å³å›žé¿ã‚»ãƒƒãƒˆ======================== if(!(zc->battlemode & FIRE_SHIFT) && skill > (random() * skill) /*&& distance < 250*/ && (30 * random()) < Bot[zc->botindex].param[BOP_OFFENCE]) { @@ -1377,7 +1377,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep f = -(f + 360); } - //‰´‚ð‚Ý‚Ä‚¢‚éII + //俺をã¿ã¦ã„ã‚‹ï¼ï¼ if(f <= -160) { @@ -1392,18 +1392,18 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep } } - //“G‚ªƒyƒ“ƒ^‚ð‚Æ‚Á‚Ä‚¢‚é======================== + //敵ãŒãƒšãƒ³ã‚¿ã‚’ã¨ã£ã¦ã„ã‚‹======================== if((FFlg[skill] & FIRE_AVOIDINV) && target->client->invincible_framenum > level.framenum) { // mywep = Get_KindWeapon(client->pers.weapon); Get_AimAngle(ent,aim,distance,mywep); - trace_priority = TRP_MOVEKEEP; //Œã‘Þˆ— + trace_priority = TRP_MOVEKEEP; //å¾Œé€€å‡¦ç† zc->moveyaw = ent->s.angles[YAW] + 180; if(zc->moveyaw > 180) zc->moveyaw -= 360; return; } - //QuadŽž‚̈—================================= + //Quad時ã®å‡¦ç†================================= if((FFlg[skill] & FIRE_QUADUSE) && (ent->client->quad_framenum > level.framenum) && distance < 300) @@ -1468,7 +1468,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep return; } } - //Œ‚‚Á‚Ä“¦‚°‚鈗================================= + //æ’ƒã£ã¦é€ƒã’る処ç†================================= if((FFlg[skill] & FIRE_REFUGE) && zc->battlemode == 0 && zc->route_trace && zc->routeindex > 1 ) { @@ -1485,17 +1485,17 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep || mywep == WEAP_ROCKETLAUNCHER || mywep == WEAP_PHALANX) { - zc->battlemode |= FIRE_REFUGE; //ƒ‚[ƒh‘JˆÚ + zc->battlemode |= FIRE_REFUGE; //モードé·ç§» zc->battlecount = 8 + (int)(10 * random()); trace_priority = TRP_ALLKEEP; return; } } } - //ƒgƒŒ[ƒX’†ˆÈŠO‚Ì‚Æ‚«‚ɃOƒ‹ƒOƒ‹‚ð–h‚®================================= + //トレース中以外ã®ã¨ãã«ã‚°ãƒ«ã‚°ãƒ«ã‚’防ã================================= if(!zc->route_trace && distance < 100) { - zc->battlemode |= FIRE_EXPAVOID; //ƒ‚[ƒh‘JˆÚ + zc->battlemode |= FIRE_EXPAVOID; //モードé·ç§» zc->battlecount = 4 + (int)(8 * random()); trace_priority = TRP_ALLKEEP; } @@ -1503,7 +1503,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep //----------------------------------------------------------------------- - //ƒvƒ‰ƒCƒIƒŠƒeƒB + //プライオリティ //----------------------------------------------------------------------- //BFG if(distance > 200) @@ -1624,7 +1624,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep //----------------------------------------------------------------------- - //’Êíƒtƒ@ƒCƒAƒŠƒ“ƒO + //通常ファイアリング //----------------------------------------------------------------------- zc->secwep_selected = 0; //BFG @@ -1723,7 +1723,7 @@ void Combat_Level0(edict_t *ent,int foundedenemy,int enewep FIRED: if(zc->secwep_selected == 2) zc->secwep_selected = 1; - //ƒ`ƒLƒ“‚â‚낤======================== + //ãƒã‚­ãƒ³ã‚„ã‚ã†======================== if(zc->battlemode == FIRE_CHIKEN) { if(--zc->battlesubcnt > 0 && ent->groundentity && ent->waterlevel < 2) diff --git a/src/bot_func.c b/src/bot_func.c index 34c6f56..46a352a 100644 --- a/src/bot_func.c +++ b/src/bot_func.c @@ -94,7 +94,7 @@ void Load_BotInfo() } else { - fseek( fp, 0, SEEK_SET); //擪‚ÖˆÚ“® + fseek( fp, 0, SEEK_SET); //先頭ã¸ç§»å‹• while(1) { if(fgets( Buff, sizeof(Buff), fp ) == NULL) goto MESS_NOTFOUND; @@ -113,7 +113,7 @@ MESS_NOTFOUND: //if(botlist->string == NULL) strcpy(MessageSection,BOTLIST_SECTION_DM); //else sprintf(MessageSection,"[%s]",botlist->string); - fseek( fp, 0, SEEK_SET); //擪‚ÖˆÚ“® + fseek( fp, 0, SEEK_SET); //先頭ã¸ç§»å‹• while(1) { if(fgets( Buff, sizeof(Buff), fp ) == NULL) @@ -127,7 +127,7 @@ MESS_NOTFOUND: if(MessageSection[0] == 0) { strcpy(MessageSection,BOTLIST_SECTION_DM); - fseek( fp, 0, SEEK_SET); //擪‚ÖˆÚ“® + fseek( fp, 0, SEEK_SET); //先頭ã¸ç§»å‹• while(1) { if(fgets( Buff, sizeof(Buff), fp ) == NULL) goto BOTLIST_NOTFOUND; @@ -222,7 +222,7 @@ BOTLIST_NOTFOUND: // //---------------------------------------------------------------- -int Get_NumOfPlayer (void) //Bot‚àŠÜ‚ß‚½player‚Ì” +int Get_NumOfPlayer (void) //Botã‚‚å«ã‚ãŸplayerã®æ•° { int i,j; edict_t *ent; @@ -465,8 +465,8 @@ void PutBotInServer (edict_t *ent) ent->pain_debounce_time = level.time; ent->targetname = NULL; - ent->moveinfo.speed = 1.0; //ƒWƒƒƒ“ƒv’†‚̈ړ®—¦‚ɂ‚¢‚ĒljÁ - ent->moveinfo.state = GETTER; //CTFƒXƒe[ƒ^ƒX‰Šú‰» + ent->moveinfo.speed = 1.0; //ジャンプ中ã®ç§»å‹•çŽ‡ã«ã¤ã„ã¦è¿½åŠ  + ent->moveinfo.state = GETTER; //CTFステータスåˆæœŸåŒ– ent->prethink = NULL; ent->think = Bot_Think; @@ -829,7 +829,7 @@ void ZigockClientJoin(edict_t *ent,int zclass) { PMenu_Close(ent); - ent->moveinfo.sound_end = CLS_ALPHA; //PutClient‚Ì‘O‚ɃNƒ‰ƒXŒˆ’è + ent->moveinfo.sound_end = CLS_ALPHA; //PutClientã®å‰ã«ã‚¯ãƒ©ã‚¹æ±ºå®š ent->svflags &= ~SVF_NOCLIENT; PutClientInServer (ent); @@ -971,7 +971,7 @@ void AirStrike_Think(edict_t *ent) if( target->classname[0] == 'p') { - //ctf ‚È‚çƒ`[ƒ€ƒƒCƒg–³Ž‹ + //ctf ãªã‚‰ãƒãƒ¼ãƒ ãƒ¡ã‚¤ãƒˆç„¡è¦– if(!ctf->value || (ctf->value && ent->owner->client->resp.ctf_team != target->client->resp.ctf_team)) { rs_trace = gi.trace (point,NULL,NULL,target->s.origin,ent, CONTENTS_SOLID | CONTENTS_WINDOW | CONTENTS_LAVA | CONTENTS_SLIME); @@ -1020,7 +1020,7 @@ void Cmd_AirStrike(edict_t *ent) }*/ VectorCopy(rs_trace.endpos,strpoint); - strpoint[2] -= 16; //‚¿‚å‚Á‚Æ‚¾‚¯‰º‚Ö‚¸‚ç‚· + strpoint[2] -= 16; //ã¡ã‚‡ã£ã¨ã ã‘下ã¸ãšã‚‰ã™ f = ent->s.angles[YAW]*M_PI*2 / 360; tts[0] = cos(f) * (-8190) ; diff --git a/src/bot_za.c b/src/bot_za.c index 30fd9a1..e15c400 100644 --- a/src/bot_za.c +++ b/src/bot_za.c @@ -214,7 +214,7 @@ int Bot_SearchEnemy (edict_t *ent) if((9 * random()) < yaw) { //gi.bprintf(PRINT_HIGH,"Team stateON\n"); - //‘ŠŽè‚ªƒŠ[ƒ_[ + //相手ãŒãƒªãƒ¼ãƒ€ãƒ¼ if(trent->client->zc.tmplstate == TMS_LEADER) { trent->client->zc.followmate = NULL; @@ -335,7 +335,7 @@ int Bot_SearchEnemy (edict_t *ent) } } } - //‰¹‚Ì‚Ý‚Åꊂ𔻒f + //音ã®ã¿ã§å ´æ‰€ã‚’判断 else { if(Bot[ent->client->zc.botindex].param[BOP_NOISECHK] @@ -890,7 +890,7 @@ void Bot_SearchItems (edict_t *ent) } //----------------------------------------------------------------------------------------- -//ƒoƒNƒnƒc•¨‰ñ”ð +//ãƒã‚¯ãƒãƒ„ç‰©å›žé¿ //Avoid explotion // #define EXPLO_BOXSIZE 64 @@ -932,7 +932,7 @@ qboolean Bot_ExploAvoid(edict_t *ent,vec3_t v) return true; } -//ƒŒ[ƒU[‚̃`ƒFƒbƒN +//レーザーã®ãƒã‚§ãƒƒã‚¯ qboolean CheckLaser(vec3_t pos,vec3_t maxs,vec3_t mins) { int i; @@ -978,7 +978,7 @@ qboolean CheckLaser(vec3_t pos,vec3_t maxs,vec3_t mins) } //----------------------------------------------------------------------------------------- -// BOTˆÚ“®‰Â”\”»’ènew +// BOT移動å¯èƒ½åˆ¤å®šnew // bot move test // return false can't // true stand @@ -997,7 +997,7 @@ int Bot_moveT ( edict_t *ent,float ryaw,vec3_t pos,float dist,float *bottom) - tcontents =/* MASK_BOTSOLID*/MASK_BOTSOLIDX;//MASK_PLAYERSOLID /*| CONTENTS_TRANSLUCENT*/; //ƒŒ[ƒU[‚É‚ÍG‚ç‚È‚¢ + tcontents =/* MASK_BOTSOLID*/MASK_BOTSOLIDX;//MASK_PLAYERSOLID /*| CONTENTS_TRANSLUCENT*/; //レーザーã«ã¯è§¦ã‚‰ãªã„ // if(!ent->waterlevel) tcontents |= CONTENTS_WATER; if(/*ent->client->zc.waterstate == WAS_FLOAT*/ent->waterlevel >= 1/*2*/) tracelimit = 75;//75;//61; @@ -1021,7 +1021,7 @@ int Bot_moveT ( edict_t *ent,float ryaw,vec3_t pos,float dist,float *bottom) if((v[2] - ent->s.origin[2]) > 20) trmax[2] = 31; } - //ˆÚ“®æ‚ª‚Ç‚¤‚È‚Á‚Ä‚¢‚é‚Ì‚©’²‚ׂé + //移動先ãŒã©ã†ãªã£ã¦ã„ã‚‹ã®ã‹èª¿ã¹ã‚‹ yaw = ryaw*M_PI*2 / 360; trend[0] = cos(yaw) * dist ; //start trend[1] = sin(yaw) * dist ; @@ -1033,7 +1033,7 @@ int Bot_moveT ( edict_t *ent,float ryaw,vec3_t pos,float dist,float *bottom) rs_trace = gi.trace (trstart, trmin, trmax, trend,ent, tcontents); trmax[2] += 1; - if(rs_trace.allsolid || rs_trace.startsolid || rs_trace.fraction != 1.0) //‘O‚É‚Íi‚ß‚È‚¢ê‡ + if(rs_trace.allsolid || rs_trace.startsolid || rs_trace.fraction != 1.0) //å‰ã«ã¯é€²ã‚ãªã„å ´åˆ { moveok = false; VectorCopy (trstart, trend); @@ -1119,7 +1119,7 @@ int Bot_moveT ( edict_t *ent,float ryaw,vec3_t pos,float dist,float *bottom) if(!rs_trace.allsolid && !rs_trace.startsolid) return true; return 2;*/ } - else //i‚ß‚½‚Æ‚µ‚Ä‚à—Ž‚¿‚½‚­‚È‚¢Žž‚Ì‚½‚߂̃`ƒFƒbƒN + else //進ã‚ãŸã¨ã—ã¦ã‚‚è½ã¡ãŸããªã„時ã®ãŸã‚ã®ãƒã‚§ãƒƒã‚¯ { pos[0] = trstart[0]; pos[1] = trstart[1]; @@ -1328,7 +1328,7 @@ int Bot_moveW ( edict_t *ent,float ryaw,vec3_t pos,float dist,float *bottom) tcontents = MASK_BOTSOLIDX/*MASK_PLAYERSOLID*/; tcontents |= CONTENTS_WATER; - //ˆÚ“®æ‚ª‚Ç‚¤‚È‚Á‚Ä‚¢‚é‚Ì‚©’²‚ׂé + //移動先ãŒã©ã†ãªã£ã¦ã„ã‚‹ã®ã‹èª¿ã¹ã‚‹ yaw = ryaw*M_PI*2 / 360; trend[0] = cos(yaw) * dist ; //start trend[1] = sin(yaw) * dist ; @@ -1735,7 +1735,7 @@ qboolean Bot_Fall(edict_t *ent,vec3_t pos,float dist) VectorCopy(v,vv); vv[2] = 0; - //vell—¶‚Ì—Ž‰º + //vel考慮ã®è½ä¸‹ if(Route[zc->routeindex].state == GRS_ONTRAIN) { if(1/*Route[zc->routeindex].ent->trainteam == NULL*/) @@ -1815,7 +1815,7 @@ JUMPCATCH: vv[2] = 0; if(mode == 2) { - //vell—¶‚Ì—Ž‰º + //vel考慮ã®è½ä¸‹ if(Route[zc->routeindex].state == GRS_ONTRAIN) { if(1/*Route[zc->routeindex].ent->trainteam == NULL*/) @@ -2551,7 +2551,7 @@ if(ctf->value) j = 0; ent->maxs[2] = 4; } } -DCHCANC://‚µ‚Ⴊ‚Ý‚Á‚Ï‚È‚µ +DCHCANC://ã—ゃãŒã¿ã£ã±ãªã— //-------------------------------------------------------------------------------------- //movingspeed set if(ent->groundentity || ent->waterlevel) @@ -2682,7 +2682,7 @@ DCHCANC:// } } } - //Œ‚‚ÄGrapple + //æ’ƒã¦Grapple else if(Route[zc->routeindex - 1].state == GRS_GRAPSHOT && ent->client->ctf_grapple == NULL && zc->first_target == NULL) @@ -3034,7 +3034,7 @@ gi.bprintf(PRINT_HIGH,"OFF 5\n"); //ppx // // // - // ’òŽq‚ð“o‚é + // 梯å­ã‚’登る // // //-------------------------------------------------------------------------------------- @@ -3222,7 +3222,7 @@ gi.bprintf(PRINT_HIGH,"ladder OFF2!!\n"); // // // - // ˆÚ“®•ûŒüŒˆ’è + // 移動方å‘決定 // // //-------------------------------------------------------------------------------------- @@ -3309,7 +3309,7 @@ gi.bprintf(PRINT_HIGH,"ladder OFF2!!\n"); ent->s.angles[PITCH] = Get_pitch(temppos); } */ - //ƒ`[ƒ€ƒvƒŒƒCŽž‚̃‹[ƒ`ƒ“ + //ãƒãƒ¼ãƒ ãƒ—レイ時ã®ãƒ«ãƒ¼ãƒãƒ³ if(ctf->value ||((int)(dmflags->value) & (DF_MODELTEAMS | DF_SKINTEAMS))) { if(ctf->value) @@ -3490,7 +3490,7 @@ gi.bprintf(PRINT_HIGH,"ladder OFF2!!\n"); if(1/*!(zc->zcstate & STS_WAITSMASK)*/) { - //ƒ‹[ƒgƒgƒŒ[ƒX—pindexŒŸõ + //ルートトレース用index検索 if(!zc->route_trace && zc->rt_releasetime <= level.time) { //zc->routeindex; @@ -3636,7 +3636,7 @@ gi.bprintf(PRINT_HIGH,"ladder OFF2!!\n"); } } - //ƒgƒŠƒK‚ðŒ‚‚Â + //トリガを撃㤠if(k && !(ent->client->buttons & BUTTON_ATTACK)) { //gi.bprintf(PRINT_HIGH,"ooooooo!\n"); @@ -3656,7 +3656,7 @@ gi.bprintf(PRINT_HIGH,"ladder OFF2!!\n"); else VectorSubtract(v,ent->s.origin,trmax); //gi.bprintf(PRINT_HIGH,"shoot!\n"); - //”š”­ƒ‚ƒm‚ÌŽž‚ÍŽ‚¿‘Ö‚¦ + //爆発モノã®æ™‚ã¯æŒã¡æ›¿ãˆ i = Get_KindWeapon(ent->client->pers.weapon); if(!zc->first_target && it_ent->takedamage) { @@ -3727,7 +3727,7 @@ gi.bprintf(PRINT_HIGH,"OFF 10\n"); } else f1 = -(JumpMax + 64); } -//“ž’Bƒ`ƒFƒbƒN +//到é”ãƒã‚§ãƒƒã‚¯ if( Route[zc->routeindex].state == GRS_ONROTATE) yaw = -48; else yaw = 12; if(v[0] <= (ent->absmax[0] - yaw) && v[0] >= (ent->absmin[0] + yaw)) @@ -3740,7 +3740,7 @@ gi.bprintf(PRINT_HIGH,"OFF 10\n"); { if(zc->routeindex < CurrentIndex /*&& TraceX(ent,Route[zc->routeindex + 1].Pt)*/) { -//ƒAƒCƒeƒ€ƒŠƒ“ƒNƒ`ƒFƒbƒN1>> +//アイテムリンクãƒã‚§ãƒƒã‚¯1>> if(Route[zc->routeindex].state <= GRS_ITEMS) { if(zc->havetarget) @@ -3778,7 +3778,7 @@ gi.bprintf(PRINT_HIGH,"OFF 10\n"); } } } -//ƒAƒCƒeƒ€ƒŠƒ“ƒNƒ`ƒFƒbƒN<< +//アイテムリンクãƒã‚§ãƒƒã‚¯<< zc->routeindex++; //not a normal pod if(zc->routeindex < CurrentIndex) @@ -3853,7 +3853,7 @@ gi.bprintf(PRINT_HIGH,"OFF 10\n"); VectorCopy(temppos,ent->s.origin); VectorCopy(v,trmin); dist -= x; -//ƒAƒCƒeƒ€ƒŠƒ“ƒNƒ`ƒFƒbƒN2>> +//アイテムリンクãƒã‚§ãƒƒã‚¯2>> if(Route[zc->routeindex].state <= GRS_ITEMS) { if(zc->havetarget) @@ -3872,7 +3872,7 @@ gi.bprintf(PRINT_HIGH,"OFF 10\n"); } } } -//ƒAƒCƒeƒ€ƒŠƒ“ƒNƒ`ƒFƒbƒN<< +//アイテムリンクãƒã‚§ãƒƒã‚¯<< zc->routeindex++; if(i == 2) ent->client->ps.pmove.pm_flags |= PMF_DUCKED; @@ -3996,7 +3996,7 @@ gi.bprintf(PRINT_HIGH,"OFF 8\n"); //ppx // // // - // ‚ ‚µ‚à‚ÆŠm”F + // ã‚ã—ã‚‚ã¨ç¢ºèª // // //-------------------------------------------------------------------------------------- @@ -4633,7 +4633,7 @@ gi.bprintf(PRINT_HIGH,"ladder On!\n"); PlayerNoise(ent, ent->s.origin, PNOISE_SELF); //pon Set_BotAnim(ent,ANIM_JUMP,FRAME_jump1-1,FRAME_jump6); ent->client->buttons |= BUTTON_ATTACK; - goto VCHCANSEL; //ˆÚ“®ˆ—ƒLƒƒƒ“ƒZƒ‹ + goto VCHCANSEL; //移動処ç†ã‚­ãƒ£ãƒ³ã‚»ãƒ« } else zc->second_target = NULL; } @@ -5200,7 +5200,7 @@ GOMOVE: x = zc->second_target->s.origin[2] - ent->s.origin[2]; if(x > 13/*8*/) x = 13;//8; else if(x < -13/*8*/) x = -13;//8; - if(x < 0)//ƒAƒCƒeƒ€‰º•û + if(x < 0)//アイテム下方 { if( Bot_Watermove (ent,temppos,dist,x)) { @@ -5209,7 +5209,7 @@ GOMOVE: } } else if(x >0 && zc->waterstate == WAS_IN - && !(ent->client->ps.pmove.pm_flags & PMF_DUCKED)) //ƒAƒCƒeƒ€ã•û + && !(ent->client->ps.pmove.pm_flags & PMF_DUCKED)) //アイテム上方 { if(ent->velocity[2] < 0) ent->velocity[2] = 0; if( Bot_Watermove (ent,temppos,dist,x)) @@ -5227,7 +5227,7 @@ GOMOVE: x = v[2] - ent->s.origin[2]; if(x > 13/*8*/) x = 13;//8; else if(x < -13/*8*/) x = -13;//8; - if(x < 0)//ƒAƒCƒeƒ€‰º•û + if(x < 0)//アイテム下方 { if( Bot_Watermove (ent,temppos,dist,x)) { @@ -5237,7 +5237,7 @@ GOMOVE: } } else if(x > 0 && zc->waterstate == WAS_IN - && !(ent->client->ps.pmove.pm_flags & PMF_DUCKED)) //ƒAƒCƒeƒ€ã•û + && !(ent->client->ps.pmove.pm_flags & PMF_DUCKED)) //アイテム上方 { //gi.bprintf(PRINT_HIGH,"UP! %f\n",x); if(ent->velocity[2] < -10) ent->velocity[2] = 0; @@ -5277,7 +5277,7 @@ GOMOVE: } } if(zc->waterstate == WAS_IN) ent->moveinfo.decel = level.time; - else if(!k) //…–Ê‚É‚¸‚Á‚Æ‚¢‚½‚Æ‚« + else if(!k) //æ°´é¢ã«ãšã£ã¨ã„ãŸã¨ã { if( ( level.time - ent->moveinfo.decel) > 4.0 && !zc->route_trace) { @@ -5513,11 +5513,11 @@ GOMOVE: zc->second_target = trent; trent->target_ent = ent; - //ƒgƒOƒ‹Ž®‚Í‚·‚®‘–‚é + //トグルå¼ã¯ã™ãèµ°ã‚‹ if(e->spawnflags & PDOOR_TOGGLE) { f1 = e->moveinfo.start_origin[2] - e->moveinfo.end_origin[2]; - //ƒXƒ^[ƒg’n“_‚ªã + //スタート地点ãŒä¸Š if(f1 > 0 ) { k = true; @@ -5543,11 +5543,11 @@ GOMOVE: } } } - //ƒm[ƒ}ƒ‹ + //ノーマル else { f1 = e->moveinfo.start_origin[2] - e->moveinfo.end_origin[2]; - //ƒXƒ^[ƒg’n“_‚ªã + //スタート地点ãŒä¸Š if(f1 > 0 ) { if(e->moveinfo.state == PSTATE_BOTTOM || e->moveinfo.state == PSTATE_UP) diff --git a/src/botstr.h b/src/botstr.h index fb5ed8d..7c73867 100644 --- a/src/botstr.h +++ b/src/botstr.h @@ -10,14 +10,14 @@ typedef struct zgcl_s int botindex; //botlist's index NO. -// true client—p zoom ƒtƒ‰ƒO +// true client用 zoom フラグ int aiming; //0-not 1-aiming 2-firing zoomingflag - float distance; //zoom’†‚ÌFOV’l - float olddistance; //‹Œzooming FOV’l + float distance; //zoom中ã®FOV値 + float olddistance; //æ—§zooming FOV値 qboolean autozoom; //autozoom qboolean lockon; //lockon flag false-not true-locking -// bot—p +// bot用 int zcstate; //status int zccmbstt; //combat status diff --git a/src/g_cmds.c b/src/g_cmds.c index 740b3d4..2146d60 100644 --- a/src/g_cmds.c +++ b/src/g_cmds.c @@ -956,7 +956,7 @@ void Cmd_Say_f (edict_t *ent, qboolean team, qboolean arg0) gi.cprintf(other, PRINT_CHAT, "%s", text); } } -//ƒXƒiƒCƒp[—pZoomIn Out +//スナイパー用ZoomIn Out void Cmd_ZoomIn(edict_t *ent) { if( ent->client->zc.autozoom ) @@ -1026,7 +1026,7 @@ void Cmd_AutoZoom(edict_t *ent) } } -//chain ‚Ì undo +//chain ã® undo void UndoChain(edict_t *ent ,int step) { int count,i; diff --git a/src/g_ctf.c b/src/g_ctf.c index c7484b3..c1d2260 100644 --- a/src/g_ctf.c +++ b/src/g_ctf.c @@ -831,12 +831,12 @@ static void CTFFlagThink(edict_t *ent) void droptofloor (edict_t *ent); void SpawnItem3 (edict_t *ent, gitem_t *item); -//edict_t *GetBotFlag1(); //ƒ`[ƒ€1‚ÌŠø -//edict_t *GetBotFlag2(); //ƒ`[ƒ€2‚ÌŠø +//edict_t *GetBotFlag1(); //ãƒãƒ¼ãƒ 1ã®æ—— +//edict_t *GetBotFlag2(); //ãƒãƒ¼ãƒ 2ã®æ—— void ChainPodThink (edict_t *ent); -qboolean ChkTFlg( void );//ŠøƒZƒbƒgƒAƒbƒvÏ‚ÝH -void SetBotFlag1(edict_t *ent); //ƒ`[ƒ€1‚ÌŠø -void SetBotFlag2(edict_t *ent); //ƒ`[ƒ€2‚ÌŠø +qboolean ChkTFlg( void );//旗セットアップ済ã¿ï¼Ÿ +void SetBotFlag1(edict_t *ent); //ãƒãƒ¼ãƒ 1ã®æ—— +void SetBotFlag2(edict_t *ent); //ãƒãƒ¼ãƒ 2ã®æ—— void CTFFlagSetup (edict_t *ent) { @@ -3000,7 +3000,7 @@ void CTFSetupNavSpawn() //PONKO spawncycle = level.time + FRAMETIME * 100; //PONKO - //ƒ‹[ƒg‰Šú‰» + //ルートåˆæœŸåŒ– CurrentIndex = 0; memset(Route,0,sizeof(Route)); memset(code,0,8); @@ -3142,12 +3142,12 @@ void SpawnExtra(vec3_t position,char *classname) void CTFJobAssign (void) { int i; - int defend1,defend2; //ƒfƒBƒtƒFƒ“ƒ_[‘” - int mate1,mate2; //ƒ`[ƒ€ƒƒCƒg‘” + int defend1,defend2; //ディフェンダーç·æ•° + int mate1,mate2; //ãƒãƒ¼ãƒ ãƒ¡ã‚¤ãƒˆç·æ•° gclient_t *client; edict_t *e; - edict_t *defei1,*defei2; //Œó•â - edict_t *geti1,*geti2; //Œó•â + edict_t *defei1,*defei2; //候補 + edict_t *geti1,*geti2; //候補 defend1 = 0; defend2 = 0; diff --git a/src/g_items.c b/src/g_items.c index dadec7a..e4a0823 100644 --- a/src/g_items.c +++ b/src/g_items.c @@ -206,8 +206,8 @@ void Drop_General (edict_t *ent, gitem_t *item) } float Get_yaw (vec3_t vec); -//edict_t *GetBotFlag1(); //ƒ`[ƒ€1‚ÌŠø -//edict_t *GetBotFlag2(); //ƒ`[ƒ€2‚ÌŠø +//edict_t *GetBotFlag1(); //ãƒãƒ¼ãƒ 1ã®æ—— +//edict_t *GetBotFlag2(); //ãƒãƒ¼ãƒ 2ã®æ—— //====================================================================== qboolean Pickup_Navi (edict_t *ent, edict_t *other) { @@ -241,7 +241,7 @@ qboolean Pickup_Navi (edict_t *ent, edict_t *other) || ent->union_ent->moveinfo.state == PSTATE_BOTTOM) other->client->zc.zcstate |= STS_W_ONDOORUP; } //j = other->client->zc.routeindex - 10; - //ƒ‹[ƒg‚̃Aƒbƒvƒf[ƒg + //ルートã®ã‚¢ãƒƒãƒ—デート for(i = - MAX_DOORSEARCH; i < MAX_DOORSEARCH ;i++) { if(i <= 0) j = other->client->zc.routeindex - (MAX_DOORSEARCH - i) ; @@ -297,10 +297,10 @@ qboolean Pickup_Navi (edict_t *ent, edict_t *other) SetRespawn (ent, 1000000); ent->solid = SOLID_NOT; } - //roamnavi ‚â‚ß‚½ + //roamnavi ã‚„ã‚㟠else if( ent->classname[6] == '2') { - //ƒ‹[ƒg‚̃Aƒbƒvƒf[ƒg + //ルートã®ã‚¢ãƒƒãƒ—デート for(i = 0;i < 10;i++) { if((other->client->zc.routeindex + i) >= CurrentIndex) break; @@ -1056,7 +1056,7 @@ void Touch_Item (edict_t *ent, edict_t *other, cplane_t *plane, csurface_t *surf // else gi.bprintf(PRINT_HIGH,"get %s %x inv %i!\n",ent->classname,ent->spawnflags,other->client->pers.inventory[ITEM_INDEX(ent->item)]); k = false; - //flag set ƒtƒ@ƒ“ƒNƒVƒ‡ƒ“‚Ìã‚É‚ ‚éꇂ͖³Ž‹ + //flag set ファンクションã®ä¸Šã«ã‚ã‚‹å ´åˆã¯ç„¡è¦– if(ent->groundentity) if(ent->groundentity->union_ent) k = true; //route update @@ -1215,7 +1215,7 @@ void droptofloor (edict_t *ent) gi.setmodel (ent, ent->model); else gi.setmodel (ent, ent->item->world_model); - if(ent->classname[6] == 'F') ent->s.modelindex = 0; //‚©‚­‚¹ + if(ent->classname[6] == 'F') ent->s.modelindex = 0; //ã‹ãã› ent->solid = SOLID_TRIGGER; ent->movetype = MOVETYPE_TOSS; @@ -1373,7 +1373,7 @@ void droptofloor2 (edict_t *ent) v = tv(8,8,15); VectorCopy (v, ent->maxs); ///////// - if(ent->union_ent && Q_stricmp (ent->classname,"R_navi2")) //2‚͈ړ®‚È‚µ + if(ent->union_ent && Q_stricmp (ent->classname,"R_navi2")) //2ã¯ç§»å‹•ãªã— { // dest[0] = (ent->union_ent->s.origin[0] + ent->union_ent->mins[0] + ent->union_ent->s.origin[0] + ent->union_ent->maxs[0])/2;//ent->s.origin[0]; // dest[1] = (ent->union_ent->s.origin[1] + ent->union_ent->mins[1] + ent->union_ent->s.origin[1] + ent->union_ent->maxs[1])/2; @@ -1404,7 +1404,7 @@ void droptofloor2 (edict_t *ent) gi.setmodel (ent, ent->model); else gi.setmodel (ent, ent->item->world_model);*/ - ent->s.modelindex = 0; //‚©‚­‚¹I + ent->s.modelindex = 0; //ã‹ãã›ï¼ //ent->s.modelindex =gi.modelindex ("models/items/armor/body/tris.md2"); if(Q_stricmp (ent->classname,"R_navi3") == 0) ent->solid = SOLID_NOT; else ent->solid = SOLID_TRIGGER; @@ -1657,8 +1657,8 @@ Items can't be immediately dropped to floor, because they might be on an entity that hasn't spawned yet. ============ */ -void SetBotFlag1(edict_t *ent); //ƒ`[ƒ€1‚ÌŠø -void SetBotFlag2(edict_t *ent); //ƒ`[ƒ€2‚ÌŠø +void SetBotFlag1(edict_t *ent); //ãƒãƒ¼ãƒ 1ã®æ—— +void SetBotFlag2(edict_t *ent); //ãƒãƒ¼ãƒ 2ã®æ—— void SpawnItem (edict_t *ent, gitem_t *item) { diff --git a/src/g_local.h b/src/g_local.h index 94b99d8..a4a189e 100644 --- a/src/g_local.h +++ b/src/g_local.h @@ -392,22 +392,22 @@ typedef struct // fixed data vec3_t start_origin; vec3_t start_angles; - vec3_t end_origin; //BFG‚̃^[ƒQƒbƒgƒ|ƒCƒ“ƒg‚É•s³Žg—p + vec3_t end_origin; //BFGã®ã‚¿ãƒ¼ã‚²ãƒƒãƒˆãƒã‚¤ãƒ³ãƒˆã«ä¸æ­£ä½¿ç”¨ vec3_t end_angles; - int sound_start; //ƒXƒiƒCƒp[‚̃AƒNƒeƒBƒx[ƒgƒtƒ‰ƒO + int sound_start; //スナイパーã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ™ãƒ¼ãƒˆãƒ•ãƒ©ã‚° int sound_middle; - int sound_end; //hokuto‚̃Nƒ‰ƒX + int sound_end; //hokutoã®ã‚¯ãƒ©ã‚¹ float accel; - float speed; //bot —Ž‰ºŽž‚̈ړ®—Ê‚É•s³Žg—p - float decel; //…–Ê‘ØÝŽžŠÔ‚É•s³Žg—p - float distance; //ƒXƒiƒCƒp[—pFOV’l + float speed; //bot è½ä¸‹æ™‚ã®ç§»å‹•é‡ã«ä¸æ­£ä½¿ç”¨ + float decel; //æ°´é¢æ»žåœ¨æ™‚é–“ã«ä¸æ­£ä½¿ç”¨ + float distance; //スナイパー用FOV値 float wait; // state data - int state; //CTFƒXƒe[ƒ^ƒX‚É•s³Žg—p + int state; //CTFステータスã«ä¸æ­£ä½¿ç”¨ vec3_t dir; float current_speed; float move_speed; @@ -928,14 +928,14 @@ typedef struct zgcl_s { int zclass; //class no. -// true client—p zoom ƒtƒ‰ƒO +// true client用 zoom フラグ int aiming; //0-not 1-aiming 2-firing zoomingflag - float distance; //zoom’†‚ÌFOV’l - float olddistance; //‹Œzooming FOV’l + float distance; //zoom中ã®FOV値 + float olddistance; //æ—§zooming FOV値 qboolean autozoom; //autozoom qboolean lockon; //lockon flag false-not true-locking -// bot—p +// bot用 int zcstate; //status int botskill; //skill diff --git a/src/g_main.c b/src/g_main.c index a64a2e8..0c483d9 100644 --- a/src/g_main.c +++ b/src/g_main.c @@ -78,8 +78,8 @@ void ReadLevel (char *filename); void InitGame (void); void G_RunFrame (void); -void SetBotFlag1(edict_t *ent); //ƒ`[ƒ€1‚ÌŠø -void SetBotFlag2(edict_t *ent); //ƒ`[ƒ€2‚ÌŠø +void SetBotFlag1(edict_t *ent); //ãƒãƒ¼ãƒ 1ã®æ—— +void SetBotFlag2(edict_t *ent); //ãƒãƒ¼ãƒ 2ã®æ—— //=================================================================== @@ -545,7 +545,7 @@ void G_RunFrame (void) ctfjob_update = level.time + FRAMETIME * 2; } } -//////////Šø‚̃XƒRƒAƒ`ƒFƒbƒN +//////////æ——ã®ã‚¹ã‚³ã‚¢ãƒã‚§ãƒƒã‚¯ if(zigmode->value == 1) { if(next_fragadd < level.time) @@ -561,7 +561,7 @@ void G_RunFrame (void) g_edicts[i].client->resp.score += 1; else { - //Šø‚ðŽ‚Á‚Ä‚é‚ƃtƒ‰ƒbƒO‚ð‘«‚· + //æ——ã‚’æŒã£ã¦ã‚‹ã¨ãƒ•ãƒ©ãƒƒã‚°ã‚’足㙠for ( j = 1 ; j <= maxclients->value ; j++) { if(g_edicts[j].inuse) diff --git a/src/g_save.c b/src/g_save.c index 6936eca..2e09ac9 100644 --- a/src/g_save.c +++ b/src/g_save.c @@ -128,8 +128,8 @@ only happens when a new game is started or a save game is loaded. ============ */ -void SetBotFlag1(edict_t *ent); //ƒ`[ƒ€1‚ÌŠø -void SetBotFlag2(edict_t *ent); //ƒ`[ƒ€2‚ÌŠø +void SetBotFlag1(edict_t *ent); //ãƒãƒ¼ãƒ 1ã®æ—— +void SetBotFlag2(edict_t *ent); //ãƒãƒ¼ãƒ 2ã®æ—— void InitGame (void) { gi.dprintf ("==== InitGame ====\n"); @@ -224,7 +224,7 @@ void InitGame (void) //ZOID CTFInit(); //ZOID - Load_BotInfo(); //ƒRƒ“ƒtƒBƒO“Ç‚Ýž‚Ý3ZBConfig.cfg + Load_BotInfo(); //コンフィグ読ã¿è¾¼ã¿3ZBConfig.cfg } //========================================================= diff --git a/src/g_spawn.c b/src/g_spawn.c index 39be9aa..1cf98e9 100644 --- a/src/g_spawn.c +++ b/src/g_spawn.c @@ -788,7 +788,7 @@ void G_FindRouteLink(edict_t *ent) float x; - //Šø‚ð”­¶‚³‚¹‚é + //旗を発生ã•ã›ã‚‹ if(!ctf->value && zigmode->value == 1) { item = FindItem("Zig Flag"); @@ -926,10 +926,10 @@ Creates a server's entity / program execution context by parsing textual entity definitions out of an ent file. ============== */ -//void SetBotFlag1(edict_t *ent); //ƒ`[ƒ€1‚ÌŠø -//void SetBotFlag2(edict_t *ent); //ƒ`[ƒ€2‚ÌŠø +//void SetBotFlag1(edict_t *ent); //ãƒãƒ¼ãƒ 1ã®æ—— +//void SetBotFlag2(edict_t *ent); //ãƒãƒ¼ãƒ 2ã®æ—— -//void CTFSetupNavSpawn(); //ƒiƒr‚ÌÝ’u +//void CTFSetupNavSpawn(); //ナビã®è¨­ç½® void SpawnEntities (char *mapname, char *entities, char *spawnpoint) { edict_t *ent; @@ -1033,7 +1033,7 @@ void SpawnEntities (char *mapname, char *entities, char *spawnpoint) PlayerTrail_Init (); - //func_train‚̃Šƒ“ƒN + //func_trainã®ãƒªãƒ³ã‚¯ G_FindTrainTeam(); @@ -1043,16 +1043,16 @@ void SpawnEntities (char *mapname, char *entities, char *spawnpoint) //ZOID //ponko - CTFSetupNavSpawn(); //ƒiƒr‚ÌÝ’u - if(!chedit->value) G_FindItemLink(); //ƒAƒCƒeƒ€‚̃Šƒ“ƒN(’Ê펞‚Ì‚Ý) + CTFSetupNavSpawn(); //ナビã®è¨­ç½® + if(!chedit->value) G_FindItemLink(); //アイテムã®ãƒªãƒ³ã‚¯(通常時ã®ã¿) G_SpawnRouteLink(); if(zigmode->value == 1) zigflag_spawn = 1; else zigflag_spawn = 0; - //Šø‚̃AƒCƒeƒ€ƒAƒhƒŒƒXŽæ“¾ + //æ——ã®ã‚¢ã‚¤ãƒ†ãƒ ã‚¢ãƒ‰ãƒ¬ã‚¹å–å¾— zflag_item = FindItem("Zig Flag"); - zflag_ent = NULL; //‰Šú‰» + zflag_ent = NULL; //åˆæœŸåŒ– // if(CurrentIndex > 0) //ponko diff --git a/src/g_svcmds.c b/src/g_svcmds.c index 44cc609..d7d5901 100644 --- a/src/g_svcmds.c +++ b/src/g_svcmds.c @@ -252,8 +252,8 @@ void SVCmd_WriteIP_f (void) -//ƒ‹[ƒgC³ -//ƒm[ƒ}ƒ‹ƒ|ƒbƒh‚Í‘S‚ÄØ‚èŽÌ‚Ä +//ルート修正 +//ノーマルãƒãƒƒãƒ‰ã¯å…¨ã¦åˆ‡ã‚Šæ¨ã¦ void Move_LastRouteIndex() { int i; @@ -273,7 +273,7 @@ void Move_LastRouteIndex() } } -//•ªŠò•t‚«‚É•ÏŠ·ˆ— +//分å²ä»˜ãã«å¤‰æ›å‡¦ç† void RouteTreepointSet() { int i; @@ -296,7 +296,7 @@ void Svcmd_Test_f (void) gi.cprintf (NULL, PRINT_HIGH, "Svcmd_Test_f()\n"); } -//chainƒtƒ@ƒCƒ‹‚̃Z[ƒu +//chainファイルã®ã‚»ãƒ¼ãƒ– void SaveChain() { char name[256]; @@ -309,7 +309,7 @@ void SaveChain() return; } - //‚Æ‚è‚ ‚¦‚¸CTF‚¾‚ß + //ã¨ã‚Šã‚ãˆãšCTFã ã‚ if(ctf->value) sprintf(name,".\\%s\\chctf\\%s.chf",gamepath->string,level.mapname); else sprintf(name,".\\%s\\chdtm\\%s.chn",gamepath->string,level.mapname); diff --git a/src/g_weapon.c b/src/g_weapon.c index f1a4ce4..e06fc95 100644 --- a/src/g_weapon.c +++ b/src/g_weapon.c @@ -663,7 +663,7 @@ UpdateExplIndex(rocket); gi.linkentity (rocket); } -//ƒƒbƒNƒIƒ“ƒ~ƒTƒCƒ‹ +//ロックオンミサイル void think_lockon_rocket(edict_t *ent) { vec3_t v; @@ -715,7 +715,7 @@ void think_lockon_rocket(edict_t *ent) return; } - //ŽžŠÔØ‚ê + //時間切れ if(ent->moveinfo.accel <= level.time) { T_RadiusDamage(ent, ent->owner, ent->radius_dmg, NULL, ent->dmg_radius, MOD_R_SPLASH); diff --git a/src/p_client.c b/src/p_client.c index f0a5c7f..7c174f4 100644 --- a/src/p_client.c +++ b/src/p_client.c @@ -571,7 +571,7 @@ void player_die (edict_t *self, edict_t *inflictor, edict_t *attacker, int damag if(ctf->value) CTFFragBonuses(self, inflictor, attacker); //ZOID - //ŠøŽ‚Á‚Ä‚éꇂ͗Ž‚Æ‚· + //æ——æŒã£ã¦ã‚‹å ´åˆã¯è½ã¨ã™ if(self->client->pers.inventory[ITEM_INDEX(zflag_item)]) zflag_item->drop(self,zflag_item); @@ -1061,7 +1061,7 @@ void CopyToBodyQue (edict_t *ent) body->s = ent->s; body->s.number = body - g_edicts; - //‹­ˆø‚ɃtƒŒ[ƒ€ƒZƒbƒg + //強引ã«ãƒ•ãƒ¬ãƒ¼ãƒ ã‚»ãƒƒãƒˆ if(body->s.modelindex == skullindex || body->s.modelindex == headindex) body->s.frame = 0; body->svflags = ent->svflags; diff --git a/src/p_weapon.c b/src/p_weapon.c index 07ba2bf..78840f0 100644 --- a/src/p_weapon.c +++ b/src/p_weapon.c @@ -994,7 +994,7 @@ void Weapon_RocketLauncher_Fire (edict_t *ent) if(ent->client->zc.aiming != 4) fire_rocket (ent, start, forward, damage, 650, damage_radius, radius_damage); else { - damage -= 20;//ƒƒbƒNƒIƒ“‚Í20ƒ_ƒ[ƒWŒ¸‚è + damage -= 20;//ロックオンã¯20ダメージ減り fire_lockon_rocket (ent, start, forward, damage, 20, damage_radius, radius_damage); } @@ -1011,11 +1011,11 @@ void Weapon_RocketLauncher_Fire (edict_t *ent) if (! ( (int)dmflags->value & DF_INFINITE_AMMO ) ) ent->client->pers.inventory[ent->client->ammo_index]--; -// ent->client->ps.fov = 90; //ƒY[ƒ€‰ðœ - ent->client->zc.aiming = 0; //ƒY[ƒ€•s‰Â +// ent->client->ps.fov = 90; //ズーム解除 + ent->client->zc.aiming = 0; //ズームä¸å¯ } -//ƒƒbƒNƒIƒ“ƒƒPƒbƒgƒ‰ƒ“ƒ`ƒƒ[ +//ロックオンロケットランãƒãƒ£ãƒ¼ void Weapon_LockonRocketLauncher_Fire (edict_t *ent) { vec3_t tmp,out,aim,min,max; @@ -1024,13 +1024,13 @@ void Weapon_LockonRocketLauncher_Fire (edict_t *ent) if (ent->client->buttons & BUTTON_ATTACK) { - ent->client->zc.lockon = false; //ƒXƒiƒCƒp[‚ɃƒbƒNƒIƒ“‹@”\‚È‚µ + ent->client->zc.lockon = false; //スナイパーã«ãƒ­ãƒƒã‚¯ã‚ªãƒ³æ©Ÿèƒ½ãªã— if(ent->client->zc.aiming == 0) { gi.sound (ent, CHAN_WEAPON, gi.soundindex("weapons/sshotr1b.wav"), 1, ATTN_NONE, 0); ent->client->zc.aiming = 3; if(ent->client->zc.distance <10 || ent->client->zc.distance > 90) ent->client->zc.distance = 90; - ent->client->ps.fov = ent->client->zc.distance;//ƒY[ƒ€ŠJŽn + ent->client->ps.fov = ent->client->zc.distance;//ズーム開始 } VectorSet(max,8,8,8); @@ -1065,7 +1065,7 @@ void Weapon_LockonRocketLauncher_Fire (edict_t *ent) gi.sound (ent, CHAN_AUTO, gi.soundindex("3zb/locrloc.wav"), 1, ATTN_NORM, 0); ent->client->zc.first_target = rs_trace.ent; } - return; //ƒI[ƒgƒY[ƒ€”½‰ž‚¹‚¸ + return; //オートズームåå¿œã›ãš } else ent->client->zc.first_target = NULL; } @@ -1107,7 +1107,7 @@ void Weapon_RocketLauncher (edict_t *ent) static int pause_frames[] = {25, 33, 42, 50, 0}; static int fire_frames[] = {5, 0}; - if(!(ent->client->buttons & BUTTON_ATTACK)) ent->client->zc.aiming = 0; //ƒAƒNƒeƒBƒx[ƒg0 + if(!(ent->client->buttons & BUTTON_ATTACK)) ent->client->zc.aiming = 0; //アクティベート0 if(0/*1*/) { @@ -1824,7 +1824,7 @@ void RSight_think(edict_t *ent) if(rs_trace.ent != NULL) { - if(Q_stricmp (rs_trace.ent->classname, "player") == 0) return;//ƒI[ƒgƒY[ƒ€”½‰ž‚¹‚¸ + if(Q_stricmp (rs_trace.ent->classname, "player") == 0) return;//オートズームåå¿œã›ãš } if(ent->owner->client->zc.autozoom ) @@ -1909,20 +1909,20 @@ void weapon_railgun_fire (edict_t *ent) if (! ( (int)dmflags->value & DF_INFINITE_AMMO ) ) ent->client->pers.inventory[ent->client->ammo_index]--; -// ent->client->ps.fov = 90; //ƒY[ƒ€‰ðœ - ent->client->zc.aiming = 0; //ƒY[ƒ€•s‰Â +// ent->client->ps.fov = 90; //ズーム解除 + ent->client->zc.aiming = 0; //ズームä¸å¯ } -//ƒXƒiƒCƒp[—prailƒKƒ“ +//スナイパー用railガン void Weapon_SnipeRailgun (edict_t *ent) { edict_t *sight; if (ent->client->buttons & BUTTON_ATTACK) { - ent->client->zc.lockon = false; //ƒXƒiƒCƒp[‚ɃƒbƒNƒIƒ“‹@”\‚È‚µ + ent->client->zc.lockon = false; //スナイパーã«ãƒ­ãƒƒã‚¯ã‚ªãƒ³æ©Ÿèƒ½ãªã— if( ent->client->zc.aiming == 0) { - //ƒTƒCƒg‚Ìì¬ + //サイトã®ä½œæˆ sight = G_Spawn(); VectorClear (sight->mins); VectorClear (sight->maxs); @@ -1944,7 +1944,7 @@ void Weapon_SnipeRailgun (edict_t *ent) gi.sound (ent, CHAN_WEAPON, gi.soundindex("weapons/sshotr1b.wav"), 1, ATTN_NONE, 0); ent->client->zc.aiming = 1; if(ent->client->zc.distance <10 || ent->client->zc.distance > 90) ent->client->zc.distance = 90; - ent->client->ps.fov = ent->client->zc.distance;//ƒY[ƒ€ŠJŽn + ent->client->ps.fov = ent->client->zc.distance;//ズーム開始 } return; } @@ -1959,7 +1959,7 @@ void Weapon_Railgun (edict_t *ent) static int pause_frames[] = {56, 0}; static int fire_frames[] = {4, 0}; - if(!(ent->client->buttons & BUTTON_ATTACK)) ent->client->zc.aiming = 0; //ƒAƒNƒeƒBƒx[ƒg0 + if(!(ent->client->buttons & BUTTON_ATTACK)) ent->client->zc.aiming = 0; //アクティベート0 if(0) {