From ef7d34b831f025c1588fa1646354f1942b368397 Mon Sep 17 00:00:00 2001 From: Dusan Durech Date: Fri, 4 Sep 2009 17:22:51 +0200 Subject: fix few stupid bugs + fix one memory leak --- src/client/config.c | 8 ++++++++ src/screen/world.c | 4 ++-- src/server/log.c | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/client/config.c b/src/client/config.c index 92c0776..c9cb33d 100644 --- a/src/client/config.c +++ b/src/client/config.c @@ -209,11 +209,19 @@ void config_set_str_value(int key, char *str) int config_quit() { + int i; + config_save(); if (config_file != NULL) { text_file_destroy(config_file); } + for (i = 0; i < CONFIG_LIST_COUNT; i++) { + if (config_list[i].type == CONFIG_TYPE_STR && config_list[i].value_str != NULL) { + free(config_list[i].value_str); + } + } + return 0; } diff --git a/src/screen/world.c b/src/screen/world.c index 2afd8d4..f368c41 100644 --- a/src/screen/world.c +++ b/src/screen/world.c @@ -299,8 +299,8 @@ void world_set_control_tux(tux_t *tux, int control_type) key_table_get_key(KEY_TUX_LEFT_MOVE_RIGHT), key_table_get_key(KEY_TUX_LEFT_MOVE_LEFT), key_table_get_key(KEY_TUX_LEFT_MOVE_DOWN), - key_table_get_key(KEY_TUX_RIGHT_SHOOT), - key_table_get_key(KEY_TUX_RIGHT_SWITCH_WEAPON) + key_table_get_key(KEY_TUX_LEFT_SHOOT), + key_table_get_key(KEY_TUX_LEFT_SWITCH_WEAPON) ); break; diff --git a/src/server/log.c b/src/server/log.c index 647ceaa..0c6c319 100644 --- a/src/server/log.c +++ b/src/server/log.c @@ -33,6 +33,10 @@ void log_add(int type, char *msg) time_t currentTime; char *str_type; + if (logFile == NULL) { + return; + } + currentTime = time(NULL); tm_struct = localtime(¤tTime); @@ -66,6 +70,10 @@ void log_add(int type, char *msg) void log_quit() { + if (logFile == NULL) { + return; + } + log_add(LOG_INF, "Logging finished"); fclose(logFile); } -- cgit v1.2.3