diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-17 20:22:56 +0100 |
commit | 46fa2557d777096803ff90ba95d5500a9c03d2c5 (patch) | |
tree | ded4f0e046be43e371631fca3ac013d96fa244e0 /constants/map_constants.inc | |
parent | 930fea6fad24692773b930ec7448c59d599844b8 (diff) | |
parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) |
merge mail with master, fix conflicts
Diffstat (limited to 'constants/map_constants.inc')
-rw-r--r-- | constants/map_constants.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/constants/map_constants.inc b/constants/map_constants.inc index eabfe6e69..a061d2501 100644 --- a/constants/map_constants.inc +++ b/constants/map_constants.inc @@ -1,3 +1,4 @@ +@ TODO: these need to match the names in include/constants/maps.h .set cur_map_group, -1 new_map_group |