random-mirrors/librw
1
0
Fork 0
mirror of https://github.com/aap/librw.git synced 2025-12-22 02:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved iOS dff converter to rsltest

Browse Source
This commit is contained in:
aap
2016-01-10 18:18:03 +01:00
parent a42bfb90ac
commit 79c89ebbba
17 changed files with 602 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/image.cpp
View File

@@ -130,18 +130,19 @@ Texture::read(const char *name, const char *mask)
tex = new Texture;
strncpy(tex->name, name, 32);
strncpy(tex->mask, mask, 32);
char *n = (char*)malloc(strlen(name) + 5);
strcpy(n, name);
strcat(n, ".tga");
Image *img = readTGA(n);
free(n);
if(img){
raster = Raster::createFromImage(img);
delete img;
}else
// char *n = (char*)malloc(strlen(name) + 5);
// strcpy(n, name);
// strcat(n, ".tga");
// Image *img = readTGA(n);
// free(n);
// if(img){
// //raster = Raster::createFromImage(img);
// raster = new Raster(0, 0, 0, 0x80);
// delete img;
// }else
raster = new Raster(0, 0, 0, 0x80);
tex->raster = raster;
if(currentTexDictionary && img)
if(currentTexDictionary /*&& img*/)
currentTexDictionary->add(tex);
return tex;
}