Overview
Comment: | Add saving levels. (Now it is probably ready for public testing.) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
d89808c09a14eeb9955522c75e94f3cb |
User & Date: | user on 2021-02-21 00:43:08 |
Other Links: | manifest | tags |
Context
2021-02-21
| ||
00:51 | Add editor help for objects, and add support for number pad in some more contexts. check-in: 131e9f9ca6 user: user tags: trunk | |
00:43 | Add saving levels. (Now it is probably ready for public testing.) check-in: d89808c09a user: user tags: trunk | |
2021-02-18
| ||
05:06 | Add 'lc' and 'lv' to set level code and level version. check-in: 5439829a5f user: user tags: trunk | |
Changes
Modified bindings.doc from [11b6d55d1e] to [1946559283].
︙ | ︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 | 'mx' <command> Export a move list. The argument is a operating system command that will receive the move list (in the same format as above) on stdin. === Editor commands === '^a' <location> Add an object with the current MRU values to that location, if there is not already another object of the same class there. '^c' Display the class selection menu. | > > > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 | 'mx' <command> Export a move list. The argument is a operating system command that will receive the move list (in the same format as above) on stdin. === Editor commands === '^S' Save level. '^a' <location> Add an object with the current MRU values to that location, if there is not already another object of the same class there. '^c' Display the class selection menu. |
︙ | ︙ |
Modified default.heromeshrc from [b489fce8f4] to [f4fd84468a].
︙ | ︙ | |||
134 135 136 137 138 139 140 | ?.editKey.6: select 'mr',5; ?.editKey.7: select 'mr',6; ?.editKey.8: select 'mr',7; ?.editKey.9: select 'mr',8; ?.editKey.up: select 'mR',-1; ?.editKey.down: select 'mR',+1; ?.editKey.C: select 'lc',:level_code where :level_code=cast(:level_code as int); | | > | | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 | ?.editKey.6: select 'mr',5; ?.editKey.7: select 'mr',6; ?.editKey.8: select 'mr',7; ?.editKey.9: select 'mr',8; ?.editKey.up: select 'mR',-1; ?.editKey.down: select 'mR',+1; ?.editKey.C: select 'lc',:level_code where :level_code=cast(:level_code as int); ?.editKey.F: with n(n) as (select 65 union all select n+1 h from n where h<=64*pfheight()+65) select '^a',n from n; ?.editKey.R: select 're',substr(:resize,1,instr(:resize,'x')-1),substr(:resize,instr(:resize,'x')+1) where length(:resize); ?.editKey.ctrl.X: select 're',pfwidth(),pfheight(); ?.editKey.ctrl.P: ^P ?.editKey.ctrl.Q: ^Q ?.editKey.ctrl.S: ^S ?.editKey.space: ^c ?.editKey.return: ^e ?.editClick.left: ^a ?.editClick.alt.left: ^u ?.editClick.right: delete from objects where x=$X and y=$Y and up is null; ! Global key bindings |
︙ | ︙ |
Modified edit.c from [5ea8991e9d] to [19de92fbba].
︙ | ︙ | |||
30 31 32 33 34 35 36 | static void rewrite_class_def(void) { Uint32 i,n; Uint8 cu[0x4000/8]; Uint8 mu[0x4000/8]; Object*o; long size=0; unsigned char*data=read_lump(FIL_LEVEL,LUMP_CLASS_DEF,&size); | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | static void rewrite_class_def(void) { Uint32 i,n; Uint8 cu[0x4000/8]; Uint8 mu[0x4000/8]; Object*o; long size=0; unsigned char*data=read_lump(FIL_LEVEL,LUMP_CLASS_DEF,&size); sqlite3_str*s; memset(cu,0,0x4000/8); memset(mu,0,0x4000/8); if(data && size) { for(i=0;i<size-3;) { n=data[i]|(data[i+1]<<8); if(!n) break; i+=2; |
︙ | ︙ | |||
65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | } DoMisc(misc1) DoMisc(misc2) DoMisc(misc3) #undef DoMisc } // Now write out the new data for(i=0;i<0x4000;i++) if(cu[i/8]&(1<<(i&7))) { sqlite3_str_appendchar(s,1,i&255); sqlite3_str_appendchar(s,1,i>>8); sqlite3_str_appendall(s,classes[i]->name); sqlite3_str_appendchar(s,1,0); } sqlite3_str_appendchar(s,2,0); for(i=0;i<0x4000;i++) if(mu[i/8]&(1<<(i&7))) { sqlite3_str_appendchar(s,1,i&255); sqlite3_str_appendchar(s,1,i>>8); sqlite3_str_appendall(s,messages[i]); sqlite3_str_appendchar(s,1,0); } // End of data size=sqlite3_str_length(s); data=sqlite3_str_finish(s); if(!size || !data) fatal("Error in string builder\n"); write_lump(FIL_LEVEL,LUMP_CLASS_DEF,size,data); | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 | } DoMisc(misc1) DoMisc(misc2) DoMisc(misc3) #undef DoMisc } // Now write out the new data s=sqlite3_str_new(0); for(i=0;i<0x4000;i++) if(cu[i/8]&(1<<(i&7))) { sqlite3_str_appendchar(s,1,i&255); sqlite3_str_appendchar(s,1,i>>8); sqlite3_str_appendall(s,classes[i]->name); sqlite3_str_appendchar(s,1,0); } sqlite3_str_appendchar(s,2,0); for(i=0;i<0x4000;i++) if(mu[i/8]&(1<<(i&7))) { sqlite3_str_appendchar(s,1,i&255); sqlite3_str_appendchar(s,1,i>>8); sqlite3_str_appendall(s,messages[i]); sqlite3_str_appendchar(s,1,0); } // End of data size=sqlite3_str_length(s); data=sqlite3_str_finish(s); if(!size || !data) fatal("Error in string builder\n"); write_lump(FIL_LEVEL,LUMP_CLASS_DEF,size,data); sqlite3_free(data); } static inline void version_change(void) { long sz=0; unsigned char*buf=read_lump(FIL_SOLUTION,level_id,&sz); if(!buf) return; if(sz>2 && (buf[0]|(buf[1]<<8))==level_version) ++level_version; free(buf); } static void save_obj(sqlite3_str*s,const Object*o,const Object**m,Uint8 x,Uint8 y) { static Uint8 r=0; static Uint8 rx,ry; const Object*p=0; Uint8 b; Uint16 c; if(!o) goto nrle; b=o->dir&7; if(o->x==x+1) b|=0x40; else if(o->x!=x) b|=0x20; if(o->y!=y) b|=0x10; p=m[b&0x70?0:1]; if((b&0x70)!=0x20 || !r || !p) goto nrle; if(o->class!=p->class || o->image!=p->image || !ValueEq(o->misc1,p->misc1) || !ValueEq(o->misc2,p->misc2) || !ValueEq(o->misc3,p->misc3)) goto nrle; if(0x0F&~r) { r++; } else { sqlite3_str_appendchar(s,1,r); if(r&0x20) sqlite3_str_appendchar(s,1,rx); if(r&0x10) sqlite3_str_appendchar(s,1,ry); r=0x20; } return; nrle: if(r) { sqlite3_str_appendchar(s,1,r); if(r&0x20) sqlite3_str_appendchar(s,1,rx); if(r&0x10) sqlite3_str_appendchar(s,1,ry); } r=0; if(!o) return; if(o->misc1.t|o->misc1.u|o->misc2.t|o->misc2.u|o->misc3.t|o->misc3.u) b|=0x08; if(p && o->class==p->class && o->image==p->image && ValueEq(o->misc1,p->misc1) && ValueEq(o->misc2,p->misc2) && ValueEq(o->misc3,p->misc3)) { // Use RLE r=0x80|b&0xF0; rx=o->x; ry=o->y; return; } m[b&0x70?0:1]=o; sqlite3_str_appendchar(s,1,b); if(b&0x20) sqlite3_str_appendchar(s,1,o->x); if(b&0x10) sqlite3_str_appendchar(s,1,o->y); c=o->class; for(x=0;x<=o->image && x<classes[c]->nimages;x++) if(classes[c]->images[x]&0x8000) break; if(x==o->image) c|=0x8000; sqlite3_str_appendchar(s,1,c&0xFF); sqlite3_str_appendchar(s,1,c>>8); if(c<0x8000) sqlite3_str_appendchar(s,1,o->image); if(b&0x08) { b=o->misc1.t|(o->misc2.t<<2)|(o->misc3.t<<4); if(o->misc1.t|o->misc1.u) { if(o->misc3.t|o->misc3.u) b|=0xC0; else if(o->misc2.t|o->misc2.u) b|=0x80; else b|=0x40; } sqlite3_str_appendchar(s,1,b); if(b&0xC0) { sqlite3_str_appendchar(s,1,o->misc1.u&0xFF); sqlite3_str_appendchar(s,1,o->misc1.u>>8); } if((b&0xC0)!=0x40) { sqlite3_str_appendchar(s,1,o->misc2.u&0xFF); sqlite3_str_appendchar(s,1,o->misc2.u>>8); } if(!((b&0xC0)%0xC0)) { sqlite3_str_appendchar(s,1,o->misc3.u&0xFF); sqlite3_str_appendchar(s,1,o->misc3.u>>8); } } } static void save_level(void) { /* Format of objects: * bit flags (or 0xFF for end): bit7 = MRU (omit everything but position) bit6 = Next position bit5 = New X position bit4 = New Y position bit3 = Has MiscVars (RLE in case of MRU) bit2-bit0 = LastDir (RLE in case of MRU) * new X if applicable * new Y if applicable * class (one-based; add 0x8000 for default image) (two bytes) * image (one byte) * data types (if has MiscVars): bit7-bit6 = How many (0=has Misc2 and Misc3, not Misc1) bit5-bit4 = Misc3 type bit3-bit2 = Misc2 type bit1-bit0 = Misc1 type * misc data (variable size) Store/use MRU slot 0 if any bits of 0x70 set in flag byte; slot 1 otherwise */ Uint8 x=0; Uint8 y=1; const Object*m[2]={0,0}; sqlite3_str*str=sqlite3_str_new(0); Uint32 n; long sz; char*data; int i; // Header if(level_changed) version_change(); level_changed=0; sqlite3_str_appendchar(str,1,level_version&255); sqlite3_str_appendchar(str,1,level_version>>8); sqlite3_str_appendchar(str,1,level_code&255); sqlite3_str_appendchar(str,1,level_code>>8); sqlite3_str_appendchar(str,1,pfwidth-1); sqlite3_str_appendchar(str,1,pfheight-1); if(level_title) sqlite3_str_appendall(str,level_title); sqlite3_str_appendchar(str,1,0); // Objects for(i=0;i<64*64;i++) { n=playfield[i]; while(n!=VOIDLINK) { save_obj(str,objects[n],m,x,y); x=objects[n]->x; y=objects[n]->y; n=objects[n]->up; } } save_obj(str,0,m,x,y); sqlite3_str_appendchar(str,1,0xFF); // Level strings for(i=0;i<nlevelstrings;i++) sqlite3_str_appendall(str,levelstrings[i]); // Done sz=sqlite3_str_length(str); if(i=sqlite3_str_errcode(str)) fatal("SQL string error (%d)\n",i); data=sqlite3_str_finish(str); if(!data) fatal("Allocation failed\n"); write_lump(FIL_LEVEL,level_id,sz,data); sqlite3_free(data); rewrite_class_def(); } static void redraw_editor(void) { char buf[32]; SDL_Rect r; int x,y; r.x=r.y=0; |
︙ | ︙ | |||
131 132 133 134 135 136 137 | draw_text(16,16,buf,0xF0,0xFF); snprintf(buf,32,"%5d",level_code); draw_text(0,24,"C",0xF0,0xF7); draw_text(16,24,buf,0xF0,0xFF); } snprintf(buf,8,"%2dx%2d",pfwidth,pfheight); draw_text(8,32,buf,0xF0,0xFD); | | | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 | draw_text(16,16,buf,0xF0,0xFF); snprintf(buf,32,"%5d",level_code); draw_text(0,24,"C",0xF0,0xF7); draw_text(16,24,buf,0xF0,0xFF); } snprintf(buf,8,"%2dx%2d",pfwidth,pfheight); draw_text(8,32,buf,0xF0,0xFD); draw_text(24,32,"x",0xF0,level_changed?0xF4:0xF5); x=x>=left_margin?(x-left_margin)/picture_size+1:0; y=y/picture_size+1; if(x>0 && y>0 && x<=pfwidth && y<=pfheight) snprintf(buf,8,"(%2d,%2d)",x,y); else strcpy(buf," "); draw_text(0,40,buf,0xF0,0xF3); for(x=0;x<MRUCOUNT;x++) { y=picture_size*x+56; |
︙ | ︙ | |||
559 560 561 562 563 564 565 566 567 568 569 570 571 572 | if(prev) return prev; add_object_at(number&63?:64,number/64?:64,mru+curmru,0); return 0; case '^P': // Play return -2; case '^Q': // Quit return -1; case 'go': // Select level load_level(number); return 1; case 'lc': // Set level code level_code=number; level_changed=1; return 0; | > > > | 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 | if(prev) return prev; add_object_at(number&63?:64,number/64?:64,mru+curmru,0); return 0; case '^P': // Play return -2; case '^Q': // Quit return -1; case '^S': // Save level save_level(); return 1; case 'go': // Select level load_level(number); return 1; case 'lc': // Set level code level_code=number; level_changed=1; return 0; |
︙ | ︙ |
Modified heromesh.h from [7378f2ea70] to [a29da74068].
︙ | ︙ | |||
29 30 31 32 33 34 35 36 37 38 39 40 41 42 | #define SVALUE(x,y) ((Value){.s=x,.t=y}) #define NVALUE(x) SVALUE(x,TY_NUMBER) #define CVALUE(x) UVALUE(x,TY_CLASS) #define MVALUE(x) UVALUE(x,TY_MESSAGE) #define ZVALUE(x) UVALUE(x,TY_STRING) #define OVALUE(x) ((x)==VOIDLINK?NVALUE(0):UVALUE(x,objects[x]->generation)) #define ValueTo64(v) (((sqlite3_int64)((v).u))|(((sqlite3_int64)((v).t))<<32)) #define N_MESSAGES 24 extern const char*const standard_message_names[]; extern const char*const standard_sound_names[]; extern const char*const heromesh_key_names[256]; extern sqlite3*userdb; | > | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | #define SVALUE(x,y) ((Value){.s=x,.t=y}) #define NVALUE(x) SVALUE(x,TY_NUMBER) #define CVALUE(x) UVALUE(x,TY_CLASS) #define MVALUE(x) UVALUE(x,TY_MESSAGE) #define ZVALUE(x) UVALUE(x,TY_STRING) #define OVALUE(x) ((x)==VOIDLINK?NVALUE(0):UVALUE(x,objects[x]->generation)) #define ValueTo64(v) (((sqlite3_int64)((v).u))|(((sqlite3_int64)((v).t))<<32)) #define ValueEq(x,y) ((x).t==(y).t && (x).u==(y).u) #define N_MESSAGES 24 extern const char*const standard_message_names[]; extern const char*const standard_sound_names[]; extern const char*const heromesh_key_names[256]; extern sqlite3*userdb; |
︙ | ︙ |
Modified main.c from [310c045da5] to [1f36d14fae].
︙ | ︙ | |||
129 130 131 132 133 134 135 | done: sqlite3_finalize(st); return id; } unsigned char*read_lump_or_userstate(int sol,int lvl,long*sz,char us) { // Returns a pointer to the data; must be freed using free(). | | | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | done: sqlite3_finalize(st); return id; } unsigned char*read_lump_or_userstate(int sol,int lvl,long*sz,char us) { // Returns a pointer to the data; must be freed using free(). // If there is no data, returns null and sets *sz to zero. // Third argument is a pointer to a variable to store the data size (must be not null). // Fourth argument is 1 for user state or 0 for lump data. unsigned char*buf=0; sqlite3_reset(readusercachest); sqlite3_bind_int64(readusercachest,1,sol?solutionuc:leveluc); sqlite3_bind_int(readusercachest,2,lvl); sqlite3_bind_int(readusercachest,3,us); |
︙ | ︙ |