Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

plug some more memory leaks.

This commit is contained in:
Enno Rehling 2014-12-30 01:44:28 +01:00
parent 89ce04a6c3
commit 49a77cdcde
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/race.c
View File

@ -141,6 +141,8 @@ void racelist_insert(struct race_list **rl, const struct race *r)
void free_races(void) { void free_races(void) {
while (races) { while (races) {
race * rc = races->next; race * rc = races->next;
free(races->_name);
free(races->def_damage);
free(races); free(races);
races = rc; races = rc;
} }

4
src/kernel/race.h
View File

@ -119,7 +119,7 @@ extern "C" {
typedef struct race { typedef struct race {
struct param *parameters; struct param *parameters;
const char *_name; char *_name;
float magres; float magres;
float maxaura; /* Faktor auf Maximale Aura */ float maxaura; /* Faktor auf Maximale Aura */
float regaura; /* Faktor auf Regeneration */ float regaura; /* Faktor auf Regeneration */
@ -133,7 +133,7 @@ extern "C" {
float speed; float speed;
float aggression; /* chance that a monster will attack */ float aggression; /* chance that a monster will attack */
int hitpoints; int hitpoints;
const char *def_damage; char *def_damage;
int armor; int armor;
int at_default; /* Angriffsskill Unbewaffnet (default: -2) */ int at_default; /* Angriffsskill Unbewaffnet (default: -2) */
int df_default; /* Verteidigungsskill Unbewaffnet (default: -2) */ int df_default; /* Verteidigungsskill Unbewaffnet (default: -2) */

7
src/kernel/ship.c
View File

@ -238,8 +238,13 @@ void free_ship(ship * s)
free(s); free(s);
} }
static void free_shiptype(ship_type *stype) {
free(stype->_name);
free(stype);
}
void free_shiptypes(void) { void free_shiptypes(void) {
ql_foreach(shiptypes, free); ql_foreach(shiptypes, free_shiptype);
ql_free(shiptypes); ql_free(shiptypes);
shiptypes = 0; shiptypes = 0;
} }

2
src/kernel/ship.h
View File

@ -33,7 +33,7 @@ extern "C" {
#define SFL_NOCOAST 0x04 #define SFL_NOCOAST 0x04
typedef struct ship_type { typedef struct ship_type {
const char *_name; char *_name;
int range; /* range in regions */ int range; /* range in regions */
int flags; /* flags */ int flags; /* flags */