From 92def83d88b81aab0cd08e44759b8b8d6354b7c3 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Wed, 27 Dec 2023 18:57:42 +0100 Subject: work --- build/data/imgs/objects/metal_wall2.png | Bin 0 -> 3684 bytes build/data/imgs/objects/metal_wall_front.png | Bin 3237 -> 2091 bytes build/data/maps/map1.dat | Bin 8034408 -> 8322408 bytes build/data/psd/metal_wall.psd | Bin 0 -> 117251 bytes build/data/psd/metal_wall2.psd | Bin 0 -> 117251 bytes build/zombies.exe | Bin 2111124 -> 2110612 bytes data/imgs/objects/metal_wall2.png | Bin 0 -> 3684 bytes data/imgs/objects/metal_wall_front.png | Bin 3237 -> 2091 bytes data/maps/map1.dat | Bin 8034408 -> 8322408 bytes data/psd/metal_wall.psd | Bin 0 -> 117251 bytes data/psd/metal_wall2.psd | Bin 0 -> 117251 bytes issues | 1 - src/game.c | 4 ++-- src/map.c | 15 ++------------- src/throwables.c | 2 ++ 15 files changed, 6 insertions(+), 16 deletions(-) create mode 100644 build/data/imgs/objects/metal_wall2.png create mode 100644 build/data/psd/metal_wall.psd create mode 100644 build/data/psd/metal_wall2.psd create mode 100644 data/imgs/objects/metal_wall2.png create mode 100644 data/psd/metal_wall.psd create mode 100644 data/psd/metal_wall2.psd diff --git a/build/data/imgs/objects/metal_wall2.png b/build/data/imgs/objects/metal_wall2.png new file mode 100644 index 0000000..c01df17 Binary files /dev/null and b/build/data/imgs/objects/metal_wall2.png differ diff --git a/build/data/imgs/objects/metal_wall_front.png b/build/data/imgs/objects/metal_wall_front.png index 98f87ac..569355a 100644 Binary files a/build/data/imgs/objects/metal_wall_front.png and b/build/data/imgs/objects/metal_wall_front.png differ diff --git a/build/data/maps/map1.dat b/build/data/maps/map1.dat index 654bb33..0c2f19a 100644 Binary files a/build/data/maps/map1.dat and b/build/data/maps/map1.dat differ diff --git a/build/data/psd/metal_wall.psd b/build/data/psd/metal_wall.psd new file mode 100644 index 0000000..72a75bb Binary files /dev/null and b/build/data/psd/metal_wall.psd differ diff --git a/build/data/psd/metal_wall2.psd b/build/data/psd/metal_wall2.psd new file mode 100644 index 0000000..72a75bb Binary files /dev/null and b/build/data/psd/metal_wall2.psd differ diff --git a/build/zombies.exe b/build/zombies.exe index 662f70d..0e50984 100644 Binary files a/build/zombies.exe and b/build/zombies.exe differ diff --git a/data/imgs/objects/metal_wall2.png b/data/imgs/objects/metal_wall2.png new file mode 100644 index 0000000..c01df17 Binary files /dev/null and b/data/imgs/objects/metal_wall2.png differ diff --git a/data/imgs/objects/metal_wall_front.png b/data/imgs/objects/metal_wall_front.png index 98f87ac..569355a 100644 Binary files a/data/imgs/objects/metal_wall_front.png and b/data/imgs/objects/metal_wall_front.png differ diff --git a/data/maps/map1.dat b/data/maps/map1.dat index 654bb33..0c2f19a 100644 Binary files a/data/maps/map1.dat and b/data/maps/map1.dat differ diff --git a/data/psd/metal_wall.psd b/data/psd/metal_wall.psd new file mode 100644 index 0000000..72a75bb Binary files /dev/null and b/data/psd/metal_wall.psd differ diff --git a/data/psd/metal_wall2.psd b/data/psd/metal_wall2.psd new file mode 100644 index 0000000..72a75bb Binary files /dev/null and b/data/psd/metal_wall2.psd differ diff --git a/issues b/issues index fb3e47a..9c01fed 100644 --- a/issues +++ b/issues @@ -1,4 +1,3 @@ -- client has infinite throwables - client ping is wrong - client cant purchase - client crash allocator out of space \ No newline at end of file diff --git a/src/game.c b/src/game.c index 41064e4..e5a34be 100644 --- a/src/game.c +++ b/src/game.c @@ -66,8 +66,8 @@ void load_map() { thread_detach(&send_thread); } - create_empty_map(); - //load_map_from_file(); + //create_empty_map(); + load_map_from_file(); create_objects(); pathfinding_init(); diff --git a/src/map.c b/src/map.c index 6eba31a..e697673 100644 --- a/src/map.c +++ b/src/map.c @@ -224,20 +224,9 @@ void create_empty_map() { } for (int x = 0; x < MAP_SIZE_X; x++) { - map_to_load.objects[50+x] = (object){.active = true, .position = (vec3f){x, 0, 0}, .size = (vec3f){1,1,1}, .type = OBJECT_METAL_WALL_FRONT}; + map_to_load.objects[x] = (object){.active = true, .position = (vec3f){x, 0, 0}, .size = (vec3f){1,1,1}, .type = OBJECT_METAL_WALL_FRONT}; } - map_to_load.objects[0] = (object){.active = true, .position = (vec3f){16, 8, 0}, .size = (vec3f){1,1,2}, .type = OBJECT_PLANTBOX1}; - - map_to_load.objects[1] = (object){.active = true, .position = (vec3f){0, 0, 0}, .size = (vec3f){1,1,2}, .type = OBJECT_COBBLESTONEWALL1}; - map_to_load.objects[2] = (object){.active = true, .position = (vec3f){0, 1, 0}, .size = (vec3f){1,1,2}, .type = OBJECT_COBBLESTONEWALL1}; - map_to_load.objects[3] = (object){.active = true, .position = (vec3f){0, 2, 0}, .size = (vec3f){1,1,2}, .type = OBJECT_COBBLESTONEWALL1}; - - map_to_load.objects[4] = (object){.active = true, .position = (vec3f){14, 8, 0}, .size = (vec3f){1,1,2}, .type = OBJECT_PLANTBOX1}; - map_to_load.objects[5] = (object){.active = true, .position = (vec3f){14, 12, 0}, .size = (vec3f){1,1,2}, .type = OBJECT_PLANTBOX1}; - map_to_load.objects[6] = (object){.active = true, .position = (vec3f){16, 10, 0}, .size = (vec3f){1,1,2}, .type = OBJECT_PLANTBOX1}; - map_to_load.objects[7] = (object){.active = true, .position = (vec3f){14, 14, 0}, .size = (vec3f){1,1,2}, .type = OBJECT_PLANTBOX1}; - map_to_load.light_emitters[0] = (light_emitter){.brightness = 1.0f, .position = (vec3f){0, 0, 10}, .range = 20.0f, .active = true}; map_to_load.light_emitters[1] = (light_emitter){.brightness = 1.0f, .position = (vec3f){0, 30, 10}, .range = 20.0f, .active = true}; @@ -448,6 +437,6 @@ inline map_info get_map_info(platform_window* window) { info.tile_width = get_tile_width(window); info.tile_height = get_tile_height(window); info.px_incline = 0.0f; //info.tile_width/3; // info.tile_width/3; // offset*info.tile_width; - info.px_raised_per_h = info.tile_height/5.0f; + info.px_raised_per_h = info.tile_height; return info; } \ No newline at end of file diff --git a/src/throwables.c b/src/throwables.c index 2ed5133..518502f 100644 --- a/src/throwables.c +++ b/src/throwables.c @@ -48,11 +48,13 @@ void throw_throwable(u32 id, throwable_type type, float dirx, float diry) { switch(type) { case THROWABLE_GRENADE: { + p->throwables.grenades--; t.sprite = create_sprite(img_grenade_explode, 12, 96, 96, 0.1f); t.damage = 1500; t.direction = (vec3f){.x = dirx*1.5f, .y = diry*1.5f, .z = -0.2f}; } break; case THROWABLE_MOLOTOV: { + p->throwables.molotovs--; t.sprite = create_sprite(img_molotov_explode, 32, 66, 119, 0.04f); t.damage = 300; t.direction = (vec3f){.x = dirx*2.5f, .y = diry*2.5f, .z = -0.3f}; -- cgit v1.2.3-70-g09d2