From b677738fc607173746b2ce5ba1888ecf7c79ef55 Mon Sep 17 00:00:00 2001 From: rexim Date: Thu, 5 Dec 2019 21:54:19 +0700 Subject: [PATCH] Revert "(#164) %z -> %l for mingw on Windows" This reverts commit 5eb6015521f65328638fce0fa353fc66c081a41f. --- src/game/level/goals.c | 2 +- src/game/level/labels.c | 2 +- src/game/level/lava.c | 2 +- src/game/level/level_editor/label_layer.c | 4 ++-- src/game/level/level_editor/point_layer.c | 4 ++-- src/game/level/level_editor/rect_layer.c | 4 ++-- src/game/level/rigid_bodies.c | 2 +- src/game/sound_samples.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/game/level/goals.c b/src/game/level/goals.c index a4ec9b53..d91bbf68 100644 --- a/src/game/level/goals.c +++ b/src/game/level/goals.c @@ -49,7 +49,7 @@ Goals *create_goals_from_line_stream(LineStream *line_stream) goals->count = 0; if (sscanf( line_stream_next(line_stream), - "%lu", + "%zu", &goals->count) == EOF) { log_fail("Could not read amount of goals\n"); RETURN_LT(lt, NULL); diff --git a/src/game/level/labels.c b/src/game/level/labels.c index 81ccc200..d8b841af 100644 --- a/src/game/level/labels.c +++ b/src/game/level/labels.c @@ -48,7 +48,7 @@ Labels *create_labels_from_line_stream(LineStream *line_stream) if (sscanf( line_stream_next(line_stream), - "%lu", + "%zu", &labels->count) == EOF) { log_fail("Could not read amount of labels\n"); RETURN_LT(lt, NULL); diff --git a/src/game/level/lava.c b/src/game/level/lava.c index 130a9430..33da8b37 100644 --- a/src/game/level/lava.c +++ b/src/game/level/lava.c @@ -33,7 +33,7 @@ Lava *create_lava_from_line_stream(LineStream *line_stream) if (sscanf( line_stream_next(line_stream), - "%lu", + "%zu", &lava->rects_count) < 0) { log_fail("Could not read amount of lava\n"); RETURN_LT(lt, NULL); diff --git a/src/game/level/level_editor/label_layer.c b/src/game/level/level_editor/label_layer.c index 2c79c556..6a5abcf5 100644 --- a/src/game/level/level_editor/label_layer.c +++ b/src/game/level/level_editor/label_layer.c @@ -237,7 +237,7 @@ LabelLayer *create_label_layer_from_line_stream(LineStream *line_stream, const c } size_t n = 0; - if (sscanf(line, "%lu", &n) == EOF) { + if (sscanf(line, "%zu", &n) == EOF) { log_fail("Could not parse amount of labels\n"); RETURN_LT(label_layer->lt, NULL); } @@ -958,7 +958,7 @@ int label_layer_dump_stream(const LabelLayer *label_layer, FILE *filedump) Color *colors = dynarray_data(label_layer->colors); char *texts = dynarray_data(label_layer->texts); - fprintf(filedump, "%ld\n", n); + fprintf(filedump, "%zd\n", n); for (size_t i = 0; i < n; ++i) { fprintf(filedump, "%s %f %f ", ids + LABEL_LAYER_ID_MAX_SIZE * i, diff --git a/src/game/level/level_editor/point_layer.c b/src/game/level/level_editor/point_layer.c index 84c735b3..50f6d775 100644 --- a/src/game/level/level_editor/point_layer.c +++ b/src/game/level/level_editor/point_layer.c @@ -218,7 +218,7 @@ PointLayer *create_point_layer_from_line_stream(LineStream *line_stream, size_t count = 0; if (sscanf( line_stream_next(line_stream), - "%lu", + "%zu", &count) == EOF) { log_fail("Could not read amount of points"); RETURN_LT(point_layer->lt, NULL); @@ -761,7 +761,7 @@ int point_layer_dump_stream(const PointLayer *point_layer, Vec2f *positions = dynarray_data(point_layer->positions); Color *colors = dynarray_data(point_layer->colors); - fprintf(filedump, "%ld\n", n); + fprintf(filedump, "%zd\n", n); for (size_t i = 0; i < n; ++i) { fprintf(filedump, "%s %f %f ", ids + ID_MAX_SIZE * i, diff --git a/src/game/level/level_editor/rect_layer.c b/src/game/level/level_editor/rect_layer.c index e1922c74..757db4d4 100644 --- a/src/game/level/level_editor/rect_layer.c +++ b/src/game/level/level_editor/rect_layer.c @@ -937,7 +937,7 @@ RectLayer *create_rect_layer_from_line_stream(LineStream *line_stream, } size_t count = 0; - if (sscanf(line, "%lu", &count) < 0) { + if (sscanf(line, "%zu", &count) < 0) { RETURN_LT(layer->lt, NULL); } @@ -1215,7 +1215,7 @@ int rect_layer_dump_stream(const RectLayer *layer, FILE *filedump) Color *colors = dynarray_data(layer->colors); Action *actions = dynarray_data(layer->actions); - fprintf(filedump, "%ld\n", n); + fprintf(filedump, "%zd\n", n); for (size_t i = 0; i < n; ++i) { fprintf(filedump, "%s %f %f %f %f ", ids + ENTITY_MAX_ID_SIZE * i, diff --git a/src/game/level/rigid_bodies.c b/src/game/level/rigid_bodies.c index c72931ff..667916e8 100644 --- a/src/game/level/rigid_bodies.c +++ b/src/game/level/rigid_bodies.c @@ -223,7 +223,7 @@ int rigid_bodies_render(RigidBodies *rigid_bodies, return -1; } - snprintf(text_buffer, 256, "id: %ld", id); + snprintf(text_buffer, 256, "id: %zd", id); if (camera_render_debug_text( camera, diff --git a/src/game/sound_samples.c b/src/game/sound_samples.c index abc1ae02..77b76ec8 100644 --- a/src/game/sound_samples.c +++ b/src/game/sound_samples.c @@ -174,7 +174,7 @@ int sound_samples_play_sound(Sound_samples *sound_samples, SDL_ClearQueuedAudio(sound_samples->dev); if (SDL_QueueAudio(sound_samples->dev, sound_samples->active_audio_buf_array[sound_index], sound_samples->audio_buf_size_array[sound_index]) < 0) { - log_warn("Failed to queue audio data of sound index %lu to device: %s\n", sound_index, SDL_GetError()); + log_warn("Failed to queue audio data of sound index %zu to device: %s\n", sound_index, SDL_GetError()); return 0; } SDL_PauseAudioDevice(sound_samples->dev, 0); -- 2.44.0