diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | build/data/psd/body.psd | bin | 0 -> 324637 bytes | |||
| -rw-r--r-- | build/zombies.exe | bin | 2108487 -> 2108497 bytes | |||
| -rw-r--r-- | include/asset_defs.h | 3 | ||||
| -rw-r--r-- | main.c | 4 | ||||
| -rw-r--r-- | src/asset_defs.c | 5 | ||||
| -rw-r--r-- | src/players.c | 10 |
7 files changed, 12 insertions, 12 deletions
@@ -2,7 +2,7 @@ main: rm -rf "build/" mkdir -p "build/" cp -a "data/." "build/data" - gcc -m64 -g -DMODE_DEBUG main.c -o build/zombies.exe -lSDL2_mixer -lSDL2 + gcc -m64 -g -Wl,--stack,4194304 -DMODE_DEBUG main.c -o build/zombies.exe -lSDL2_mixer -lSDL2 cp -a "build/." "C:/Manually installed programs/zombieshooter" ./build/zombies.exe -ip 127.0.0.1 -port 27015 diff --git a/build/data/psd/body.psd b/build/data/psd/body.psd Binary files differnew file mode 100644 index 0000000..901b7d0 --- /dev/null +++ b/build/data/psd/body.psd diff --git a/build/zombies.exe b/build/zombies.exe Binary files differindex f09d198..3a783d1 100644 --- a/build/zombies.exe +++ b/build/zombies.exe diff --git a/include/asset_defs.h b/include/asset_defs.h index c060a0b..dabb766 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -15,8 +15,6 @@ font* fnt_20; font* fnt_16; font* fnt_12; -image* img_test; - // Icons image* img_icon_bullets; image* img_icon_nova; @@ -45,6 +43,7 @@ image* img_molotov_explode; // Players image* img_helmet; image* img_body; +image* img_body2; // Other image* img_zombie_chunk_hand; @@ -1,5 +1,5 @@ -#define ASSET_IMAGE_COUNT 50 -#define ASSET_QUEUE_COUNT 50 +#define ASSET_IMAGE_COUNT 150 +#define ASSET_QUEUE_COUNT 150 #define ASSET_FONT_COUNT 20 #define NUM_AUDIO_CHANNELS 64 diff --git a/src/asset_defs.c b/src/asset_defs.c index bca99f4..ae389ff 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -30,7 +30,7 @@ void load_assets() { img_disconnected = assets_load_image_from_file("data/imgs/icons/disconnected.png"); img_icon_grenade = assets_load_image_from_file("data/imgs/icons/grenade.png"); img_icon_molotov = assets_load_image_from_file("data/imgs/icons/molotov.png"); - img_test = assets_load_image_from_file("data/imgs/players/body.png"); + // Throwables img_grenade = assets_load_image_from_file("data/imgs/throwables/grenade.png"); @@ -76,11 +76,12 @@ void load_assets() { for (int i = 1; i <= NUM_SCREECHES; i++) { char path[100]; sprintf(path, "data/sounds/screech%d.wav", i); - wav_screech[i] = Mix_LoadWAV(path); + wav_screech[i-1] = Mix_LoadWAV(path); } // music music_inside1 = Mix_LoadMUS("data/sounds/music_inside1.mp3"); + } font* get_font(platform_window* window, float scale) { diff --git a/src/players.c b/src/players.c index c4f2c61..6bdac1d 100644 --- a/src/players.c +++ b/src/players.c @@ -279,8 +279,8 @@ void take_player_input(platform_window* window) { dirx /= length; diry /= length; - float gun_offset_x = (get_player_size_in_tile()/2) + (dirx/4); - float gun_offset_y = (get_player_size_in_tile()/2) + (diry/4); + float gun_offset_x = (get_player_size_in_tile()/2) + (dirx); + float gun_offset_y = (get_player_size_in_tile()/2) + (diry); add_message_to_outgoing_queuex(create_protocol_user_look(player_id, gun_offset_x, gun_offset_y, dirx, diry), *global_state.client); } @@ -466,15 +466,15 @@ void draw_player(platform_window* window, player* p, int index) { // Body { - sprite_frame frame = sprite_get_frame(img_test, &p->sprite); - renderer->render_image_quad_partial(img_test, + sprite_frame frame = sprite_get_frame(img_body, &p->sprite); + renderer->render_image_quad_partial(img_body, player_render_x, player_render_y, player_render_x, player_render_y + size, player_render_x + size, player_render_y + size, player_render_x + size, player_render_y, frame.tl, frame.tr, frame.bl, frame.br); - renderer->render_image_quad_partial_tint(img_test, + renderer->render_image_quad_partial_tint(img_body, player_render_x, player_render_y, player_render_x, player_render_y + size, player_render_x + size, player_render_y + size, |