diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-01-26 14:03:20 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-01-26 14:03:20 -0800 |
| commit | 3d8b6671b394ef6c4c5df3065a6123a5d6cacb93 (patch) | |
| tree | d4ece86a6b1fc63349c2a24eddcd76588886241d /src/map/magic-interpreter-parser.ypp | |
| parent | 34f0540da418b01dd4d49f6ecf72569d3cfecfdf (diff) | |
| download | tmwa-3d8b6671b394ef6c4c5df3065a6123a5d6cacb93.tar.gz tmwa-3d8b6671b394ef6c4c5df3065a6123a5d6cacb93.tar.bz2 tmwa-3d8b6671b394ef6c4c5df3065a6123a5d6cacb93.tar.xz tmwa-3d8b6671b394ef6c4c5df3065a6123a5d6cacb93.zip | |
Also do db/const.txt and data/resnametable.txtv14.1.27
Diffstat (limited to 'src/map/magic-interpreter-parser.ypp')
| -rw-r--r-- | src/map/magic-interpreter-parser.ypp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/magic-interpreter-parser.ypp b/src/map/magic-interpreter-parser.ypp index 0e03afb..a86f1c8 100644 --- a/src/map/magic-interpreter-parser.ypp +++ b/src/map/magic-interpreter-parser.ypp @@ -1,6 +1,9 @@ %code requires { #include "magic-interpreter.hpp" + +extern +FString current_magic_filename; } // %code requires %code @@ -20,6 +23,8 @@ #include "itemdb.hpp" #include "magic-expr.hpp" +FString current_magic_filename; + // can't use src/warnings.hpp in generated code #pragma GCC diagnostic warning "-Wall" #pragma GCC diagnostic warning "-Wextra" @@ -1411,6 +1416,7 @@ bool magic_init0() // must be called after itemdb initialisation bool magic_init1(ZString conffile) { + current_magic_filename = conffile; magic_frontend_in = fopen(conffile.c_str(), "r"); if (!magic_frontend_in) { |