archives/gates_of_skeldal
2
0
Fork 0
mirror of https://github.com/ondra-novak/gates_of_skeldal.git synced 2025-07-20 05:04:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix windows pointer calculation when converting old SEQ format

Browse source
This commit is contained in:
Ondrej Novak 2025-07-10 21:29:04 +02:00
parent 2ce5f77825
commit 9c680064b2
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
game/enemy.c
View file

@ -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(seq_iter2, seq_items, seq_len * sizeof(struct tmobanimseqitem));
memcpy(gr, allnames, strtable_len); memcpy(gr, allnames, strtable_len);
for (int i = 0; i < 6; ++i) { 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) { 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; newseq->seq_len[i+6] = 1;
} }
@ -1616,7 +1616,7 @@ void mob_hit(TMOB *mm, int dostal) {
void mob_strelba(TMOB *p) void mob_strelba(TMOB *p)
{ {
int i; int i;
TITEM *t; TITEM *t = NULL;
for(i=0;i<(int)countof(p->inv);++i) { for(i=0;i<(int)countof(p->inv);++i) {

2
game/skeldal.c
View file

@ -958,7 +958,7 @@ void show_loading_picture(char *filename)
ablock_free(p); 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(); const char *ms = get_next_music_from_playlist();
return resolve_music_source(ms, s, t); return resolve_music_source(ms, s, t);
} }

4
game/temp_storage.cpp
View file

@ -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) { const void *temp_storage_get_binary(TMPFILE_RD *f, uint32_t size, uint32_t *retrieved) {
auto &d = f->_data; auto &d = f->_data;
if (size > d.size()) size = d.size(); if (size > d.size()) size = static_cast<uint32_t>(d.size());
const void *ret = d.data(); const void *ret = d.data();
d = d.substr(size); d = d.substr(size);
*retrieved = 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<const char *>(content), sz}, 0, deleter, ctx}; return new TMPFILE_RD{{static_cast<const char *>(content), sz}, 0, deleter, ctx};
} }
uint32_t temp_storage_remain_size(TMPFILE_RD *f) { uint32_t temp_storage_remain_size(TMPFILE_RD *f) {
return f->_data.size(); return static_cast<uint32_t>(f->_data.size());
} }