summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/base/arenaFile.h11
-rw-r--r--src/base/main.c4
-rw-r--r--src/base/main.h2
-rw-r--r--src/client/config.c30
-rw-r--r--src/client/config.h5
-rw-r--r--src/client/control.c2
-rw-r--r--src/client/control.h2
-rw-r--r--src/widget/widget_container.c2
-rw-r--r--src/widget/widget_container.h2
9 files changed, 29 insertions, 31 deletions
diff --git a/src/base/arenaFile.h b/src/base/arenaFile.h
index 3cbc82a..40a9f5f 100644
--- a/src/base/arenaFile.h
+++ b/src/base/arenaFile.h
@@ -1,5 +1,6 @@
#ifndef ARENA_FILE_H
#define ARENA_FILE_H
+
#define PUBLIC_SERVER_PATH_ARENA "./arena/"
#include "main.h"
@@ -14,17 +15,17 @@ typedef struct {
extern bool_t arena_file_is_inicialized();
extern int arena_file_get_value(char *line, char *env, char *val, int len);
extern int arena_file_get_count();
-extern char *arena_file_get_name(arenaFile_t * arenaFile);
-extern char *arena_file_get_net_name(arenaFile_t * arenaFile);
+extern char *arena_file_get_name(arenaFile_t *arenaFile);
+extern char *arena_file_get_net_name(arenaFile_t *arenaFile);
extern arenaFile_t *arena_file_get_file_format_net_name(char *s);
-extern char *arena_file_get_image(arenaFile_t * arenaFile);
+extern char *arena_file_get_image(arenaFile_t *arenaFile);
#ifndef PUBLIC_SERVER
extern image_t *arena_file_load_image(arenaFile_t *arenaFile, char *filename,
char *group, char *name, int alpha);
#endif /* PUBLIC_SERVER */
extern arenaFile_t *arena_file_get(int n);
-extern int arena_file_get_id(arenaFile_t * arenaFile);
-extern arena_t *arena_file_get_arena(arenaFile_t * arenaFile);
+extern int arena_file_get_id(arenaFile_t *arenaFile);
+extern arena_t *arena_file_get_arena(arenaFile_t *arenaFile);
extern arenaFile_t *arena_file_new(char *path);
extern void arena_file_load(char *path);
extern void arena_file_init();
diff --git a/src/base/main.c b/src/base/main.c
index 0356b1f..d854a33 100644
--- a/src/base/main.c
+++ b/src/base/main.c
@@ -78,12 +78,12 @@ char *getString(int n)
return strdup(str);
}
-char* get_string_static(int n)
+char *get_string_static(int n)
{
static char str[STR_SIZE];
sprintf(str, "%d", n);
- return str; // !!!!
+ return str; /* !!! */
}
int *newInt(int x)
diff --git a/src/base/main.h b/src/base/main.h
index 5748c39..98919e3 100644
--- a/src/base/main.h
+++ b/src/base/main.h
@@ -27,7 +27,7 @@ extern char *getParam(char *s);
extern char *getParamElse(char *s1, char *s2);
extern bool_t isParamFlag(char *s);
extern char *getString(int n);
-extern char* get_string_static(int n);
+extern char *get_string_static(int n);
extern int *newInt(int x);
extern int isFillPath(const char *path);
extern void accessExistFile(const char *s);
diff --git a/src/client/config.c b/src/client/config.c
index be95fb0..92c0776 100644
--- a/src/client/config.c
+++ b/src/client/config.c
@@ -1,4 +1,3 @@
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -11,14 +10,13 @@
#include "configFile.h"
#include "config.h"
-typedef struct setting_int_struct
-{
- int key; /* identifikacny kluc */
- char *param; /* parameter programu */
- char *var; /* premenna v config subore */
- int type; /* typ udaju - retazec/cislo */
- int value_int; /* hodnota cele cislo */
- char *value_str; /* hodnota retazec */
+typedef struct setting_int_struct {
+ int key; /* identification key */
+ char *param; /* parameter of the program */
+ char *var; /* variable in the config file */
+ int type; /* type of the data - string/number */
+ int value_int; /* numeric data */
+ char *value_str; /* textual data */
} config_t;
#define CONFIG_TYPE_INT 1
@@ -55,7 +53,7 @@ static config_t config_list[] =
static textFile_t *config_file;
-static config_t* find_config(int key)
+static config_t *find_config(int key)
{
int i;
@@ -165,11 +163,11 @@ int config_get_int_value(int key)
assert(tmp != NULL);
assert(tmp->type == CONFIG_TYPE_INT);
-
+
return tmp->value_int;
}
-char* config_get_str_value(int key)
+char *config_get_str_value(int key)
{
config_t *tmp;
@@ -177,7 +175,7 @@ char* config_get_str_value(int key)
assert(tmp != NULL);
assert(tmp->type == CONFIG_TYPE_STR);
-
+
return tmp->value_str;
}
@@ -189,7 +187,7 @@ void config_set_int_value(int key, int n)
assert(tmp != NULL);
assert(tmp->type == CONFIG_TYPE_INT);
-
+
tmp->value_int = n;
}
@@ -201,9 +199,9 @@ void config_set_str_value(int key, char *str)
assert(tmp != NULL);
assert(tmp->type == CONFIG_TYPE_STR);
-
+
if (tmp->value_str != NULL) {
- free(tmp->value_str); // musi to byt alokovane
+ free(tmp->value_str); /* has to be allocated */
}
tmp->value_str = strdup(str);
diff --git a/src/client/config.h b/src/client/config.h
index ae84a76..46e0da5 100644
--- a/src/client/config.h
+++ b/src/client/config.h
@@ -28,16 +28,15 @@
#define CFG_NET_IP 21
#define CFG_NET_PORT 22
-#define CONFIG_LIST_COUNT 22
+#define CONFIG_LIST_COUNT 22
extern int config_init();
extern void config_load();
extern void config_save();
extern int config_get_int_value(int key);
-extern char* config_get_str_value(int key);
+extern char *config_get_str_value(int key);
extern void config_set_int_value(int key, int n);
extern void config_set_str_value(int key, char *str);
extern int config_quit();
#endif /* CONFIG_H */
-
diff --git a/src/client/control.c b/src/client/control.c
index 737762c..8075692 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -5,7 +5,7 @@
#include "main.h"
#include "control.h"
-control_t* control_new(SDLKey arg_up, SDLKey arg_right, SDLKey arg_left,
+control_t *control_new(SDLKey arg_up, SDLKey arg_right, SDLKey arg_left,
SDLKey arg_down, SDLKey arg_shot, SDLKey arg_switch)
{
control_t *tmp;
diff --git a/src/client/control.h b/src/client/control.h
index 4103f33..6b08189 100644
--- a/src/client/control.h
+++ b/src/client/control.h
@@ -17,7 +17,7 @@ typedef struct control_struct {
int count[CONTROL_KEY_COUNT];
} control_t;
-extern control_t* control_new(SDLKey arg_up, SDLKey arg_right,
+extern control_t *control_new(SDLKey arg_up, SDLKey arg_right,
SDLKey arg_left, SDLKey arg_down,
SDLKey arg_shot, SDLKey arg_switch);
extern int control_get_key_route(control_t *my_control);
diff --git a/src/widget/widget_container.c b/src/widget/widget_container.c
index 8e1b821..5de850c 100644
--- a/src/widget/widget_container.c
+++ b/src/widget/widget_container.c
@@ -5,7 +5,7 @@
#include "widget.h"
#include "widget_container.h"
-widget_t* widget_container_new(int x, int y, int w, int h)
+widget_t *widget_container_new(int x, int y, int w, int h)
{
widget_container_t *new;
diff --git a/src/widget/widget_container.h b/src/widget/widget_container.h
index 5ee5784..8d9320c 100644
--- a/src/widget/widget_container.h
+++ b/src/widget/widget_container.h
@@ -8,7 +8,7 @@ typedef struct widget_container {
list_t *listWidget;
} widget_container_t;
-extern widget_t* widget_container_new(int x, int y, int w, int h);
+extern widget_t *widget_container_new(int x, int y, int w, int h);
extern void widget_container_add(widget_t *widget, widget_t *widget_add);
extern void widget_set_layout_table(widget_t *widget, int countW, int countH, int w, int h);
extern void widget_container_draw(widget_t *widget);
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 07:21:58 +0000