diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-30 19:30:49 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-30 20:57:13 -0700 |
| commit | aa4df026d44bd205f8bfce8a3b8d6a1144332f32 (patch) | |
| tree | 397692da57b2be8f7c083989ed37fb03308d5b2c /src/map/battle.cpp | |
| parent | 7c5c2058e9aea996dc6c76a7e6d9ba4fc2a2bc77 (diff) | |
| download | tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.gz tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.bz2 tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.xz tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.zip | |
Finally get around to decoupling the warning system
Diffstat (limited to 'src/map/battle.cpp')
| -rw-r--r-- | src/map/battle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/battle.cpp b/src/map/battle.cpp index c0459a7..eabe8a6 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -51,10 +51,10 @@ namespace tmwa { static Battle_Config init_battle_config(); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow" +DIAG_PUSH(); +DIAG_I(shadow); struct Battle_Config battle_config = init_battle_config(); -#pragma GCC diagnostic pop +DIAG_POP(); /*========================================== * 自分をロックしている対象の数を返す(汎用) @@ -2312,10 +2312,10 @@ int battle_check_range(dumb_ptr<block_list> src, dumb_ptr<block_list> bl, Battle_Config init_battle_config() { -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow" + DIAG_PUSH(); + DIAG_I(shadow); Battle_Config battle_config; -#pragma GCC diagnostic pop + DIAG_POP(); { battle_config.warp_point_debug = 0; battle_config.enemy_critical = 0; |