abort ANY movetype_walk move once a touch function moved the player

[xonotic/darkplaces.git] / image.c

diff --git a/image.c b/image.c
index 2146a64758756dbde6d5dc1ad2170f2c4af1aae2..538620fd0c43be6390d490a728dd47d50c0b076f 100644 (file)
--- a/image.c
+++ b/image.c
@@ -26,14 +26,14 @@ void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int
                if (inputflipdiagonal)
                {
                        for (x = 0, line = inpixels + col_ofs; x < inputwidth; x++, line += col_inc)
-                               for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numinputcomponents)
+                               for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numoutputcomponents)
                                        for (c = 0; c < numoutputcomponents; c++)
                                                outpixels[c] = ((index = outputinputcomponentindices[c]) & 0x80000000) ? index : in[index];
                }
                else
                {
                        for (y = 0, line = inpixels + row_ofs; y < inputheight; y++, line += row_inc)
-                               for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numinputcomponents)
+                               for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numoutputcomponents)
                                        for (c = 0; c < numoutputcomponents; c++)
                                                outpixels[c] = ((index = outputinputcomponentindices[c]) & 0x80000000) ? index : in[index];
                }
@@ -44,14 +44,14 @@ void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int
                if (inputflipdiagonal)
                {
                        for (x = 0, line = inpixels + col_ofs; x < inputwidth; x++, line += col_inc)
-                               for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numinputcomponents)
+                               for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numoutputcomponents)
                                        for (c = 0; c < numoutputcomponents; c++)
                                                outpixels[c] = in[outputinputcomponentindices[c]];
                }
                else
                {
                        for (y = 0, line = inpixels + row_ofs; y < inputheight; y++, line += row_inc)
-                               for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numinputcomponents)
+                               for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numoutputcomponents)
                                        for (c = 0; c < numoutputcomponents; c++)
                                                outpixels[c] = in[outputinputcomponentindices[c]];
                }
@@ -703,6 +703,10 @@ imageformat_t imageformats_tenebrae[] =
        {"override/%s.png", PNG_LoadImage_BGRA},
        {"override/%s.jpg", JPEG_LoadImage_BGRA},
        {"override/%s.pcx", LoadPCX_BGRA},
+       {"%s.tga", LoadTGA_BGRA},
+       {"%s.png", PNG_LoadImage_BGRA},
+       {"%s.jpg", JPEG_LoadImage_BGRA},
+       {"%s.pcx", LoadPCX_BGRA},
        {NULL, NULL}
 };
 
@@ -802,7 +806,7 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
        // now try all the formats in the selected list
        for (format = firstformat;format->formatstring;format++)
        {
-               sprintf (name, format->formatstring, basename);
+               dpsnprintf (name, sizeof(name), format->formatstring, basename);
                f = FS_LoadFile(name, tempmempool, true, &filesize);
                if (f)
                {
@@ -833,10 +837,7 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
                                return data;
                        }
                        else
-                       {
-                               if (developer.integer >= 1)
-                                       Con_DPrintf("Error loading image %s (file loaded but decode failed)\n", name);
-                       }
+                               Con_DPrintf("Error loading image %s (file loaded but decode failed)\n", name);
                }
        }
        if (complain)
@@ -844,10 +845,14 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
                Con_Printf("Couldn't load %s using ", filename);
                for (format = firstformat;format->formatstring;format++)
                {
-                       sprintf (name, format->formatstring, basename);
+                       dpsnprintf (name, sizeof(name), format->formatstring, basename);
                        Con_Printf(format == firstformat ? "\"%s\"" : (format[1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), format->formatstring);
                }
        }
+
+       // texture loading can take a while, so make sure we're sending keepalives
+       CL_KeepaliveMessage(false);
+
        if (developer_memorydebug.integer)
                Mem_CheckSentinelsGlobal();
        return NULL;
@@ -872,7 +877,7 @@ int fixtransparentpixels(unsigned char *data, int w, int h)
        int const FIXTRANS_HAS_U = 8;
        int const FIXTRANS_HAS_D = 16;
        int const FIXTRANS_FIXED = 32;
-       unsigned char *fixMask = Mem_Alloc(tempmempool, w * h);
+       unsigned char *fixMask = (unsigned char *) Mem_Alloc(tempmempool, w * h);
        int fixPixels = 0;
        int changedPixels = 0;
        int x, y;