engine: wip added more setup code

diff --git a/src/lmud.c b/src/lmud.c
index 1286643c04e3efa28edee77917e36dc89a0c56f9..ccec30a8012b116d1a3b71a583e1e6fc6a260120 100644 (file)
--- a/src/lmud.c
+++ b/src/lmud.c
@@ -1,6 +1,7 @@
 #include <string.h>
 #include <getopt.h>
 #include <stdlib.h>
+#include "u_stdio.h"
 #include "lmud.h"
 
 struct lmud_config lmud_global_cfg;

diff --git a/src/lmud.h b/src/lmud.h
index f65cbc81062030eef3dcef413f8f4073d6bfaad8..e09d8dd5b2e5c16604178420d46bec5c115735e5 100644 (file)
--- a/src/lmud.h
+++ b/src/lmud.h
@@ -6,9 +6,6 @@
 /**
  * System includes
  */
-#include "u_stdio.h"
-#include "u_mem.h"
-#include "t_actor.h"
 #include "u_assert.h"
 
 #define LMUD_VER "0.0.1"
@@ -59,7 +56,8 @@ int lmud_main(int argc, char **argv);
 #include "u_stdio.c"
 #include "u_mem.c"
 #include "t_actor.c"
-#include "u_rand.h"
+#include "u_rand.c"
+#include "n_conn.c"
 
 #endif
 

diff --git a/src/n_conn.c b/src/n_conn.c
new file mode 100644 (file)
index 0000000..b727df7
--- /dev/null
+++ b/src/n_conn.c
@@ -0,0 +1 @@
+#include "n_conn.h"

diff --git a/src/n_conn.h b/src/n_conn.h
new file mode 100644 (file)
index 0000000..29df851
--- /dev/null
+++ b/src/n_conn.h
@@ -0,0 +1,4 @@
+#ifndef N_CONN_H__
+#define N_CONN_H__
+
+#endif

diff --git a/src/t_actor.h b/src/t_actor.h
index 3d04524258bae249faee51dda364b64c6103b657..224053ea5502bac2a165746af0615c60d128880e 100644 (file)
--- a/src/t_actor.h
+++ b/src/t_actor.h
@@ -42,8 +42,15 @@ struct t_actor_state {
        int xp;
 };
 
+enum t_actor_type {
+       T_ACTOR_TYPE_PLAYER,
+       T_ACTOR_TYPE_PET
+};
+
 struct t_actor {
        unsigned int id;
+       enum t_actor_type type;
+
        unsigned short faction_id;
 
        struct t_stats stats;

diff --git a/src/u_mem.c b/src/u_mem.c
index 5609b699fd645d395f1fb1e7fc9058cf9821af34..c433d898b22f4a257ea4e975a49f174a98ada1de 100644 (file)
--- a/src/u_mem.c
+++ b/src/u_mem.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <stdlib.h>
 #include "u_mem.h"
 
 
@@ -9,3 +10,15 @@ void *u_memset(void *src, int c, size_t n) {
 void *u_memcpy(void *dst, const void *src, size_t n) {
        return memcpy(dst, src, n);
 }
+
+void *u_malloc(size_t size) {
+       return malloc(size);
+}
+
+void u_free(void *ptr) {
+       free(ptr);
+}
+
+void *u_realloc(void *ptr, size_t size) {
+       return realloc(ptr, size);
+}

diff --git a/src/u_mem.h b/src/u_mem.h
index 50cee6d9bd4664deb1ec663ade3b3aa53b92e6ec..192df5d879c17771cc3f767783a88c87801c8be2 100644 (file)
--- a/src/u_mem.h
+++ b/src/u_mem.h
@@ -5,4 +5,8 @@
 void *u_memset(void *src, int count, size_t n);
 void *u_memcpy(void *det, const void *src, size_t n);
 
+void *u_malloc(size_t size);
+void u_free(void *ptr);
+void *u_realloc(void *ptr, size_t size);
+
 #endif

diff --git a/src/u_rand.c b/src/u_rand.c
index bd8daf3395ff064eff6dde8d7bbb8ba7da45be0a..64c3acf64106aa640079ad64ab9547676cc4a589 100644 (file)
--- a/src/u_rand.c
+++ b/src/u_rand.c
@@ -2,9 +2,10 @@
 #include "u_assert.h"
 
 void u_srand(u32 s) {
-       lmud_assert();
+       lmud_todo("Not yet implemented");
 }
 
 u32 u_rand(void) {
-       lmud_todo("Not yet implemented")
+       lmud_todo("Not yet implemented");
+       return 0;
 }