We should follow the HandBook

7 files changed, 61 insertions, 47 deletions

diff --git a/src/base/modules.c b/src/base/modules.c
index 58eed95..eab4506 100644
--- a/src/base/modules.c
+++ b/src/base/modules.c
@@ -56,15 +56,16 @@ static list_t *listModule;
 static mod_reg_t mod_reglist;
 
 /* register module as valid */
-static mod_reg_t *mod_register (char *name, mod_sym_t *sym)
+static mod_reg_t *mod_register(char *name, mod_sym_t *sym)
 {
 	/* alloc and init context */
-	mod_reg_t *mod = (mod_reg_t *) malloc (sizeof (mod_reg_t));
+	mod_reg_t *mod = (mod_reg_t *) malloc(sizeof(mod_reg_t));
 	
-	if (!mod)
+	if (!mod) {
 		return 0;
+	}
 
-	mod->name = strdup (name);
+	mod->name = strdup(name);
 	mod->sym = sym;
 		
 	/* add entry into list */
@@ -77,7 +78,7 @@ static mod_reg_t *mod_register (char *name, mod_sym_t *sym)
 }
 
 /* free all unnecessary memory blocks from module's reglist */
-static void mod_destroy ()
+static void mod_destroy()
 {
 	unsigned i;
 	for (;;) {
@@ -89,25 +90,27 @@ static void mod_destroy ()
 			mod->next->prev = mod->prev;
 			mod->prev->next = mod->next;
 			
-			free (mod->name);
-			free (mod);
+			free(mod->name);
+			free(mod);
 			
-			i ++;
+			i++;
 			
 			break;
 		}
 		
-		if (!i)
+		if (!i) {
 			break;
+		}
 	}
 }
 
-static mod_reg_t *mod_find (char *name)
+static mod_reg_t *mod_find(char *name)
 {
 	mod_reg_t *mod;
 	for (mod = mod_reglist.next; mod != &mod_reglist; mod = mod->next) {
-		if (!strcmp (mod->name, name))
+		if (!strcmp(mod->name, name)) {
 			return mod;
+		}
 	}
 
 	return 0;
@@ -115,24 +118,25 @@ static mod_reg_t *mod_find (char *name)
 
 static module_t *newModule(char *name)
 {
-	assert (name != NULL);
+	assert(name != NULL);
 	
-	mod_reg_t *mod = mod_find (name);
+	mod_reg_t *mod = mod_find(name);
 	
 	if (!mod) {
-		error ("Module [%s] is unavailable", name);
+		error("Module [%s] is unavailable", name);
 		return 0;
 	}
 		
-	module_t *ret = malloc (sizeof (module_t));
+	module_t *ret = malloc(sizeof(module_t));
 	
-	if (!ret)
+	if (!ret) {
 		return 0;
+	}
 	
-	ret->name = strdup (name);
+	ret->name = strdup(name);
 	
 	if (!ret->name) {
-		free (ret);
+		free(ret);
 		return 0;
 	}
 	
@@ -148,7 +152,7 @@ static module_t *newModule(char *name)
 
 	debug("Loading module [%s]", name);
 
-	if (ret->fce_init (&export_fce) != 0) {
+	if (ret->fce_init(&export_fce) != 0) {
 		error("Unable to load module [%s]", name);
 		free(ret->name);
 		free(ret);
@@ -180,12 +184,12 @@ void module_init()
 	mod_reglist.next = &mod_reglist;
 	mod_reglist.prev = &mod_reglist;
 	
-	mod_register ("libmodAI", &modai_sym);
-	mod_register ("libmodWall", &modwall_sym);
-	mod_register ("libmodPipe", &modpipe_sym);
-	mod_register ("libmodMove", &modmove_sym);
-	mod_register ("libmodBasic", &modbasic_sym);
-	mod_register ("libmodTeleport", &modteleport_sym);
+	mod_register("libmodAI", &modai_sym);
+	mod_register("libmodWall", &modwall_sym);
+	mod_register("libmodPipe", &modpipe_sym);
+	mod_register("libmodMove", &modmove_sym);
+	mod_register("libmodBasic", &modbasic_sym);
+	mod_register("libmodTeleport", &modteleport_sym);
 }
 
 int isModuleLoaded(char *name)
@@ -228,8 +232,9 @@ int module_load(char *name)
 
 int module_load_dep(char *name)
 {
-	if (isModuleLoaded(name))
+	if (isModuleLoaded(name)) {
 		return 0;
+	}
 
 	return module_load(name);
 }
@@ -308,5 +313,5 @@ void module_quit()
 	list_destroy_item(listModule, destroyModule);
 	share_function_quit();
 
-	mod_destroy ();
+	mod_destroy();
 }
diff --git a/src/base/space.c b/src/base/space.c
index 229f88b..6ef2892 100644
--- a/src/base/space.c
+++ b/src/base/space.c
@@ -42,8 +42,9 @@ space_t *space_new(int w, int h, int segW, int segH,
 
 	new = malloc(sizeof(space_t));
 	
-	if (!new)
+	if (!new) {
 		return 0;
+	}
 	
 	memset(new, 0, sizeof(space_t));
 
@@ -98,11 +99,13 @@ void space_add(space_t *p, void *item)
 	int id, x, y, w, h;
 	int i, j;
 
-	if (!p || !item)
+	if (!p || !item) {
 		return;
+	}
 	
-	if (!p->zone)
+	if (!p->zone) {
 		return;
+	}
 	
 	p->getStatus(item, &id, &x, &y, &w, &h);
 	getSegment(p, x, y, w, h, &segX, &segY, &segW, &segH);
diff --git a/src/modules/modAI.c b/src/modules/modAI.c
index 7818792..5790d55 100644
--- a/src/modules/modAI.c
+++ b/src/modules/modAI.c
@@ -427,4 +427,4 @@ mod_sym_t modai_sym = 	{ &init,
 			  &isConflict,
 			  &cmdArena,
 			  &recvMsg,
-			  &destroy };
\ No newline at end of file
+			  &destroy };
diff --git a/src/modules/modPipe.c b/src/modules/modPipe.c
index 45e2d3a..065df07 100644
--- a/src/modules/modPipe.c
+++ b/src/modules/modPipe.c
@@ -347,4 +347,4 @@ mod_sym_t modpipe_sym = { &init,
 			  &isConflict,
 			  &cmdArena,
 			  &recvMsg,
-			  &destroy };
\ No newline at end of file
+			  &destroy };
diff --git a/src/modules/modTeleport.c b/src/modules/modTeleport.c
index e6c9deb..b7ca273 100644
--- a/src/modules/modTeleport.c
+++ b/src/modules/modTeleport.c
@@ -336,8 +336,9 @@ static int isConflict(int x, int y, int w, int h)
 
 static void cmdArena(char *line)
 {
-	if (strncmp(line, "teleport", 8) == 0)
+	if (strncmp(line, "teleport", 8) == 0) {
 		cmd_teleport(line);
+	}
 }
 
 static void recvMsg(char *msg)
@@ -358,12 +359,12 @@ static int destroy()
 
 mod_sym_t modteleport_sym = { &init,
 #ifndef PUBLIC_SERVER
-			  &draw,
+			      &draw,
 #else
-			  0,
+			      0,
 #endif
 			      &event,
 			      &isConflict,
 			      &cmdArena,
 			      &recvMsg,
-			      &destroy };
\ No newline at end of file
+			      &destroy };
diff --git a/src/modules/modWall.c b/src/modules/modWall.c
index ac8e715..d9906db 100644
--- a/src/modules/modWall.c
+++ b/src/modules/modWall.c
@@ -371,4 +371,4 @@ mod_sym_t modwall_sym = { &init,
 			  &isConflict,
 			  &cmdArena,
 			  &recvMsg,
-			  &destroy };
\ No newline at end of file
+			  &destroy };
diff --git a/src/widget/widget_textfield.c b/src/widget/widget_textfield.c
index 51dda50..53d03a3 100644
--- a/src/widget/widget_textfield.c
+++ b/src/widget/widget_textfield.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <assert.h>
+#include <SDL_keyboard.h>
 
 #include "main.h"
 #include "interface.h"
@@ -12,8 +13,6 @@
 
 #include "keyboardBuffer.h"
 
-#include <SDL_keyboard.h>
-
 widget_t *text_field_new(char *text, int filter, int x, int y)
 {
 	widget_textfield_t *new;
@@ -196,14 +195,17 @@ static void readKey(widget_textfield_t *p)
 
 		char *name = (char *) SDL_GetKeyName(k.sym);
 
-		if (!name)
+		if (!name) {
 			continue;
+		}
 
-		if (len >= STR_SIZE)
+		if (len >= STR_SIZE) {
 			break;
+		}
 		
-		if (k.sym == SDLK_RETURN)
+		if (k.sym == SDLK_RETURN) {
 			break;
+		}
 
 		char c = '\0';
 
@@ -211,17 +213,19 @@ static void readKey(widget_textfield_t *p)
 			case 1:
 				c = name[0];
 				break;
+
 			case 3:
 				c = name[1];
 				break;
 		}
 		
-		if ((k.unicode & 0xFF80) == 0)
+		if ((k.unicode & 0xFF80) == 0) {
 			c = k.unicode & 0x7F;
+		}
 
-		if (k.sym == SDLK_SPACE || k.sym == SDLK_TAB)
+		if (k.sym == SDLK_SPACE || k.sym == SDLK_TAB) {
 			c = ' ';
-		else if (k.sym == SDLK_BACKSPACE) {
+		} else if (k.sym == SDLK_BACKSPACE) {
 			if (len > 0) {
 				p->text[len-1] = '\0';
 				checkText(p, len);
@@ -230,12 +234,13 @@ static void readKey(widget_textfield_t *p)
 			break;
 		}
 
-		if (c == '\0' || p->w > WIDGET_TEXTFIELD_WIDTH - 40)
+		if (c == '\0' || p->w > WIDGET_TEXTFIELD_WIDTH - 40) {
 			continue;
+		}
 
 		p->text[len] = c;
 
-		len ++;
+		len++;
 		checkText(p, len);
 	}
 }