diff options
author | Cameron Hall <cameronghall@cox.net> | 2018-02-18 17:38:30 -0600 |
---|---|---|
committer | Cameron Hall <cameronghall@cox.net> | 2018-02-18 17:38:30 -0600 |
commit | 27da62f8310ea6612654a91293ad003d2c48167b (patch) | |
tree | 0ffa36c4a29ba24d7527594cd55711b1efb87213 /src/engine/naming_screen.c | |
parent | 5388d28bf33b38bb8dbb825564491feaa89c1787 (diff) | |
parent | adac76c8370b86176a52d8ecb2e349e2be13f8ba (diff) |
Merge branch 'master' into decompile_debug
Diffstat (limited to 'src/engine/naming_screen.c')
-rw-r--r-- | src/engine/naming_screen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c index ca77c5483..59b9b4d84 100644 --- a/src/engine/naming_screen.c +++ b/src/engine/naming_screen.c @@ -3,7 +3,7 @@ #include "data2.h" #include "graphics.h" #include "field_effect.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_player_avatar.h" #include "main.h" #include "menu.h" |