JailDoctor/mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- [FIX] Crash if map() used without map surface assigned

Browse Source 
- [FIX] Crash on restart, system surfaces not finalized properly (Cacaus crash maybe solved?)
This commit is contained in:
Raimon Zamora
2023-01-27 17:15:03 +01:00
parent 3675f887a6
commit 5e4f0559c4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mini.cpp
View File

@@ -344,6 +344,7 @@ int main(int argc,char*argv[]){
Mix_Quit(); Mix_Quit();
for (int i=0;i<10;++i) freesurf(i); for (int i=0;i<10;++i) freesurf(i);
dest_surface = source_surface = map_surface = NULL;
destroyDisplay(); destroyDisplay();
SDL_Quit(); SDL_Quit();
} }
@@ -859,6 +860,7 @@ void mset(int celx, int cely, uint8_t snum) {
} }
void map(int celx, int cely, int sx, int sy, uint8_t celw, uint8_t celh, uint8_t layer) { void map(int celx, int cely, int sx, int sy, uint8_t celw, uint8_t celh, uint8_t layer) {
if (map_surface==NULL) return;
//if (celw <= 0 || celh <= 0 || celw >= TILES_WIDTH || celh >= TILES_HEIGHT) return; //if (celw <= 0 || celh <= 0 || celw >= TILES_WIDTH || celh >= TILES_HEIGHT) return;
sx -= ds::cam[0]; sy -= ds::cam[1]; sx -= ds::cam[0]; sy -= ds::cam[1];
if (sx+celw*8 < ds::clp[0] || sx > ds::clp[2] || sy+celh*8 < ds::clp[1] || sy > ds::clp[3]) return; if (sx+celw*8 < ds::clp[0] || sx > ds::clp[2] || sy+celh*8 < ds::clp[1] || sy > ds::clp[3]) return;