Overview
Comment: | More class loading codes; correction to user cache |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
81d74d79e17ebf90a5d8030b4d3179b4 |
User & Date: | user on 2018-06-08 21:15:40 |
Other Links: | manifest | tags |
Context
2018-06-09
| ||
00:42 | Add the write_lump() function (uses upsert, which SQLite recently added) check-in: a55e51e100 user: user tags: trunk | |
2018-06-08
| ||
21:15 | More class loading codes; correction to user cache check-in: 81d74d79e1 user: user tags: trunk | |
2018-06-03
| ||
22:43 | The syntax of for/next loops has been changed; also added some codes for dealing with user cache data check-in: 8b26cd42e7 user: user tags: trunk | |
Changes
Modified class.c from [38d08ac889] to [620e67e86b].
︙ | ︙ | |||
118 119 120 121 122 123 124 125 126 127 128 129 130 131 | #define MAC_DIV 0xFFC3 #define MAC_MOD 0xFFC4 #define MAC_BAND 0xFFC5 #define MAC_BOR 0xFFC6 #define MAC_BXOR 0xFFC7 #define MAC_BNOT 0xFFC8 #define MAC_CAT 0xFFC9 #define MAC_VERSION 0xFFE0 #define MAC_DEFINE 0xFFE1 #define MAC_INCLUDE 0xFFE2 #define MAC_CALL 0xFFE3 #define MAC_UNDEFINED 0xFFFF static TokenList*add_macro(void) { | > | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | #define MAC_DIV 0xFFC3 #define MAC_MOD 0xFFC4 #define MAC_BAND 0xFFC5 #define MAC_BOR 0xFFC6 #define MAC_BXOR 0xFFC7 #define MAC_BNOT 0xFFC8 #define MAC_CAT 0xFFC9 #define MAC_BIT 0xFFCA #define MAC_VERSION 0xFFE0 #define MAC_DEFINE 0xFFE1 #define MAC_INCLUDE 0xFFE2 #define MAC_CALL 0xFFE3 #define MAC_UNDEFINED 0xFFFF static TokenList*add_macro(void) { |
︙ | ︙ | |||
763 764 765 766 767 768 769 770 771 772 773 774 775 776 | ParseError("Number or string or name expected\n"); } } s[n]=0; strcpy(tokenstr,s); free(s); ReturnToken(TF_NAME|TF_ABNORMAL,OP_STRING); case MAC_VERSION: nxttok1(); if(tokent!=TF_INT) ParseError("Number expected\n"); if(tokenv<MIN_VERSION || tokenv>MAX_VERSION) ParseError("Version number out of range\n"); nxttok1(); if(tokent!=TF_MACRO+TF_CLOSE) ParseError("Too many macro arguments\n"); goto again; | > > > > > > > > > > > | 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 | ParseError("Number or string or name expected\n"); } } s[n]=0; strcpy(tokenstr,s); free(s); ReturnToken(TF_NAME|TF_ABNORMAL,OP_STRING); case MAC_BIT: n=0; for(;;) { nxttok(); if(tokent==TF_MACRO+TF_CLOSE) break; if(tokent!=TF_INT) ParseError("Number expected\n"); n|=1<<tokenv; } tokent=TF_INT; tokenv=n; break; case MAC_VERSION: nxttok1(); if(tokent!=TF_INT) ParseError("Number expected\n"); if(tokenv<MIN_VERSION || tokenv>MAX_VERSION) ParseError("Version number out of range\n"); nxttok1(); if(tokent!=TF_MACRO+TF_CLOSE) ParseError("Too many macro arguments\n"); goto again; |
︙ | ︙ | |||
1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 | FlowPush(OP_FOR); peep=++ptr; break; case OP_NEXT: FlowPop(OP_FOR); AddInst(OP_NEXT); cl->codes[flowptr[flowdepth]]=ptr; break; default: if(Tokenf(TF_ABNORMAL)) ParseError("Invalid instruction token\n"); if(compat && Tokenf(TF_COMPAT)) ++tokenv; AddInstF(tokenv,tokent); } } else if(Tokenf(TF_FUNCTION)) { | > > > | 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 | FlowPush(OP_FOR); peep=++ptr; break; case OP_NEXT: FlowPop(OP_FOR); AddInst(OP_NEXT); cl->codes[flowptr[flowdepth]]=ptr; break; case OP_STRING: break; default: if(Tokenf(TF_ABNORMAL)) ParseError("Invalid instruction token\n"); if(compat && Tokenf(TF_COMPAT)) ++tokenv; AddInstF(tokenv,tokent); } } else if(Tokenf(TF_FUNCTION)) { |
︙ | ︙ | |||
1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 | if(!(i&16)) printf(" [%04X]",i); printf(" %04X",cl->codes[i]); } putchar('\n'); } printf("---\n\n"); } static void class_definition(int cla) { Hash*hash=calloc(LOCAL_HASH_SIZE,sizeof(Hash)); Class*cl=classes[cla]; int ptr=0; int compat=0; int i; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 | if(!(i&16)) printf(" [%04X]",i); printf(" %04X",cl->codes[i]); } putchar('\n'); } printf("---\n\n"); } static inline Uint32 class_def_number(void) { Uint32 n; nxttok(); if(!Tokenf(TF_INT)) fatal("Number expected\n"); n=tokenv; nxttok(); if(tokent!=TF_CLOSE) fatal("Close parentheses expected\n"); return n; } static Uint32 class_def_misc(void) { Uint32 n=0; for(;;) { nxttok(); if(tokent==TF_CLOSE) return n; if(Tokenf(TF_INT)) { n|=tokenv; } else if(Tokenf(TF_NAME) && !(tokenv&~255)) { n|=tokenv; } else if(Tokenf(TF_NAME) && tokenv>=OP_BITCONSTANT && tokenv<=OP_BITCONSTANT_LAST) { n|=1L<<(tokenv&31); } else { fatal("Number expected"); } } } static Uint32 class_def_arrivals(void) { Uint32 n=0; int i; nxttok(); if(Tokenf(TF_NAME) && tokenv==OP_INPLACE) { nxttok(); if(tokent!=TF_CLOSE) ParseError("Close parentheses expected\n"); return 1<<12; } for(i=0;i<25;i++) { nxttok(); if(!Tokenf(TF_INT) || (tokenv&~1)) ParseError("Expected 0 or 1\n"); if(tokenv) n|=1<<(i+4-2*(i%5)); } nxttok(); if(tokent!=TF_CLOSE) ParseError("Close parentheses expected\n"); return n; } static void class_def_hard(Uint16*data) { int i; for(;;) { nxttok(); if(tokent==TF_CLOSE) { return; } else if(tokent==TF_OPEN) { nxttok(); if(!Tokenf(TF_DIR) || tokenv>7 || (tokenv&1)) ParseError("Expected even absolute direction\n"); i=tokenv>>1; nxttok(); if(tokent!=TF_INT || (tokenv&~0xFFFF)) ParseError("Sixteen-bit number expected\n"); data[i]=tokenv; nxttok(); if(tokent!=TF_CLOSE) ParseError("Close parentheses expected\n"); } else if(tokent==TF_INT) { if(tokenv&~0xFFFF) ParseError("Hardness/sharpness must be a 16-bit number\n"); data[0]=data[1]=data[2]=data[3]=tokenv; } else { ParseError("Expected ( or ) or number\n"); } } } static inline Uint8 class_def_shovable(void) { } static inline Uint8 class_def_shape(void) { } static void class_definition(int cla) { Hash*hash=calloc(LOCAL_HASH_SIZE,sizeof(Hash)); Class*cl=classes[cla]; int ptr=0; int compat=0; int i; |
︙ | ︙ | |||
1132 1133 1134 1135 1136 1137 1138 | begin_label_stack(); for(;;) { nxttok(); if(Tokenf(TF_EOF)) { ParseError("Unexpected end of file\n"); } else if(Tokenf(TF_MACRO)) { ParseError("Unexpected macro token\n"); | | > > > > > | > | > > | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 | begin_label_stack(); for(;;) { nxttok(); if(Tokenf(TF_EOF)) { ParseError("Unexpected end of file\n"); } else if(Tokenf(TF_MACRO)) { ParseError("Unexpected macro token\n"); } else if(Tokenf(TF_OPEN)) { nxttok(); if(Tokenf(TF_NAME)) { switch(tokenv) { case OP_IMAGE: break; case OP_DEFAULTIMAGE: break; case OP_HELP: break; case OP_EDITORHELP: break; case OP_HEIGHT: cl->height=class_def_number(); break; case OP_WEIGHT: cl->weight=class_def_number(); break; case OP_CLIMB: cl->climb=class_def_number(); break; case OP_DENSITY: cl->density=class_def_number(); break; case OP_VOLUME: cl->volume=class_def_number(); break; case OP_STRENGTH: cl->strength=class_def_number(); break; case OP_TEMPERATURE: cl->temperature=class_def_number(); break; case OP_MISC4: cl->misc4=class_def_misc(); break; case OP_MISC5: cl->misc5=class_def_misc(); break; case OP_MISC6: cl->misc6=class_def_misc(); break; case OP_MISC7: cl->misc7=class_def_misc(); break; case OP_ARRIVALS: cl->arrivals=class_def_arrivals(); break; case OP_DEPARTURES: cl->departures=class_def_arrivals(); break; case OP_HARD: class_def_hard(cl->hard); break; case OP_SHARP: class_def_hard(cl->sharp); break; case OP_SHAPE: cl->shape=class_def_shape(); break; case OP_SHOVABLE: cl->shovable=class_def_shovable(); break; case OP_SUBS: ptr=parse_instructions(cla,ptr,hash,compat); break; case OP_LABEL: pushback=1; ptr=parse_instructions(cla,ptr,hash,compat); break; case 0x0200 ... 0x02FF: set_message_ptr(cla,tokenv&255,ptr); ptr=parse_instructions(cla,ptr,hash,compat); break; case 0xC000 ... 0xFFFF: set_message_ptr(cla,tokenv+256-0xC000,ptr); ptr=parse_instructions(cla,ptr,hash,compat); break; default: ParseError("Invalid directly inside of a class definition\n"); } } else { ParseError("Invalid directly inside of a class definition\n"); } } else if(Tokenf(TF_NAME)) { switch(tokenv) { case OP_PLAYER: cl->cflags|=CF_PLAYER; break; case OP_INPUT: cl->cflags|=CF_INPUT; break; case OP_COMPATIBLE: cl->cflags|=CF_COMPATIBLE; compat=1; break; case OP_COMPATIBLE_C: cl->cflags|=CF_COMPATIBLE; break; case OP_QUIZ: cl->cflags|=CF_QUIZ; break; case OP_INVISIBLE: cl->oflags|=OF_INVISIBLE; break; case OP_VISUALONLY: cl->oflags|=OF_VISUALONLY; break; case OP_STEALTHY: cl->oflags|=OF_STEALTHY; break; case OP_USERSTATE: cl->oflags|=OF_USERSTATE; break; case OP_SHOVABLE: cl->shovable=0x55; break; default: ParseError("Invalid directly inside of a class definition\n"); } } else if(Tokenf(TF_CLOSE)) { break; } else { ParseError("Invalid directly inside of a class definition\n"); } } end_label_stack(classes[0]->codes,hash); if(!cl->nimages) cl->oflags|=OF_INVISIBLE; if(main_options['C']) dump_class(cla,ptr,hash); if(main_options['H']) { for(i=0;i<LOCAL_HASH_SIZE;i++) if(hash[i].id) printf(" \"%s\": %04X\n",hash[i].txt,hash[i].id); } for(i=0;i<LOCAL_HASH_SIZE;i++) free(hash[i].txt); free(hash); } static void load_class_numbers(void) { int i,n; long size=0; unsigned char*data=read_lump(FIL_LEVEL,LUMP_CLASS_DEF,&size,0); unsigned char*p; if(!data) return; for(i=0;i<size-3;) { n=data[i]|(data[i+1]<<8); if(!n) break; if(n>=0x4000) fatal("Malformed CLASS.DEF lump\n"); i+=2; p=data+i; while(i<size && data[i++]); if(i==size && data[i-1]) fatal("Malformed CLASS.DEF lump\n"); initialize_class(n,CF_NOCLASS2,p); } i+=2; for(;i<size-3;) { n=data[i]|(data[i+1]<<8); if(n<256 || n>=0x4100) fatal("Malformed CLASS.DEF lump\n"); n-=256; i+=2; p=data+i; while(i<size && data[i++]); if(i==size && data[i-1]) fatal("Malformed CLASS.DEF lump\n"); if(messages[n]) fatal("Duplicate message number %d\n",n+256); messages[n]=strdup(p); if(!messages[n]) fatal("Allocation failed\n"); } free(data); } void load_classes(void) { int i; int gloptr=0; Hash*glolocalhash; char*nam=sqlite3_mprintf("%s.class",basefilename); fprintf(stderr,"Loading class definitions...\n"); if(!nam) fatal("Allocation failed\n"); classfp=fopen(nam,"r"); sqlite3_free(nam); if(!classfp) fatal("Cannot open class file '%s': %m\n",nam); glohash=calloc(HASH_SIZE,sizeof(Hash)); if(!glohash) fatal("Allocation failed\n"); glolocalhash=calloc(LOCAL_HASH_SIZE,sizeof(Hash)); if(!glolocalhash) fatal("Allocation failed\n"); strcpy(tokenstr,"+"); glohash[look_hash_mac()].id=MAC_ADD; strcpy(tokenstr,"-"); glohash[look_hash_mac()].id=MAC_SUB; strcpy(tokenstr,"*"); glohash[look_hash_mac()].id=MAC_MUL; strcpy(tokenstr,"/"); glohash[look_hash_mac()].id=MAC_DIV; strcpy(tokenstr,"mod"); glohash[look_hash_mac()].id=MAC_MOD; strcpy(tokenstr,"band"); glohash[look_hash_mac()].id=MAC_BAND; strcpy(tokenstr,"bor"); glohash[look_hash_mac()].id=MAC_BOR; strcpy(tokenstr,"bxor"); glohash[look_hash_mac()].id=MAC_BXOR; strcpy(tokenstr,"bnot"); glohash[look_hash_mac()].id=MAC_BNOT; strcpy(tokenstr,"cat"); glohash[look_hash_mac()].id=MAC_CAT; strcpy(tokenstr,"bit"); glohash[look_hash_mac()].id=MAC_BIT; strcpy(tokenstr,"version"); glohash[look_hash_mac()].id=MAC_VERSION; strcpy(tokenstr,"define"); glohash[look_hash_mac()].id=MAC_DEFINE; strcpy(tokenstr,"include"); glohash[look_hash_mac()].id=MAC_INCLUDE; strcpy(tokenstr,"call"); glohash[look_hash_mac()].id=MAC_CALL; if(main_options['L']) { for(;;) { nxttok(); |
︙ | ︙ | |||
1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 | } *classes=malloc(sizeof(Class)); if(!*classes) fatal("Allocation failed\n"); classes[0]->name=classes[0]->edithelp=classes[0]->gamehelp=0; classes[0]->codes=classes[0]->messages=classes[0]->images=0; classes[0]->nmsg=0; memset(functions,-1,sizeof(functions)); for(;;) { nxttok(); if(tokent==TF_EOF) goto done; if(tokent!=TF_OPEN) ParseError("Expected open parenthesis\n"); nxttok(); if(Tokenf(TF_FUNCTION)) { functions[tokenv&0x3FFF]=gloptr; | > | 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 | } *classes=malloc(sizeof(Class)); if(!*classes) fatal("Allocation failed\n"); classes[0]->name=classes[0]->edithelp=classes[0]->gamehelp=0; classes[0]->codes=classes[0]->messages=classes[0]->images=0; classes[0]->nmsg=0; memset(functions,-1,sizeof(functions)); load_class_numbers(); for(;;) { nxttok(); if(tokent==TF_EOF) goto done; if(tokent!=TF_OPEN) ParseError("Expected open parenthesis\n"); nxttok(); if(Tokenf(TF_FUNCTION)) { functions[tokenv&0x3FFF]=gloptr; |
︙ | ︙ | |||
1287 1288 1289 1290 1291 1292 1293 1294 | fatal("Function mentioned but not defined\n"); } for(i=0;i<HASH_SIZE;i++) free(glohash[i].txt); free(glohash); for(i=1;i<undef_class;i++) if(classes[i] && (classes[i]->cflags&CF_NOCLASS1)) fatal("Class $%s mentioned but not defined\n",classes[i]->name); if(macros) for(i=0;i<MAX_MACRO;i++) if(macros[i]) free_macro(macros[i]); free(macros); } | > | 1500 1501 1502 1503 1504 1505 1506 1507 1508 | fatal("Function mentioned but not defined\n"); } for(i=0;i<HASH_SIZE;i++) free(glohash[i].txt); free(glohash); for(i=1;i<undef_class;i++) if(classes[i] && (classes[i]->cflags&CF_NOCLASS1)) fatal("Class $%s mentioned but not defined\n",classes[i]->name); if(macros) for(i=0;i<MAX_MACRO;i++) if(macros[i]) free_macro(macros[i]); free(macros); fprintf(stderr,"Done\n"); } |
Modified main.c from [e806b2d7f2] to [91b8dc3f22].
︙ | ︙ | |||
27 28 29 30 31 32 33 | static const char schema[]= "BEGIN;" "PRAGMA APPLICATION_ID(1296388936);" "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, `OFFSET` INT, `DATA` BLOB, `USERSTATE` BLOB);" | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | static const char schema[]= "BEGIN;" "PRAGMA APPLICATION_ID(1296388936);" "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, `OFFSET` INT, `DATA` BLOB, `USERSTATE` BLOB);" "CREATE UNIQUE INDEX IF NOT EXISTS `USERCACHEDATA_I1` ON `USERCACHEDATA`(`FILE`, `LEVEL`);" "CREATE TEMPORARY TABLE `PICTURES`(`ID` INTEGER PRIMARY KEY, `NAME` TEXT, `OFFSET` INT);" "CREATE TEMPORARY TABLE `VARIABLES`(`ID` INTEGER PRIMARY KEY, `NAME` TEXT);" "COMMIT;" ; sqlite3*userdb; xrm_db*resourcedb; |
︙ | ︙ | |||
112 113 114 115 116 117 118 119 120 121 122 123 124 | buf[i]=z; if(!z) break; ++i; if(i==127) fatal("Found a long lump name; maybe this is not a real Hamster archive\n"); } t=fgetc(fp)<<16; t|=fgetc(fp)<<24; t|=fgetc(fp); t|=fgetc(fp)<<8; if(feof(fp)) fatal("Invalid Hamster archive\n"); sqlite3_bind_text(st,3,buf,i,0); sqlite3_bind_int64(st,4,ftell(fp)); if(i>4 && i<10 && !sqlite3_stricmp(buf+i-4,suffix)) { for(z=0;z<i-4;z++) if(buf[z]<'0' || buf[z]>'9') goto nomatch; if(*buf=='0' && i!=5) goto nomatch; sqlite3_bind_int(st,2,strtol(buf,0,10)); | > | | > > > | 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 | buf[i]=z; if(!z) break; ++i; if(i==127) fatal("Found a long lump name; maybe this is not a real Hamster archive\n"); } t=fgetc(fp)<<16; t|=fgetc(fp)<<24; t|=fgetc(fp); t|=fgetc(fp)<<8; if(feof(fp)) fatal("Invalid Hamster archive\n"); if(t<0) fatal("Invalid lump size\n"); sqlite3_bind_text(st,3,buf,i,0); sqlite3_bind_int64(st,4,ftell(fp)); if(i>4 && i<10 && !sqlite3_stricmp(buf+i-4,suffix)) { for(z=0;z<i-4;z++) if(buf[z]<'0' || buf[z]>'9') goto nomatch; if(*buf=='0' && i!=5) goto nomatch; sqlite3_bind_int(st,2,strtol(buf,0,10)); } else if(i==9 && suffix[1]=='L' && !sqlite3_stricmp(buf,"CLASS.DEF")) { sqlite3_bind_int(st,2,LUMP_CLASS_DEF); } else if(i==9 && suffix[1]=='L' && !sqlite3_stricmp(buf,"LEVEL.IDX")) { sqlite3_bind_int(st,2,LUMP_LEVEL_IDX); } else { nomatch: sqlite3_bind_null(st,2); } while((z=sqlite3_step(st))==SQLITE_ROW); if(z!=SQLITE_DONE) fatal("SQL error (%d): %s\n",z,sqlite3_errmsg(userdb)); fseek(fp,t,SEEK_CUR); } done: sqlite3_finalize(st); if(z=sqlite3_exec(userdb,"COMMIT;",0,0,0)) fatal("SQL error (%d): %s\n",z,sqlite3_errmsg(userdb)); return id; } |
︙ | ︙ | |||
176 177 178 179 180 181 182 183 184 185 186 187 188 189 | sqlite3_stmt*st; int z; sqlite3_int64 t1,t2; char*nam1; char*nam2; char*nam3; struct stat fst; if(z=sqlite3_prepare_v2(userdb,"SELECT `ID`, `TIME` FROM `USERCACHEINDEX` WHERE `NAME` = ?1;",-1,&st,0)) fatal("SQL error (%d): %s\n",z,sqlite3_errmsg(userdb)); nam1=sqlite3_mprintf("%s.level",basefilename); if(!nam1) fatal("Allocation failed\n"); nam2=realpath(nam1,0); if(!nam2) fatal("Cannot find real path of '%s': %m\n",nam1); levelfp=fopen(nam2,"r"); if(!levelfp) fatal("Cannot open '%s' for reading: %m\n",nam2); | > | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | sqlite3_stmt*st; int z; sqlite3_int64 t1,t2; char*nam1; char*nam2; char*nam3; struct stat fst; fprintf(stderr,"Initializing user cache...\n"); if(z=sqlite3_prepare_v2(userdb,"SELECT `ID`, `TIME` FROM `USERCACHEINDEX` WHERE `NAME` = ?1;",-1,&st,0)) fatal("SQL error (%d): %s\n",z,sqlite3_errmsg(userdb)); nam1=sqlite3_mprintf("%s.level",basefilename); if(!nam1) fatal("Allocation failed\n"); nam2=realpath(nam1,0); if(!nam2) fatal("Cannot find real path of '%s': %m\n",nam1); levelfp=fopen(nam2,"r"); if(!levelfp) fatal("Cannot open '%s' for reading: %m\n",nam2); |
︙ | ︙ | |||
216 217 218 219 220 221 222 | solutionuc=t2=-1; } else { fatal("SQL error (%d): %s\n",z,sqlite3_errmsg(userdb)); } sqlite3_finalize(st); if(stat(nam2,&fst)) fatal("Unable to stat '%s': %m\n",nam2); if(!fst.st_size) fatal("File '%s' has zero size\n",nam2); | | | > | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 | solutionuc=t2=-1; } else { fatal("SQL error (%d): %s\n",z,sqlite3_errmsg(userdb)); } sqlite3_finalize(st); if(stat(nam2,&fst)) fatal("Unable to stat '%s': %m\n",nam2); if(!fst.st_size) fatal("File '%s' has zero size\n",nam2); if(fst.st_mtime>t1 || fst.st_ctime>t1) leveluc=reset_usercache(levelfp,nam2,&fst,".LVL"); if(stat(nam3,&fst)) fatal("Unable to stat '%s': %m\n",nam3); if(!fst.st_size) fatal("File '%s' has zero size\n",nam2); if(fst.st_mtime>t2 || fst.st_ctime>t2) solutionuc=reset_usercache(solutionfp,nam3,&fst,".SOL"); free(nam2); free(nam3); if(z=sqlite3_prepare_v3(userdb,"SELECT * FROM `USERCACHEDATA` WHERE `FILE` = ?1 AND `LEVEL` = ?2;",-1,SQLITE_PREPARE_PERSISTENT,&readusercachest,0)) { fatal("SQL error (%d): %s\n",z,sqlite3_errmsg(userdb)); } fprintf(stderr,"Done\n"); } static void init_sql(void) { char*s; char*p; const char*v; int z; |
︙ | ︙ | |||
455 456 457 458 459 460 461 462 463 464 465 | load_key_bindings(); init_screen(); load_pictures(); if(main_options['T']) { test_mode(); return 0; } load_classes(); return 0; } | > | 461 462 463 464 465 466 467 468 469 470 471 472 | load_key_bindings(); init_screen(); load_pictures(); if(main_options['T']) { test_mode(); return 0; } init_usercache(); load_classes(); return 0; } |