Overview
Comment: | Finish the implementation of multidependent pictures. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
59c19555567835ce436f98c05bfd8b61 |
User & Date: | user on 2022-07-21 23:39:11 |
Other Links: | manifest | tags |
Context
2022-07-28
| ||
03:23 | Fix the version_change logic in edit.c to work with the new user state format. (It no longer works with the old format, although it will automatically be upgraded in game.c anyways, so it is unlikely to need to work with the old format.) check-in: 846874b02f user: user tags: trunk | |
2022-07-21
| ||
23:39 | Finish the implementation of multidependent pictures. check-in: 59c1955556 user: user tags: trunk | |
21:15 | Implement editing multidependent pictures; also improve comconfig.doc (independently) check-in: 3083ae9c8d user: user tags: trunk | |
Changes
Modified main.c from [85ed0502be] to [d5598f7687].
︙ | ︙ | |||
37 38 39 40 41 42 43 | "BEGIN;" "PRAGMA APPLICATION_ID("CONFIG_APPLICATION_ID");" "PRAGMA RECURSIVE_TRIGGERS(1);" "CREATE TABLE IF NOT EXISTS `USERCACHEINDEX`(`ID` INTEGER PRIMARY KEY, `NAME` TEXT, `TIME` INT);" "CREATE TABLE IF NOT EXISTS `USERCACHEDATA`(`ID` INTEGER PRIMARY KEY, `FILE` INT, `LEVEL` INT, `NAME` TEXT COLLATE NOCASE, `OFFSET` INT, `DATA` BLOB, `USERSTATE` BLOB);" "CREATE UNIQUE INDEX IF NOT EXISTS `USERCACHEDATA_I1` ON `USERCACHEDATA`(`FILE`, `LEVEL`);" "CREATE TRIGGER IF NOT EXISTS `USERCACHEINDEX_DELETION` AFTER DELETE ON `USERCACHEINDEX` BEGIN DELETE FROM `USERCACHEDATA` WHERE `FILE` = OLD.`ID`; END;" | | | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | "BEGIN;" "PRAGMA APPLICATION_ID("CONFIG_APPLICATION_ID");" "PRAGMA RECURSIVE_TRIGGERS(1);" "CREATE TABLE IF NOT EXISTS `USERCACHEINDEX`(`ID` INTEGER PRIMARY KEY, `NAME` TEXT, `TIME` INT);" "CREATE TABLE IF NOT EXISTS `USERCACHEDATA`(`ID` INTEGER PRIMARY KEY, `FILE` INT, `LEVEL` INT, `NAME` TEXT COLLATE NOCASE, `OFFSET` INT, `DATA` BLOB, `USERSTATE` BLOB);" "CREATE UNIQUE INDEX IF NOT EXISTS `USERCACHEDATA_I1` ON `USERCACHEDATA`(`FILE`, `LEVEL`);" "CREATE TRIGGER IF NOT EXISTS `USERCACHEINDEX_DELETION` AFTER DELETE ON `USERCACHEINDEX` BEGIN DELETE FROM `USERCACHEDATA` WHERE `FILE` = OLD.`ID`; END;" "CREATE TEMPORARY TABLE `PICTURES`(`ID` INTEGER PRIMARY KEY, `NAME` TEXT COLLATE NOCASE, `OFFSET` INT, `DEPENDENT` INT, `MISC` BLOB);" "CREATE TEMPORARY TABLE `VARIABLES`(`ID` INTEGER PRIMARY KEY, `NAME` TEXT);" "CREATE TEMPORARY TABLE `DIVISIONS`(`HEADING` BLOB NOT NULL, `FIRST` INT NOT NULL);" "COMMIT;" ; sqlite3*userdb; xrm_db*resourcedb; |
︙ | ︙ |
Modified picedit.doc from [6c48fbb9a5] to [cbbac7773d].
︙ | ︙ | |||
236 237 238 239 240 241 242 | * Shift: Shift the picture. Specify the sizes and shift amounts in the format "size: shift"; each size also affects all multiples of that size, in which case the shift amount is also multiplied by the same amount. === Multidependent pictures === | < < < | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | * Shift: Shift the picture. Specify the sizes and shift amounts in the format "size: shift"; each size also affects all multiples of that size, in which case the shift amount is also multiplied by the same amount. === Multidependent pictures === A multidependent picture lump defines several pictures which are formed from one or more independent pictures and filters, using common sets of base pictures and filter chains. You can define a list of up to 63 bases and up to three lists of filter chains each of which may contain up to 63 filter chains; all pictures are generated which take all combinations of one item from each list. |
︙ | ︙ |
Modified picture.c from [feff4c6f93] to [e6928b82be].
︙ | ︙ | |||
504 505 506 507 508 509 510 | p+=picts->pitch; q+=r->w; } SDL_UnlockSurface(picts); free(d); } | | < < < < < > | | | | | | | | | | | | | | | > > > | 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 | p+=picts->pitch; q+=r->w; } SDL_UnlockSurface(picts); free(d); } static void load_dependent_picture(FILE*fp,Sint32 sz,Uint16 img,int alt) { SDL_Rect src={0,0,picture_size,picture_size}; SDL_Rect dst={(img&15)*picture_size,(img>>4)*picture_size,picture_size,picture_size}; sqlite3_stmt*st; int c,i,x,y; char nam[128]; Uint8 buf[512]; Uint8*p; if(sqlite3_prepare_v2(userdb,"SELECT `ID` FROM `PICTURES` WHERE `NAME` = ?1 AND NOT `DEPENDENT`;",-1,&st,0)) fatal("Unable to prepare SQL statement while loading pictures: %s\n",sqlite3_errmsg(userdb)); i=0; while(sz) { c=fgetc(fp); if(c<32) break; if(i<127) nam[i++]=c; sz--; } if(sz) ungetc(c,fp); if(i) { sqlite3_bind_text(st,1,nam,i,0); i=sqlite3_step(st); if(i==SQLITE_DONE) { fprintf(stderr,"Cannot find base picture for a dependent picture; ignoring\n"); sqlite3_finalize(st); return; } else if(i!=SQLITE_ROW) { fatal("SQL error (%d): %s\n",i,sqlite3_errmsg(userdb)); } i=sqlite3_column_int(st,0); sqlite3_reset(st); src.x=(i&15)*picture_size; src.y=(i>>4)*picture_size; SDL_SetColorKey(picts,0,0); SDL_BlitSurface(picts,&src,picts,&dst); } else { SDL_FillRect(picts,&dst,0); } while(sz-->0) switch(c=fgetc(fp)) { case 0 ... 7: // Flip/rotate pic_orientation(&dst,c); break; case 8: // *->* *->* *->* c=fgetc(fp); sz-=c+1; |
︙ | ︙ | |||
657 658 659 660 661 662 663 664 665 666 667 668 669 670 | default: fprintf(stderr,"Unrecognized command in dependent picture (%d)\n",c); goto done; } if(sz<-1) fprintf(stderr,"Lump size of dependent picture is too short\n"); done: sqlite3_finalize(st); } void load_pictures(void) { sqlite3_stmt*st=0; FILE*fp; Uint8 wantsize[32]; Uint8 nwantsize=0; Uint8 altImage; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 | default: fprintf(stderr,"Unrecognized command in dependent picture (%d)\n",c); goto done; } if(sz<-1) fprintf(stderr,"Lump size of dependent picture is too short\n"); done: sqlite3_finalize(st); } static int find_multidependent(sqlite3_stmt*st,FILE*fp,int len,int npic) { sqlite3_stmt*s1; int at=4; long rew=ftell(fp); Uint8*mem=malloc(len+1); int i,j,zt; if(!mem) fatal("Allocation failed\n"); fread(mem,1,len,fp); mem[len]=0; fseek(fp,rew+len,SEEK_SET); if(sqlite3_exec(userdb,"CREATE TEMPORARY TABLE IF NOT EXISTS `_MUL`(`X`,`Y`,`N`,`Z`);",0,0,0)) fatal("SQL error: %s\n",sqlite3_errmsg(userdb)); if(sqlite3_prepare_v2(userdb,"INSERT INTO `_MUL`(`X`,`Y`,`N`,`Z`) VALUES(?1,?2,SUBSTR('._-',?5,1)||?3,?4);",-1,&s1,0)) fatal("Unable to prepare SQL statement while loading pictures: %s\n",sqlite3_errmsg(userdb)); sqlite3_bind_int(s1,2,0); sqlite3_bind_text(s1,3,"",0,0); sqlite3_bind_int(s1,5,4); for(i=0;i<4;i++) if((mem[i]&128) || !mem[i]) { sqlite3_reset(s1); sqlite3_bind_int(s1,1,i); sqlite3_bind_blob(s1,4,"",i?0:1,0); while(sqlite3_step(s1)==SQLITE_ROW); } sqlite3_reset(s1); sqlite3_bind_int(s1,1,0); for(i=0;i<(*mem&63);i++) { if(at>=len) fatal("Malformed multidependent picture lump\n"); sqlite3_reset(s1); sqlite3_bind_int(s1,2,i+1); j=strlen(mem+at); sqlite3_bind_text(s1,3,mem+at,j,0); sqlite3_bind_blob(s1,4,mem+at,j+1,0); at+=j+1; while(sqlite3_step(s1)==SQLITE_ROW); } zt=at; for(j=1;j<3;j++) for(i=0;i<(mem[j]&63);i++) { if(zt+2>=len) fatal("Malformed multidependent picture lump\n"); zt+=((mem[zt+1]>>3)&7)+2; } for(j=1;j<3;j++) for(i=0;i<(mem[j]&63);i++) { sqlite3_reset(s1); sqlite3_bind_int(s1,1,j); sqlite3_bind_int(s1,2,i+1); sqlite3_bind_text(s1,3,mem+at+2,(mem[at+1]>>3)&7,0); if(zt+mem[at]+((mem[at+1]&7)<<8)>len) fatal("Malformed multidependent picture lump\n"); sqlite3_bind_blob(s1,4,mem+zt,mem[at]|((mem[at+1]&7)<<8),0); sqlite3_bind_int(s1,5,4-(mem[at+1]>>6)); zt+=mem[at]|((mem[at+1]&7)<<8); at+=((mem[at+1]>>3)&7)+2; while(sqlite3_step(s1)==SQLITE_ROW); } sqlite3_finalize(s1); free(mem); if(sqlite3_prepare_v2(userdb,"SELECT A.N||B.N||C.N||D.N,BCAT(A.Z,B.Z,C.Z,D.Z) FROM _MUL A,_MUL B,_MUL C,_MUL D WHERE A.X=0 AND B.X=1 AND C.X=2 AND D.X=3 AND B.Y+C.Y+D.Y<>0;",-1,&s1,0)) fatal("Unable to prepare SQL statement while loading pictures: %s\n",sqlite3_errmsg(userdb)); while((j=sqlite3_step(s1))==SQLITE_ROW) { if(npic++==32768) fatal("Too many pictures\n"); sqlite3_reset(st); sqlite3_bind_int(st,1,npic); sqlite3_bind_value(st,2,sqlite3_column_value(s1,0)); sqlite3_bind_value(st,5,sqlite3_column_value(s1,1)); while(sqlite3_step(st)==SQLITE_ROW); } if(j!=SQLITE_DONE) fatal("SQL error (%d): %s\n",j,sqlite3_errmsg(userdb)); sqlite3_finalize(s1); if(sqlite3_exec(userdb,"DELETE FROM `_MUL`;",0,0,0)) fatal("SQL error: %s\n",sqlite3_errmsg(userdb)); return npic; } static void load_multidependent(int n,const char*data,int len) { FILE*fp=fmemopen((char*)data,len,"r"); if(!fp) fatal("Allocation failed\n"); load_dependent_picture(fp,len,n,0); fclose(fp); } void load_pictures(void) { sqlite3_stmt*st=0; FILE*fp; Uint8 wantsize[32]; Uint8 nwantsize=0; Uint8 altImage; |
︙ | ︙ | |||
687 688 689 690 691 692 693 | sscanf(v," %d %n",&i,&j); if(!j) break; if(i<2 || i>255) fatal("Invalid picture size %d\n",i); wantsize[nwantsize++]=i; v+=j; } if(n=sqlite3_exec(userdb,"BEGIN;",0,0,0)) fatal("SQL error (%d): %s\n",n,sqlite3_errmsg(userdb)); | | > > > | > > > > > | 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 | sscanf(v," %d %n",&i,&j); if(!j) break; if(i<2 || i>255) fatal("Invalid picture size %d\n",i); wantsize[nwantsize++]=i; v+=j; } if(n=sqlite3_exec(userdb,"BEGIN;",0,0,0)) fatal("SQL error (%d): %s\n",n,sqlite3_errmsg(userdb)); if(sqlite3_prepare_v2(userdb,"INSERT INTO `PICTURES`(`ID`,`NAME`,`OFFSET`,`DEPENDENT`,`MISC`) VALUES(?1,?2,?3,?4,?5);",-1,&st,0)) fatal("Unable to prepare SQL statement while loading pictures: %s\n",sqlite3_errmsg(userdb)); nam=malloc(256); if(!nam) fatal("Allocation failed\n"); n=0; memset(havesize,0,256*sizeof(Uint16)); while(!feof(fp)) { i=0; while(j=fgetc(fp)) { 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]=='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); sqlite3_bind_int(st,4,j^1); sqlite3_bind_null(st,5); while((i=sqlite3_step(st))==SQLITE_ROW); if(i!=SQLITE_DONE) fatal("SQL error (%d): %s\n",i,sqlite3_errmsg(userdb)); } else if(i>4 && !memcmp(".MUL",nam+i-4,4)) { j=2; } else { j=0; } i=fgetc(fp)<<16; i|=fgetc(fp)<<24; i|=fgetc(fp)<<0; i|=fgetc(fp)<<8; if(j==1 && i>1) { memset(havesize1,0,256); i-=j=fgetc(fp)&15; while(j--) havesize1[fgetc(fp)&255]=1; fseek(fp,i-1,SEEK_CUR); for(i=1;i<256;i++) if(havesize1[i]) for(j=i+i;j<256;j+=i) havesize1[j]=1; for(j=1;j<256;j++) havesize[j]+=havesize1[j]; } else if(j==2 && i>4) { sqlite3_reset(st); sqlite3_bind_int64(st,3,ftell(fp)); sqlite3_bind_int(st,4,1); n=find_multidependent(st,fp,i,n); } else { fseek(fp,i,SEEK_CUR); } } nomore1: if(!n) fatal("Cannot find any pictures in this puzzle set\n"); free(nam); |
︙ | ︙ | |||
757 758 759 760 761 762 763 | if(j==SQLITE_DONE) break; fatal("SQL error (%d): %s\n",j,sqlite3_errmsg(userdb)); } fseek(fp,sqlite3_column_int64(st,1),SEEK_SET); load_one_picture(fp,sqlite3_column_int(st,0),altImage); } sqlite3_finalize(st); | | > | > > > > | > > > > > | 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 | if(j==SQLITE_DONE) break; fatal("SQL error (%d): %s\n",j,sqlite3_errmsg(userdb)); } fseek(fp,sqlite3_column_int64(st,1),SEEK_SET); load_one_picture(fp,sqlite3_column_int(st,0),altImage); } sqlite3_finalize(st); if(sqlite3_prepare_v2(userdb,"SELECT `ID`, `OFFSET`, `MISC` FROM `PICTURES` WHERE `DEPENDENT`;",-1,&st,0)) fatal("Unable to prepare SQL statement while loading pictures: %s\n",sqlite3_errmsg(userdb)); for(i=0;i<n;i++) { if((j=sqlite3_step(st))!=SQLITE_ROW) { if(j==SQLITE_DONE) break; fatal("SQL error (%d): %s\n",j,sqlite3_errmsg(userdb)); } if(sqlite3_column_type(st,2)==SQLITE_NULL) { fseek(fp,sqlite3_column_int64(st,1)-4,SEEK_SET); j=fgetc(fp)<<16; j|=fgetc(fp)<<24; j|=fgetc(fp); j|=fgetc(fp)<<8; load_dependent_picture(fp,j,sqlite3_column_int(st,0),0); } else { v=sqlite3_column_blob(st,2); j=sqlite3_column_bytes(st,2); load_multidependent(sqlite3_column_int(st,0),v,j); } } sqlite3_finalize(st); fclose(fp); SDL_SetColorKey(picts,SDL_SRCCOLORKEY|SDL_RLEACCEL,0); done: if(n=sqlite3_exec(userdb,"COMMIT;",0,0,0)) fatal("SQL error (%d): %s\n",n,sqlite3_errmsg(userdb)); fprintf(stderr,"Done\n"); |
︙ | ︙ |
Modified sql.doc from [632d4d9f5a] to [c0285704c2].
︙ | ︙ | |||
239 240 241 242 243 244 245 | must be numbers, classes, messages, or strings. Once an object is created, you cannot change its class; you must delete it and then add a new object of the correct class. DENSITY is read-only, but you can use ORDER BY DENSITY to sort in the stacking order of the objects. UP and DOWN are also read-only. CREATE TEMPORARY TABLE "PICTURES"("ID" INTEGER PRIMARY KEY, "NAME" TEXT | | | 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 | must be numbers, classes, messages, or strings. Once an object is created, you cannot change its class; you must delete it and then add a new object of the correct class. DENSITY is read-only, but you can use ORDER BY DENSITY to sort in the stacking order of the objects. UP and DOWN are also read-only. CREATE TEMPORARY TABLE "PICTURES"("ID" INTEGER PRIMARY KEY, "NAME" TEXT COLLATE NOCASE, "OFFSET" INT, "DEPENDENT" INT, "MISC" BLOB); List of all pictures available in this puzzle set. CREATE TABLE "PLAYFIELD"("X" INT, "Y" INT, "OBJ" INT, "BIZARRO_OBJ" INT); * All playfield cells, with their coordinates and bottom objects. CREATE TABLE "USERCACHEDATA"("ID" INTEGER PRIMARY KEY, "FILE" INT, "LEVEL" INT, "NAME" TEXT COLLATE NOCASE, "OFFSET" INT, "DATA" BLOB, |
︙ | ︙ |