Index: picedit.c ================================================================== --- picedit.c +++ picedit.c @@ -209,11 +209,12 @@ if(i<255) nam[i++]=j; } nam[i]=0; sqlite3_reset(st); sqlite3_bind_text(st,1,nam,i,SQLITE_TRANSIENT); - sqlite3_bind_int(st,2,j=(i>4 && !memcmp(".IMG",nam+i-4,4)?1:!memcmp(".DEP",nam+i-4,4)?2:0)); + if(i>4) j=(!memcmp(".IMG",nam+i-4,4)?1:!memcmp(".DEP",nam+i-4,4)?2:0); else j=0; + sqlite3_bind_int(st,2,j); if(j) r++; i=fgetc(fp)<<16; i|=fgetc(fp)<<24; i|=fgetc(fp)<<0; i|=fgetc(fp)<<8; Index: picture.c ================================================================== --- picture.c +++ picture.c @@ -703,11 +703,11 @@ if(j==EOF) goto nomore1; if(i<255) nam[i++]=j; } nam[i]=0; if(i>4 && (!memcmp(".IMG",nam+i-4,4) || !memcmp(".DEP",nam+i-4,4))) { - if(nam[i-3]=='D') j=0; else j=1; + if(nam[i-3]=='I') j=1; else j=0; if(n++==32768) fatal("Too many pictures\n"); sqlite3_reset(st); sqlite3_bind_int(st,1,n); sqlite3_bind_text(st,2,nam,i-4,SQLITE_TRANSIENT); sqlite3_bind_int64(st,3,ftell(fp)+4); @@ -767,11 +767,11 @@ if((j=sqlite3_step(st))!=SQLITE_ROW) { if(j==SQLITE_DONE) break; fatal("SQL error (%d): %s\n",j,sqlite3_errmsg(userdb)); } fseek(fp,sqlite3_column_int64(st,1)-4,SEEK_SET); - load_dependent_picture(fp,sqlite3_column_int(st,0),altImage); + load_dependent_picture(fp,sqlite3_column_int(st,0),0); } sqlite3_finalize(st); fclose(fp); SDL_SetColorKey(picts,SDL_SRCCOLORKEY|SDL_RLEACCEL,0); done: