ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.68 by root, Mon Apr 16 06:23:39 2007 UTC vs.
Revision 1.69 by root, Tue Apr 17 18:24:29 2007 UTC

1399 return true; 1399 return true;
1400} 1400}
1401 1401
1402///////////////////////////////////////////////////////////////////////////// 1402/////////////////////////////////////////////////////////////////////////////
1403 1403
1404// generic resource file load,
1405// currently supports: region, treasures
1404bool load_resource_file (const char *filename) 1406bool load_resource_file (const char *filename)
1405{ 1407{
1406 object_thawer f (filename); 1408 object_thawer f (filename);
1407 1409
1408 f.next (); 1410 f.next ();
1414 case KW_region: 1416 case KW_region:
1415 if (!region::read (f)) 1417 if (!region::read (f))
1416 return false; 1418 return false;
1417 break; 1419 break;
1418 1420
1421 case KW_treasure:
1422 case KW_treasureone:
1423 if (!treasurelist::read (f))
1424 return false;
1425 break;
1426
1419 case KW_EOF: 1427 case KW_EOF:
1420 return true; 1428 return true;
1421 1429
1422 default: 1430 default:
1423 if (!f.parse_error ("resource file")) 1431 if (!f.parse_error ("resource file"))
1424 return false; 1432 return false;
1425 } 1433 }
1426
1427 f.next ();
1428 } 1434 }
1429} 1435}
1430 1436

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines