duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make some code uniform

Browse source
This commit is contained in:
Clownacy 2020-09-10 21:26:22 +01:00
parent 84c1e00c95
commit 1f88f7ffaf
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Draw.cpp
View file

@ -236,12 +236,13 @@ BOOL MakeSurface_Resource(const char *name, SurfaceID surf_no)
return FALSE; return FALSE;
} }
FreeBitmap(image_buffer);
surface_metadata[surf_no].type = SURFACE_SOURCE_RESOURCE; surface_metadata[surf_no].type = SURFACE_SOURCE_RESOURCE;
surface_metadata[surf_no].width = width; surface_metadata[surf_no].width = width;
surface_metadata[surf_no].height = height; surface_metadata[surf_no].height = height;
surface_metadata[surf_no].bSystem = FALSE; surface_metadata[surf_no].bSystem = FALSE;
strcpy(surface_metadata[surf_no].name, name); strcpy(surface_metadata[surf_no].name, name);
FreeBitmap(image_buffer);
return TRUE; return TRUE;
} }
@ -297,12 +298,13 @@ BOOL MakeSurface_File(const char *name, SurfaceID surf_no)
return FALSE; return FALSE;
} }
FreeBitmap(image_buffer);
surface_metadata[surf_no].type = SURFACE_SOURCE_FILE; surface_metadata[surf_no].type = SURFACE_SOURCE_FILE;
surface_metadata[surf_no].width = width; surface_metadata[surf_no].width = width;
surface_metadata[surf_no].height = height; surface_metadata[surf_no].height = height;
surface_metadata[surf_no].bSystem = FALSE; surface_metadata[surf_no].bSystem = FALSE;
strcpy(surface_metadata[surf_no].name, name); strcpy(surface_metadata[surf_no].name, name);
FreeBitmap(image_buffer);
return TRUE; return TRUE;
} }
@ -373,6 +375,7 @@ BOOL ReloadBitmap_File(const char *name, SurfaceID surf_no)
} }
FreeBitmap(image_buffer); FreeBitmap(image_buffer);
surface_metadata[surf_no].type = SURFACE_SOURCE_FILE; surface_metadata[surf_no].type = SURFACE_SOURCE_FILE;
strcpy(surface_metadata[surf_no].name, name); strcpy(surface_metadata[surf_no].name, name);