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

Comparing deliantra/server/common/loader.l (file contents):
Revision 1.9 by root, Sat Aug 26 23:36:29 2006 UTC vs.
Revision 1.13 by root, Mon Aug 28 14:05:23 2006 UTC

1%{ 1%{
2/* 2/*
3 * static char *rcsid_object_c = 3 * static char *rcsid_object_c =
4 * "$Id: loader.l,v 1.9 2006/08/26 23:36:29 root Exp $"; 4 * "$Id: loader.l,v 1.13 2006/08/28 14:05:23 root Exp $";
5 */ 5 */
6 6
7/* 7/*
8 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
9 9
… …
35#include <global.h> 35#include <global.h>
36#include <loader.h> 36#include <loader.h>
37#include <newserver.h> 37#include <newserver.h>
38#include <sproto.h> 38#include <sproto.h>
39 39
40#define YY_DECL int lex_load(object *op, int map_flags) 40#define YY_DECL int lex_load(object *op, object_thawer &thawer, int map_flags)
41 41
42static char *yval(); 42static char *yval();
43 43
44static int lex_error; 44static int lex_error;
45static char msgbuf[65536]; 45static char msgbuf[65536];
… …
727 /* record the name of the broken object */ 727 /* record the name of the broken object */
728 tmp->name = add_string(yv); 728 tmp->name = add_string(yv);
729 } 729 }
730 strcpy(msgbuf, ""); 730 strcpy(msgbuf, "");
731 strcpy(lorebuf, ""); 731 strcpy(lorebuf, "");
732 lex_load(tmp, map_flags); 732 lex_load(tmp, thawer, map_flags);
733 if (tmp->arch) { 733 if (tmp->arch) {
734 insert_ob_in_ob(tmp,op); 734 insert_ob_in_ob(tmp,op);
735 } 735 }
736 else { 736 else {
737 LOG(llevDebug,"Discarding object without arch: %s\n", tmp->name?tmp->name:"(null)"); 737 LOG(llevDebug,"Discarding object without arch: %s\n", tmp->name?tmp->name:"(null)");
… …
743 char *yv=yval(); 743 char *yv=yval();
744 744
745 op->arch=find_archetype(yv); 745 op->arch=find_archetype(yv);
746 if (op->arch!=NULL) { 746 if (op->arch!=NULL) {
747 copy_object(&op->arch->clone,op); 747 copy_object(&op->arch->clone,op);
748 op->instantiate ();
749 } else if (!arch_init) { 748 } else if (!arch_init) {
750 if (op->name) free_string(op->name); 749 if (op->name) free_string(op->name);
751 /* record the name of the broken object */ 750 /* record the name of the broken object */
752 op->name = add_string(yv); 751 op->name = add_string(yv);
753 } 752 }
… …
768^more{WS}$ { /* We need to record that this is a multipart object, 767^more{WS}$ { /* We need to record that this is a multipart object,
769 * so the calling function can glue things back together 768 * so the calling function can glue things back together
770 */ 769 */
771 ismore=1; 770 ismore=1;
772 } 771 }
773
774^end{WS}$ { check_loaded_object(op); 772^end{WS}$ { check_loaded_object(op);
773
774 if (!arch_init)
775 op->instantiate ();
776
775 if (ismore) return LL_MORE; 777 if (ismore) return LL_MORE;
776 else return LL_NORMAL; 778 else return LL_NORMAL;
777 } 779 }
780^oid{S} {
781 thawer.get (op, IVAL);
782 }
778^last_heal{S} op->last_heal = IVAL; 783^last_heal{S} op->last_heal = IVAL;
779^last_sp{S} op->last_sp = IVAL; 784^last_sp{S} op->last_sp = IVAL;
780^last_grace{S} op->last_grace = IVAL; 785^last_grace{S} op->last_grace = IVAL;
781^last_eat{S} op->last_eat = IVAL; 786^last_eat{S} op->last_eat = IVAL;
782^speed{S} { op->speed = FVAL; 787^speed{S} { op->speed = FVAL;
… …
1404 * be reset. 1409 * be reset.
1405 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1410 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1406 * 1411 *
1407 */ 1412 */
1408 1413
1409int load_object(FILE *fp, object *op, int bufstate, int map_flags) { 1414int load_object(object_thawer &fp, object *op, int bufstate, int map_flags) {
1410 int retval; 1415 int retval;
1411 char inbuf[MAX_BUF]; 1416 char inbuf[MAX_BUF];
1412 1417
1413 strcpy(msgbuf, ""); 1418 strcpy(msgbuf, "");
1414 strcpy(lorebuf, ""); 1419 strcpy(lorebuf, "");
… …
1420 } 1425 }
1421 if (bufstate==LO_LINEMODE) { 1426 if (bufstate==LO_LINEMODE) {
1422 YY_BUFFER_STATE yybufstate; 1427 YY_BUFFER_STATE yybufstate;
1423 while (fgets(inbuf, MAX_BUF-3, fp)) { 1428 while (fgets(inbuf, MAX_BUF-3, fp)) {
1424 yybufstate=yy_scan_string(inbuf); 1429 yybufstate=yy_scan_string(inbuf);
1425 retval=lex_load(op, map_flags); 1430 retval=lex_load(op, fp, map_flags);
1426 yy_delete_buffer(yybufstate); 1431 yy_delete_buffer(yybufstate);
1427 if (retval==LL_NORMAL) return retval; 1432 if (retval==LL_NORMAL) return retval;
1428 } 1433 }
1429 LOG(llevDebug,"Got eof while scanning strings\n"); 1434 LOG(llevDebug,"Got eof while scanning strings\n");
1430 return LL_EOF; 1435 return LL_EOF;
1431 } 1436 }
1432 1437
1433 retval=lex_load(op, map_flags); 1438 retval=lex_load(op, fp, map_flags);
1434 if (op->current_weapon_script != NULL) 1439 if (op->current_weapon_script != NULL)
1435 { 1440 {
1436 op->current_weapon = find_best_weapon_used_match(op, op->current_weapon_script); 1441 op->current_weapon = find_best_weapon_used_match(op, op->current_weapon_script);
1437 LOG(llevDebug, "CurrentWeapon Loaded !\n"); 1442 LOG(llevDebug, "CurrentWeapon Loaded !\n");
1438 }; 1443 };
… …
1449 * override values and in c_wiz to mutate values. 1454 * override values and in c_wiz to mutate values.
1450 */ 1455 */
1451int set_variable(object *op,char *buf) { 1456int set_variable(object *op,char *buf) {
1452 YY_BUFFER_STATE yybufstate,yycurbuf=YY_CURRENT_BUFFER; 1457 YY_BUFFER_STATE yybufstate,yycurbuf=YY_CURRENT_BUFFER;
1453 int retval; 1458 int retval;
1459 object_thawer thawer (0);
1454 1460
1455 strcpy(msgbuf, ""); 1461 strcpy(msgbuf, "");
1456 strcpy(lorebuf, ""); 1462 strcpy(lorebuf, "");
1457 yy_push_state(INITIAL); 1463 yy_push_state(INITIAL);
1458 yybufstate=yy_scan_string(buf); 1464 yybufstate=yy_scan_string(buf);
1459 retval=lex_load(op,0); 1465 retval=lex_load(op,thawer,0);
1460 yy_switch_to_buffer(yycurbuf); 1466 yy_switch_to_buffer(yycurbuf);
1461 yy_delete_buffer(yybufstate); 1467 yy_delete_buffer(yybufstate);
1462 yy_pop_state(); 1468 yy_pop_state();
1463 return retval; 1469 return retval;
1464} 1470}
… …
2031 * the only place this is not set is when saving the player. 2037 * the only place this is not set is when saving the player.
2032 * If bit 1 of flag is set, don't remove the object after save. As of now, 2038 * If bit 1 of flag is set, don't remove the object after save. As of now,
2033 * all of the callers are setting this. 2039 * all of the callers are setting this.
2034 */ 2040 */
2035 2041
2036void save_object(FILE *fp,object *op, int flag) { 2042void save_object(object_freezer &fp,object *op, int flag) {
2037 archetype *at; 2043 archetype *at;
2038 char *cp; 2044 char *cp;
2039 object *tmp,*old; 2045 object *tmp,*old;
2040 2046
2041 /* Even if the object does have an owner, it would seem that we should 2047 /* Even if the object does have an owner, it would seem that we should
… …
2080 if (!(flag&2)) { 2086 if (!(flag&2)) {
2081 remove_ob(op); 2087 remove_ob(op);
2082 free_object (op); 2088 free_object (op);
2083 } 2089 }
2084 2090
2091 fp.put (op);
2085 fprintf(fp,"end\n"); 2092 fprintf(fp,"end\n");
2086} 2093}
2087 2094
2088void insert_event(object* op, int etype, char *ehook, char *eplug, char *eoptions) 2095void insert_event(object* op, int etype, char *ehook, char *eplug, char *eoptions)
2089{ 2096{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines