equal
deleted
inserted
replaced
36 static flib_weaponset *flib_weaponset_create_str(const char *name, const char *loadoutStr, const char *crateProbStr, const char *crateAmmoStr, const char *delayStr) { |
36 static flib_weaponset *flib_weaponset_create_str(const char *name, const char *loadoutStr, const char *crateProbStr, const char *crateAmmoStr, const char *delayStr) { |
37 flib_weaponset *result = NULL; |
37 flib_weaponset *result = NULL; |
38 if(!name || !loadoutStr || !crateProbStr || !crateAmmoStr || !delayStr) { |
38 if(!name || !loadoutStr || !crateProbStr || !crateAmmoStr || !delayStr) { |
39 flib_log_e("null parameter in flib_weaponset_create_str"); |
39 flib_log_e("null parameter in flib_weaponset_create_str"); |
40 } else { |
40 } else { |
41 flib_weaponset *newSet = calloc(1, sizeof(flib_weaponset)); |
41 flib_weaponset *newSet = flib_calloc(1, sizeof(flib_weaponset)); |
42 char *nameCopy = flib_strdupnull(name); |
42 char *nameCopy = flib_strdupnull(name); |
43 if(newSet && nameCopy) { |
43 if(newSet && nameCopy) { |
44 newSet->name = nameCopy; |
44 newSet->name = nameCopy; |
45 nameCopy = NULL; |
45 nameCopy = NULL; |
46 bool error = false; |
46 bool error = false; |
99 int flib_weaponset_to_ini(const char *filename, const flib_weaponset *set) { |
99 int flib_weaponset_to_ini(const char *filename, const flib_weaponset *set) { |
100 int result = -1; |
100 int result = -1; |
101 if(!filename || !set) { |
101 if(!filename || !set) { |
102 flib_log_e("null parameter in flib_weaponset_to_ini"); |
102 flib_log_e("null parameter in flib_weaponset_to_ini"); |
103 } else { |
103 } else { |
104 dictionary *dict = dictionary_new(0); |
104 dictionary *dict = iniparser_load(filename); |
|
105 if(!dict) { |
|
106 dict = dictionary_new(0); |
|
107 } |
105 if(dict) { |
108 if(dict) { |
106 bool error = false; |
109 bool error = false; |
107 // Add the sections |
110 // Add the sections |
108 error |= iniparser_set(dict, "weaponset", NULL); |
111 error |= iniparser_set(dict, "weaponset", NULL); |
109 |
112 |