OSDN Git Service
(root)
/
proj16
/
16.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
78c1530
)
got the jsmn library issue sorted out
author
sparky4
<sparky4@cock.li>
Wed, 24 Apr 2019 16:03:05 +0000
(11:03 -0500)
committer
sparky4
<sparky4@cock.li>
Wed, 24 Apr 2019 16:03:05 +0000
(11:03 -0500)
src/lib/16_map.c
patch
|
blob
|
history
src/lib/16_map.h
patch
|
blob
|
history
diff --git
a/src/lib/16_map.c
b/src/lib/16_map.c
index
dad025f
..
afb8ff0
100755
(executable)
--- a/
src/lib/16_map.c
+++ b/
src/lib/16_map.c
@@
-23,6
+23,8
@@
//TODO USE CA AND THIS FILE FORMAT
\r
\r
#include "src/lib/16_map.h"
\r
//TODO USE CA AND THIS FILE FORMAT
\r
\r
#include "src/lib/16_map.h"
\r
+#define JSMN_STATIC
\r
+#include "src/lib/jsmn/jsmn.h"
\r
#include <malloc.h>
\r
\r
// Ideally, preprocess json during compilation and read serialized data
\r
#include <malloc.h>
\r
\r
// Ideally, preprocess json during compilation and read serialized data
\r
diff --git
a/src/lib/16_map.h
b/src/lib/16_map.h
index
f99193b
..
d40701d
100755
(executable)
--- a/
src/lib/16_map.h
+++ b/
src/lib/16_map.h
@@
-23,17
+23,18
@@
#ifndef _16_MAP__H_
\r
#define _16_MAP__H_
\r
\r
#ifndef _16_MAP__H_
\r
#define _16_MAP__H_
\r
\r
-#define JSMN_STATIC
\r
-
\r
#include "src/lib/16_head.h"
\r
#include "src/lib/16_head.h"
\r
+#include "src/lib/16_tail.h"
\r
#include "src/lib/16_tdef.h"
\r
#include "src/lib/16_tdef.h"
\r
-#include "src/lib/jsmn/jsmn.h"
\r
//#include "stdio.h" included in 16_head.h
\r
//#include "stdlib.h" included in 16_head.h
\r
#include "src/lib/16_vl.h"
\r
#include "src/lib/16_ca.h"
\r
#include "src/lib/16_mm.h"
\r
#include "src/lib/16_pm.h"
\r
//#include "stdio.h" included in 16_head.h
\r
//#include "stdlib.h" included in 16_head.h
\r
#include "src/lib/16_vl.h"
\r
#include "src/lib/16_ca.h"
\r
#include "src/lib/16_mm.h"
\r
#include "src/lib/16_pm.h"
\r
+/*#define JSMN_STATIC
\r
+#include "src/lib/jsmn/jsmn.h"
\r
+*/
\r
\r
\r
//#define DEBUG_MAPDATA
\r
\r
\r
//#define DEBUG_MAPDATA
\r
@@
-43,7
+44,6
@@
\r
//typedefs moved to 16_tdef.h
\r
\r
\r
//typedefs moved to 16_tdef.h
\r
\r
-int jsoneq(const char *json, jsmntok_t *tok, const char *s);
\r
//word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);
\r
//int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);
\r
int newloadmap(char *mn, map_t *map);
\r
//word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);
\r
//int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);
\r
int newloadmap(char *mn, map_t *map);
\r