diff --git a/polymer/eduke32/build/src/dxtfilter.c b/polymer/eduke32/build/src/dxtfilter.c index cbfdb856f..810d4aa0f 100644 --- a/polymer/eduke32/build/src/dxtfilter.c +++ b/polymer/eduke32/build/src/dxtfilter.c @@ -103,7 +103,7 @@ static int32_t dedxt_handle_io(int32_t fil, int32_t j /* TODO: better name */, inbuf = (ispacked && cleng < j) ? packbuf : midbuf; - if (texcache.memcache.ptr && texcache.memcache.size >= texcache.filepos + cleng) + if (texcache.memcache.ptr && texcache.memcache.size >= (bsize_t)texcache.filepos + cleng) { if (ispacked && cleng < j) { @@ -235,4 +235,4 @@ int32_t dedxtfilter(int32_t fil, const texcachepicture *pict, char *pic, void *m return 0; } -#endif \ No newline at end of file +#endif diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index 4af72cc7f..a5438155d 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -4506,7 +4506,7 @@ static void parascan(int32_t dax1, int32_t dax2, int32_t sectnum, char dastat, i // WGR2 SVN: select new episode after playing wgmicky1 with Polymer // (maybe switched to classic earlier). - // --> rendmode==0, glgetrendermode() == REND_POLYMER, we end up with globalpicnum==266, + // --> rendmode==0, glrendermode == REND_POLYMER, we end up with globalpicnum==266, // picsiz...==9 and dapskybits==3 // FIXME ? if (k < 0) diff --git a/polymer/eduke32/build/src/texcache.c b/polymer/eduke32/build/src/texcache.c index e609f172e..43b79e889 100644 --- a/polymer/eduke32/build/src/texcache.c +++ b/polymer/eduke32/build/src/texcache.c @@ -188,7 +188,8 @@ void texcache_syncmemcache(void) { size_t len; - if (!texcache.memcache.ptr || texcache.filehandle == -1 || Bfilelength(texcache.filehandle) <= texcache.memcache.size) + if (!texcache.memcache.ptr || texcache.filehandle == -1 || + (bsize_t)Bfilelength(texcache.filehandle) <= texcache.memcache.size) return; len = Bfilelength(texcache.filehandle); @@ -378,7 +379,7 @@ int32_t texcache_readdata(void *dest, int32_t len) texcache.filepos += len; - if (texcache.memcache.ptr && texcache.memcache.size >= ocachepos+len) + if (texcache.memcache.ptr && texcache.memcache.size >= (bsize_t)ocachepos+len) { // initprintf("using memcache!\n"); Bmemcpy(dest, texcache.memcache.ptr+ocachepos, len); @@ -744,13 +745,13 @@ void texcache_setupmemcache(void) if (!texcache.memcache.ptr) { - initprintf("Failed allocating %d bytes for memcache, disabling memcache.\n", texcache.memcache.size); + initprintf("Failed allocating %d bytes for memcache, disabling memcache.\n", (int)texcache.memcache.size); texcache_clearmemcache(); texcache.memcache.noalloc = 1; return; } - if (Bread(texcache.filehandle, texcache.memcache.ptr, texcache.memcache.size) != texcache.memcache.size) + if (Bread(texcache.filehandle, texcache.memcache.ptr, texcache.memcache.size) != (bssize_t)texcache.memcache.size) { initprintf("Failed reading texcache into memcache!\n"); texcache_clearmemcache();