X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=src%2Fserver%2Fmap_objects.c;h=abcb6acfc35da8b10c64b942752ebe5c85e07a90;hb=651c99ff66ae4704021ee15136707c892ed243d6;hp=648631e2723be79c8024fd85611cbee6f17ef494;hpb=65efdbea2c5978de283aab627ca62f5a2c983353;p=plomrogue diff --git a/src/server/map_objects.c b/src/server/map_objects.c index 648631e..abcb6ac 100644 --- a/src/server/map_objects.c +++ b/src/server/map_objects.c @@ -5,7 +5,7 @@ #include /* FILE typedef */ #include /* uint8_t, uint16_t */ #include /* free(), atoi() */ -#include /* strlen(), memcpy(), strtok() */ +#include /* strlen(), memcpy(), strtok(), memset() */ #include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets(), * textfile_sizes() */ @@ -67,6 +67,7 @@ static void add_map_object(uint8_t type) char * f_name = "add_map_object()"; struct MapObjDef * mod = get_map_object_def(type); struct MapObj * mo = try_malloc(sizeof(struct MapObj), f_name); + memset(mo, 0, sizeof(struct MapObj)); mo->id = world.map_obj_count++; mo->type = mod->id; mo->lifepoints = mod->lifepoints; @@ -89,11 +90,6 @@ static void add_map_object(uint8_t type) break; } } - mo->progress = 0; - mo->command = 0; - mo->arg = 0; - mo->owns = NULL; - mo->next = NULL; struct MapObj ** mo_ptr_ptr = &world.map_objs; for (; NULL != * mo_ptr_ptr; mo_ptr_ptr = &(*mo_ptr_ptr)->next); * mo_ptr_ptr = mo;