diff --git a/game/enemy.c b/game/enemy.c index 1df9cfb..3a46a8b 100644 --- a/game/enemy.c +++ b/game/enemy.c @@ -221,10 +221,10 @@ static const void *load_SEQ_file(const void *src, int *sc, int handle) { memcpy(seq_iter2, seq_items, seq_len * sizeof(struct tmobanimseqitem)); memcpy(gr, allnames, strtable_len); for (int i = 0; i < 6; ++i) { - newseq->seq[i] = sseq.seq[i] + (seq_iter2 - seq_items) + 1; + newseq->seq[i] = seq_iter2 + (sseq.seq[i] - seq_items) + 1; } for (int i = 0; i < 4; ++i) { - newseq->seq[i+6] = sseq.seq[i] + (seq_iter2 - seq_items); + newseq->seq[i+6] = seq_iter2 + (sseq.seq[i] - seq_items) ; newseq->seq_len[i+6] = 1; } @@ -1616,7 +1616,7 @@ void mob_hit(TMOB *mm, int dostal) { void mob_strelba(TMOB *p) { int i; - TITEM *t; + TITEM *t = NULL; for(i=0;i<(int)countof(p->inv);++i) { diff --git a/game/skeldal.c b/game/skeldal.c index 6ded63a..305725e 100644 --- a/game/skeldal.c +++ b/game/skeldal.c @@ -958,7 +958,7 @@ void show_loading_picture(char *filename) ablock_free(p); } -char end_of_song_callback(void *, TMUSIC_SOURCE *s, TMUSIC_SOURCE_TYPE *t) { +char end_of_song_callback(void *userdata, TMUSIC_SOURCE *s, TMUSIC_SOURCE_TYPE *t) { const char *ms = get_next_music_from_playlist(); return resolve_music_source(ms, s, t); } diff --git a/game/temp_storage.cpp b/game/temp_storage.cpp index 8418445..034b8b8 100644 --- a/game/temp_storage.cpp +++ b/game/temp_storage.cpp @@ -114,7 +114,7 @@ uint32_t temp_storage_read(void *data, uint32_t size, TMPFILE_RD *f) { const void *temp_storage_get_binary(TMPFILE_RD *f, uint32_t size, uint32_t *retrieved) { auto &d = f->_data; - if (size > d.size()) size = d.size(); + if (size > d.size()) size = static_cast(d.size()); const void *ret = d.data(); d = d.substr(size); *retrieved = size; @@ -183,5 +183,5 @@ TMPFILE_RD *temp_storage_from_binary(const void *content, size_t sz, void (*dele return new TMPFILE_RD{{static_cast(content), sz}, 0, deleter, ctx}; } uint32_t temp_storage_remain_size(TMPFILE_RD *f) { - return f->_data.size(); + return static_cast(f->_data.size()); }