diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-17 20:15:15 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-17 20:15:15 -0500 |
| commit | e2ab2e50a0723b11802e33074e0dd5d9f7d81496 (patch) | |
| tree | 843680a4e5f4e7de6d90f7e7a1e493508f9c1a36 /src/field_map_obj_helpers.c | |
| parent | d4bd4c393e59bb66a8d4f69f23dce694982723e1 (diff) | |
| parent | 67ced1d77ec0d36cc2b6ebcbfc58ba28b357ddbb (diff) | |
fix merge conflicts
Diffstat (limited to 'src/field_map_obj_helpers.c')
| -rw-r--r-- | src/field_map_obj_helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c index 17584c96a..46784cff3 100644 --- a/src/field_map_obj_helpers.c +++ b/src/field_map_obj_helpers.c @@ -34,7 +34,7 @@ bool8 FreezeMapObject(struct MapObject *mapObject) } } -void FreezeMapObjects() +void FreezeMapObjects(void) { u8 i; for (i = 0; i < 16; i++) |