summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/loader.c2
-rw-r--r--src/main.c5
-rw-r--r--src/res/autotiles.tsx40
-rw-r--r--src/res/padding.asebin0 -> 401 bytes
-rw-r--r--src/res/padding.tsx4
-rw-r--r--src/res/set/autotiles.asebin0 -> 628 bytes
-rw-r--r--src/res/tileset.asebin0 -> 883 bytes
-rw-r--r--src/res/tileset.tsx28
-rw-r--r--src/res/untitled.tmx92
-rw-r--r--src/tilemap.c6
-rw-r--r--src/tilemap.h2
-rw-r--r--src/util.c1
-rw-r--r--src/zip.c8
13 files changed, 179 insertions, 9 deletions
diff --git a/src/loader.c b/src/loader.c
index aa599bd..985f4b7 100644
--- a/src/loader.c
+++ b/src/loader.c
@@ -224,7 +224,7 @@ int loadResources(char *filename) {
 		memcpy(chaos_file->name, zip_file->filename, j);
 		chaos_file->name[j] = 0;
 		
-		chaos_file->extension = get_extension_type(zip_file->filename + j + 1, zip_file->filename_length - j - 1);
+		chaos_file->extension = get_extension_type((char *) zip_file->filename + j + 1, zip_file->filename_length - j - 1);
 		
 		#if 0
 		fprintf(stderr, "%s: %i\n", chaos_file->name, chaos_file->extension);
diff --git a/src/main.c b/src/main.c
index bf23ee0..394f52c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,7 @@
 #define SDL_MAIN_HANDLED
 #include <SDL2/SDL.h>
 
+#include <stdio.h>
 #include <stdlib.h>
 
 #include "input.h"
@@ -57,9 +58,9 @@ int main(int argc, char **argv) {
 			return 1;
 		}
 		free(a);
-		struct blob map = res_get_map("out");
+		struct blob map = res_get_map("untitled");
 		tilemap = load_tilemap(map.data, map.size);
-		printf("load_tilemap %p\n", tilemap);
+		printf("load_tilemap %p\n", (void *) tilemap);
 		SDL_SetRenderTarget(renderer, NULL);
 	}
 
diff --git a/src/res/autotiles.tsx b/src/res/autotiles.tsx
new file mode 100644
index 0000000..891246a
--- /dev/null
+++ b/src/res/autotiles.tsx
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.11.0" name="a" tilewidth="8" tileheight="8" tilecount="32" columns="16">
+ <image source="../../out/autotiles.png" width="128" height="16"/>
+ <wangsets>
+  <wangset name="Unnamed Set" type="corner" tile="-1">
+   <wangcolor name="" color="#ff0000" tile="-1" probability="1"/>
+   <wangcolor name="" color="#00ff00" tile="-1" probability="1"/>
+   <wangtile tileid="1" wangid="0,0,0,0,0,0,0,1"/>
+   <wangtile tileid="2" wangid="0,1,0,0,0,0,0,0"/>
+   <wangtile tileid="3" wangid="0,1,0,0,0,0,0,1"/>
+   <wangtile tileid="4" wangid="0,0,0,0,0,1,0,0"/>
+   <wangtile tileid="5" wangid="0,0,0,0,0,1,0,1"/>
+   <wangtile tileid="6" wangid="0,1,0,0,0,1,0,0"/>
+   <wangtile tileid="7" wangid="0,1,0,0,0,1,0,1"/>
+   <wangtile tileid="8" wangid="0,0,0,1,0,0,0,0"/>
+   <wangtile tileid="9" wangid="0,0,0,1,0,0,0,1"/>
+   <wangtile tileid="10" wangid="0,1,0,1,0,0,0,0"/>
+   <wangtile tileid="11" wangid="0,1,0,1,0,0,0,1"/>
+   <wangtile tileid="12" wangid="0,0,0,1,0,1,0,0"/>
+   <wangtile tileid="13" wangid="0,0,0,1,0,1,0,1"/>
+   <wangtile tileid="14" wangid="0,1,0,1,0,1,0,0"/>
+   <wangtile tileid="15" wangid="0,1,0,1,0,1,0,1"/>
+   <wangtile tileid="17" wangid="0,0,0,0,0,0,0,2"/>
+   <wangtile tileid="18" wangid="0,2,0,0,0,0,0,0"/>
+   <wangtile tileid="19" wangid="0,2,0,0,0,0,0,2"/>
+   <wangtile tileid="20" wangid="0,0,0,0,0,2,0,0"/>
+   <wangtile tileid="21" wangid="0,0,0,0,0,2,0,2"/>
+   <wangtile tileid="22" wangid="0,2,0,0,0,2,0,0"/>
+   <wangtile tileid="23" wangid="0,2,0,0,0,2,0,2"/>
+   <wangtile tileid="24" wangid="0,0,0,2,0,0,0,0"/>
+   <wangtile tileid="25" wangid="0,0,0,2,0,0,0,2"/>
+   <wangtile tileid="26" wangid="0,2,0,2,0,0,0,0"/>
+   <wangtile tileid="27" wangid="0,2,0,2,0,0,0,2"/>
+   <wangtile tileid="28" wangid="0,0,0,2,0,2,0,0"/>
+   <wangtile tileid="29" wangid="0,0,0,2,0,2,0,2"/>
+   <wangtile tileid="30" wangid="0,2,0,2,0,2,0,0"/>
+   <wangtile tileid="31" wangid="0,2,0,2,0,2,0,2"/>
+  </wangset>
+ </wangsets>
+</tileset>
diff --git a/src/res/padding.ase b/src/res/padding.ase
new file mode 100644
index 0000000..3bdd076
--- /dev/null
+++ b/src/res/padding.ase
Binary files differdiff --git a/src/res/padding.tsx b/src/res/padding.tsx
new file mode 100644
index 0000000..304fb63
--- /dev/null
+++ b/src/res/padding.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.11.0" name="c" tilewidth="8" tileheight="8" tilecount="16" columns="16">
+ <image source="../../out/padding.png" width="128" height="8"/>
+</tileset>
diff --git a/src/res/set/autotiles.ase b/src/res/set/autotiles.ase
new file mode 100644
index 0000000..e263ed0
--- /dev/null
+++ b/src/res/set/autotiles.ase
Binary files differdiff --git a/src/res/tileset.ase b/src/res/tileset.ase
new file mode 100644
index 0000000..19cca48
--- /dev/null
+++ b/src/res/tileset.ase
Binary files differdiff --git a/src/res/tileset.tsx b/src/res/tileset.tsx
new file mode 100644
index 0000000..f9b772b
--- /dev/null
+++ b/src/res/tileset.tsx
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.11.0" name="b" tilewidth="8" tileheight="8" tilecount="64" columns="16">
+ <image source="../../out/tileset.png" width="128" height="32"/>
+ <wangsets>
+  <wangset name="Unnamed Set" type="edge" tile="-1">
+   <wangcolor name="" color="#ff0000" tile="-1" probability="1"/>
+   <wangcolor name="" color="#00ff00" tile="-1" probability="1"/>
+   <wangtile tileid="9" wangid="0,0,2,0,0,0,0,0"/>
+   <wangtile tileid="10" wangid="0,0,2,0,0,0,2,0"/>
+   <wangtile tileid="11" wangid="0,0,0,0,0,0,2,0"/>
+   <wangtile tileid="24" wangid="0,0,0,0,2,0,0,0"/>
+   <wangtile tileid="25" wangid="0,0,2,0,2,0,0,0"/>
+   <wangtile tileid="26" wangid="0,0,2,0,2,0,2,0"/>
+   <wangtile tileid="27" wangid="0,0,0,0,2,0,2,0"/>
+   <wangtile tileid="37" wangid="0,0,1,0,0,0,0,0"/>
+   <wangtile tileid="38" wangid="0,0,1,0,0,0,1,0"/>
+   <wangtile tileid="39" wangid="0,0,0,0,0,0,1,0"/>
+   <wangtile tileid="40" wangid="2,0,0,0,2,0,0,0"/>
+   <wangtile tileid="41" wangid="2,0,2,0,2,0,0,0"/>
+   <wangtile tileid="42" wangid="2,0,2,0,2,0,2,0"/>
+   <wangtile tileid="43" wangid="2,0,0,0,2,0,2,0"/>
+   <wangtile tileid="56" wangid="2,0,0,0,0,0,0,0"/>
+   <wangtile tileid="57" wangid="2,0,2,0,0,0,0,0"/>
+   <wangtile tileid="58" wangid="2,0,2,0,0,0,2,0"/>
+   <wangtile tileid="59" wangid="2,0,0,0,0,0,2,0"/>
+  </wangset>
+ </wangsets>
+</tileset>
diff --git a/src/res/untitled.tmx b/src/res/untitled.tmx
new file mode 100644
index 0000000..51b506c
--- /dev/null
+++ b/src/res/untitled.tmx
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="8" tileheight="8" infinite="0" nextlayerid="7" nextobjectid="6">
+ <properties>
+  <property name="custom 1" value="1234"/>
+  <property name="custom 2" type="bool" value="true"/>
+ </properties>
+ <tileset firstgid="1" source="autotiles.tsx"/>
+ <tileset firstgid="33" source="tileset.tsx"/>
+ <tileset firstgid="97" source="padding.tsx"/>
+ <layer id="6" name="Tile Layer 3" width="30" height="20" parallaxx="0.5" parallaxy="0.5">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,35,35,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,35,35,35,35,35,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,35,35,35,35,35,35,35,35,0,0,0,35,35,35,0,0,0,0,0,0,0,0,0,35,0,0,0,
+0,0,0,35,35,35,35,35,35,35,35,35,0,35,35,35,35,35,0,0,0,0,0,0,0,35,35,35,0,0,
+0,0,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,0,0,0,0,0,35,35,35,35,35,0,
+0,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,0,0,0,35,35,35,35,35,35,35,
+35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,0,35,35,35,35,35,35,35,35,
+35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,
+35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,
+35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,
+35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,
+35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,
+35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,
+35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,
+35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35,35
+</data>
+ </layer>
+ <group id="5" name="Group Layer 1">
+  <layer id="1" name="Tile Layer 1" width="30" height="20" offsetx="-4" offsety="-4">
+   <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,9,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,11,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,9,13,13,15,14,13,13,13,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,4,4,4,4,12,8,4,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,11,6,0,0,0,0,5,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,3,2,0,0,0,0,2,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,5,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,9,13,13,13,13,13,13,5,0,2,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,4,12,16,16,8,4,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,11,16,16,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,3,4,4,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,9,5,25,29,29,29,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,9,13,15,6,19,28,32,32,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,3,12,16,14,5,27,32,32,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,11,8,4,2,19,20,20,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+  </layer>
+  <layer id="4" name="Tile Layer 2" width="30" height="20">
+   <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,85,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,87,0,0,0,73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,70,71,71,72,0,0,0,0,0,0,0,73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,42,43,43,43,43,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,97,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+  </layer>
+ </group>
+ <objectgroup id="2" name="Object Layer 1">
+  <object id="3" x="8" y="8">
+   <point/>
+  </object>
+  <object id="4" x="16" y="32">
+   <point/>
+  </object>
+ </objectgroup>
+</map>
diff --git a/src/tilemap.c b/src/tilemap.c
index 3f19f0e..5660046 100644
--- a/src/tilemap.c
+++ b/src/tilemap.c
@@ -37,7 +37,7 @@ void free_tilemap(struct tilemap *tilemap) {
 	free(tilemap);
 }
 
-struct tilemap *load_tilemap(void const *data, size_t size) {
+struct tilemap *load_tilemap(void *data, size_t size) {
 	struct tilemap *tilemap = malloc(sizeof (struct tilemap));
 	if (tilemap == NULL) {
 		return NULL;
@@ -50,10 +50,10 @@ struct tilemap *load_tilemap(void const *data, size_t size) {
 	tilemap->collision = NULL;
 	tilemap->tilemaps = NULL;
 
-	struct sets const *const sets = data;
+	struct sets *const sets = data;
 	data = sets + 1;
 	size -= sizeof (struct sets);
-	char const *str = data;
+	char *str = data;
 	int y = 0;
 	SDL_SetRenderTarget(renderer, tilemap->tileset);
 	SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
diff --git a/src/tilemap.h b/src/tilemap.h
index dc0f938..e9b42aa 100644
--- a/src/tilemap.h
+++ b/src/tilemap.h
@@ -16,4 +16,4 @@ extern struct tilemap {
 
 void init_tilemap(void);
 void free_tilemap(struct tilemap *tilemap);
-struct tilemap *load_tilemap(void const *data, size_t size);
+struct tilemap *load_tilemap(void *data, size_t size);
diff --git a/src/util.c b/src/util.c
index fc20e94..f6b00a9 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,5 +1,6 @@
 #include <stdio.h> // FILE *
 #include <errno.h> // ESPIPE
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h> // true/false
diff --git a/src/zip.c b/src/zip.c
index aca980d..76820b5 100644
--- a/src/zip.c
+++ b/src/zip.c
@@ -39,7 +39,9 @@ struct zip_file *zip_index(char *const restrict file, size_t const size, int *co
 	// find and verify the footer
 	struct zip_footer *footer = zip_find_footer(file, size, &err);
 	if (footer == NULL) {
-		error && (*error = err);
+		if (error) {
+			*error = err;
+		}
 		return NULL;
 	}
 	
@@ -47,7 +49,9 @@ struct zip_file *zip_index(char *const restrict file, size_t const size, int *co
 	struct zip_file *headers = malloc(sizeof (*headers) + footer->headers_no * sizeof (*headers->files));
 	err = index_zip(headers->files, file, footer);
 	if (err) {
-		error && (*error = err);
+		if (error) {
+			*error = err;
+		}
 		free(headers);
 		return NULL;
 	}
generated by cgit-pink 1.4.1-2-gfad0 (git 2.37.1) at 2024-11-22 09:49:41 +0000