|
From: Eric M. <eri...@us...> - 2006-06-02 16:58:38
|
Update of /cvsroot/xconq/xconq/src/include/gdl In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23113 Modified Files: gvars.h history.h kernel.h lisp.h module.h namer.h pact.h player.h score.h tables.h types.h ui.h world.h Log Message: Add CVS serialization support. Fix copyrights. Index: world.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/world.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** world.h 29 May 2006 20:11:12 -0000 1.1 --- world.h 2 Jun 2006 16:58:33 -0000 1.2 *************** *** 126,129 **** --- 126,132 ---- extern int daynight; + //! True if the area is to be saved to a different size than it is now. + extern int doreshape; + // Queries *************** *** 146,149 **** --- 149,158 ---- extern void interp_world(Obj *form); + //! Compute and return the corresponding point in an area being reshaped. + extern int reshaped_point(int x1, int y1, int *x2p, int *y2p); + + //! Serialize world to GDL. + extern void write_world(void); + NAMESPACE_GDL_END NAMESPACE_XCONQ_END Index: module.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/module.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** module.h 27 May 2006 17:31:34 -0000 1.1 --- module.h 2 Jun 2006 16:58:33 -0000 1.2 *************** *** 6,11 **** /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2003-2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// --- 6,12 ---- /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// + Copyright (C) 1987-1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2004-2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// *************** *** 225,228 **** --- 226,235 ---- extern Module *curmodule; + //! File being written to. + extern FILE *wfp; + + //! Module used for reshaping game area output. + extern Module *reshaper; + // Global Variables: Validation *************** *** 232,235 **** --- 239,245 ---- // Global Variables: Game State + //! True, if game in safe state for saving. + extern int gamestatesafe; + //! True, if game will start in middle of a turn. extern int midturnrestore; *************** *** 243,246 **** --- 253,261 ---- extern PackedBoolTable *G_advances_synopsis; + // Global Variables: Buffers + + //! Buffer for shortest names. + extern char *shortestbuf; + // Queries *************** *** 359,362 **** --- 374,395 ---- extern void do_module_variants(Module *module, Obj *lis); + //! Preparation and preallocation for writing. + extern void init_write(void); + + /* + NOTE: 'write_entire_game_state' is forward declared in an "earlier" + namespace. The declaration eventually should be moved here. + */ + + //! True, if any actual reshaping is required. + extern int reshape_the_output(Module *module); + + //! Serialize game module to GDL. + /*! + Given a game module telling what is in the module, write out a file + containing the requested content. Return true if all went OK. + */ + extern int write_game_module(Module *module, char *fname); + #if (0) // Temp disable. *************** *** 377,381 **** extern void clear_game_modules(void); extern void init_module_reshape(Module *module); - extern int reshape_the_output(Module *module); extern int valid_reshape(Module *module); extern char *saved_game_filename(void); --- 410,413 ---- Index: player.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/player.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** player.h 27 May 2006 23:31:34 -0000 1.1 --- player.h 2 Jun 2006 16:58:33 -0000 1.2 *************** *** 6,12 **** /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2004-2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// --- 6,12 ---- /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1987-1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// *************** *** 116,119 **** --- 116,124 ---- extern void interp_player(Obj *form); + //! Serialize player to GDL. + extern void write_player(struct a_player *player); + //! Serialize players to GDL. + extern void write_players(void); + NAMESPACE_GDL_END NAMESPACE_XCONQ_END Index: ui.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/ui.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ui.h 30 May 2006 02:50:19 -0000 1.2 --- ui.h 2 Jun 2006 16:58:33 -0000 1.3 *************** *** 56,68 **** NAMESPACE_GDL_BEGIN ! // Global Functions: Notification ! //! Notify given side of something via UI. extern void notify(Side *side, char *str, ...); //! Announce amount of progress in reading a GDL form. extern void announce_read_progress(void); ! // Global Functions: Debug/Trace //! Print GDL form via UI. --- 56,76 ---- NAMESPACE_GDL_BEGIN ! // Notifications ! //! Notify given side of something. extern void notify(Side *side, char *str, ...); + //! Notify all sides of something. + extern void notify_all(char *str, ...); + //! Announce amount of progress in reading a GDL form. extern void announce_read_progress(void); ! // Queries ! ! //! Does the side have an active display associated with it? ! extern int active_display(Side *side); ! ! // Debugging/Tracing //! Print GDL form via UI. *************** *** 72,76 **** extern void end_printing_forms(void); ! // Global Functions: Status Displays //! Ask UI to update display of given unit. --- 80,85 ---- extern void end_printing_forms(void); ! // Status Displays ! //! Ask UI to update display of given unit. *************** *** 78,84 **** --- 87,98 ---- //! Ask UI to update display of given cell. extern void update_cell_display(Side *side, int x, int y, int flags); + //! Ask UI to update display of given event. + extern void update_event_display(Side *side, struct a_histevent *hevt, int rightnow); //! Flush display buffers for given side. extern void flush_display_buffers(Side *side); + //! Play any movies associated with event. + extern void play_event_movies(Side *side, struct a_histevent *hevt); + NAMESPACE_GDL_END NAMESPACE_XCONQ_END Index: score.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/score.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** score.h 28 May 2006 18:10:41 -0000 1.1 --- score.h 2 Jun 2006 16:58:33 -0000 1.2 *************** *** 93,96 **** --- 93,104 ---- extern int numscorekeepers; + //! Number of scores being kept. + extern int numscores; + + //! Update any scores after action? + extern int any_post_action_scores; + //! Update any scores after event? + extern int any_post_event_scores; + // Queries *************** *** 108,111 **** --- 116,122 ---- extern void interp_scorekeeper(Obj *form); + //! Serialize scorekeeper to GDL. + extern void write_scorekeepers(void); + NAMESPACE_GDL_END NAMESPACE_XCONQ_END Index: kernel.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/kernel.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kernel.h 30 May 2006 02:50:19 -0000 1.2 --- kernel.h 2 Jun 2006 16:58:33 -0000 1.3 *************** *** 44,58 **** extern int numremotes; // Global Variables: Game State //! True, if at end of game. extern int endofgame; // Global Variables: Notification ! //! Warnings suppressed flag. extern int warnings_suppressed; ! // Global Variables: Game Setup //! Return GDL list of default world synthesis methods. --- 44,81 ---- extern int numremotes; + //! Temporary remote id. + extern int tmprid; + // Global Variables: Game State + //! True, if before start of game. + extern int beforestart; + //! True, if at end of game. extern int endofgame; + //! True, if synchronizing debugging state. + extern int debugging_state_sync; + + //! Real time at which game was started. + extern time_t game_start_in_real_time; + + //! True, if post event scoring is needed. + extern int need_post_event_scores; + // Global Variables: Notification ! //! Flag: warnings suppressed. extern int warnings_suppressed; ! // Network ! ! //! Add string to network packet. ! extern void add_to_packet(char *str); ! ! //! Finalize packet write. ! extern void flush_write(void); ! ! // Game Setup //! Return GDL list of default world synthesis methods. Index: lisp.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/lisp.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lisp.h 27 May 2006 02:55:14 -0000 1.4 --- lisp.h 2 Jun 2006 16:58:33 -0000 1.5 *************** *** 6,10 **** /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs Copyright (C) 2004-2006 Eric A. McDonald --- 6,10 ---- /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1987-1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs Copyright (C) 2004-2006 Eric A. McDonald *************** *** 53,56 **** --- 53,61 ---- #define CONTEXTSIZE 129 + // Function Macros: Queries + + //! Get keyword name from key value. + #define key(x) (keyword_name(x)) + // Function Macros: Validation *************** *** 291,294 **** --- 296,302 ---- extern int equal(Obj *x, Obj *y); + //! Is string not its default value? + extern int string_not_default(char *str, char *dflt); + // Queries: Attribution *************** *** 380,383 **** --- 388,394 ---- extern void set_cdr(Obj *x, Obj *v); + //! Replace GDL list item where key is matched. + extern Obj *replace_at_key(Obj *lis, char *key, Obj *newval); + //! Remove element from list. extern Obj *remove_from_list(Obj *element, Obj *lis); *************** *** 487,490 **** --- 498,573 ---- extern void interp_long_array(long *arr, Obj *lis, int n); + //! Convert symbol name to its GDL escaped form. + /*! \bug Potential buffer overflow. */ + extern char *escaped_symbol(char *str); + //! Convert string to its GDL escaped form. + /*! + Note that this works correctly on NULL strings, turning them into + strings of length 0. + */ + /*! \bug Potential buffer overflow. */ + extern char *escaped_string(char *str); + //! Safely convert string to its GDL escaped form. + /*! + The escaped_string() function makes a dangerous assumption about + the length of an escaped (or even unescaped) string being less than + the BUFSIZE, which is the size of escapedthingbuf. + safe_escaped_string() is slightly less efficient, but avoids this + assumption. Do note, however, that safe_escaped_string() can result + in a memory leak, if the caller does not free the result after + using it. + */ + extern char *safe_escaped_string(char *str, int len); + + //! Serialize start-of-form token to GDL. + extern void start_form(char *hd); + //! Serialize end-of-form token to GDL. + extern void end_form(void); + //! Serialize newline to GDL. + extern void newline_form(void); + //! Serialize space to GDL. + extern void space_form(void); + + //! Append string to GDL form. + extern void add_to_form(char *x); + //! Append string to GDL form without space delimiter. + extern void add_to_form_no_space(char *x); + //! Append char to GDL form. + extern void add_char_to_form(int x); + //! Append number to GDL form. + extern void add_num_to_form(int x); + //! Append number to GDL form without space delimiter. + extern void add_num_to_form_no_space(int x); + //! Append number or dice spec to GDL form. + /*! Write either a normal value or a dice spec, as appropriate. */ + extern void add_num_or_dice_to_form(int x, int valtype); + //! Append GDL form to GDL form. + extern void add_form_to_form(Obj *x); + + //! Serialize boolean-valued property to GDL. + extern void write_bool_prop( + char *name, + int value, + int dflt, + int nodefaulting, int addnewline); + //! Serialize integer-valued property to GDL. + extern void write_num_prop( + char *name, + int value, + int dflt, + int nodefaulting, int addnewline); + //! Serialize string-valued property to GDL. + extern void write_str_prop( + char *name, + char *value, + char *dflt, + int nodefaulting, int addnewline); + //! Serialize GDL Lisp-valued property to GDL. + extern void write_lisp_prop( + char *name, + struct a_obj *value, + struct a_obj *dflt, + int nodefaulting, int as_cdr, int addnewline); + #if (0) *************** *** 495,499 **** extern Obj *reverse(Obj *lis); extern Obj *find_at_key(Obj *lis, char *key); - extern Obj *replace_at_key(Obj *lis, char *key, Obj *newval); extern void dlisp(Obj *x); extern void print_form_and_value(FILE *fp, Obj *form); --- 578,581 ---- *************** *** 510,517 **** int maxdo, int maxval, int maxrslt, int *rslt); - - extern char *escaped_symbol(char *str); - extern char *escaped_string(char *str); - extern char *safe_escaped_string(char *str, int len); extern char *get_string(Obj *lis); --- 592,595 ---- Index: tables.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/tables.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tables.h 28 May 2006 22:31:21 -0000 1.5 --- tables.h 2 Jun 2006 16:58:33 -0000 1.6 *************** *** 6,10 **** /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs Copyright (C) 2005-2006 Eric A. McDonald --- 6,10 ---- /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1987-1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs Copyright (C) 2005-2006 Eric A. McDonald *************** *** 215,218 **** --- 215,240 ---- extern void interp_table(Obj *form); + #if (0) + //! Serialize stripe of table values to GDL. + extern void write_type_value_list( + int typ, int *flags, int dim, int (*getter)(int, int), int i); + #endif + + //! Serialize table to GDL. + /*! + Write out a single table. Only write it if it contains non-default + values, and try to find runs of constant value, since tables can be + really large, but often have constant areas within them. + */ + extern void write_table( + char *name, + int (*getter)(int, int), + int dflt, + int typ1, int typ2, int valtype, + int compress); + + //! Serialize tables to GDL. + extern void write_tables(int compress); + NAMESPACE_GDL_END NAMESPACE_XCONQ_END Index: types.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/types.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** types.h 29 May 2006 14:22:03 -0000 1.6 --- types.h 2 Jun 2006 16:58:33 -0000 1.7 *************** *** 8,12 **** Copyright (C) 1987-1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2004-2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// --- 8,12 ---- Copyright (C) 1987-1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2005-2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// *************** *** 125,128 **** --- 125,145 ---- #define is_advance_type(a) ((a) >= 0 && (a) < numatypes) + //! Get wildcard symbol from game entity type. + #define star_from_typ(typ) \ + ((typ) == UTYP ? \ + "u*" : \ + ((typ) == MTYP ? \ + "m*" : \ + ((typ) == TTYP ? "t*" : "a*"))) + + //! Get name of type from game entity type and index. + #define name_from_typ(typ, i) \ + ((typ) == UTYP ? \ + shortest_escaped_name(i) : \ + ((typ) == MTYP ? \ + m_type_name(i) : \ + ((typ) == TTYP ? \ + t_type_name(i) : a_type_name(i)))) + //! Is terrain type cell-filling terrain? #define t_is_cell(t) (t_subtype(t) == cellsubtype) *************** *** 533,536 **** --- 550,559 ---- //! Get shortest distinct name for unit type. extern char *shortest_unique_name(int u); + //! Get shortest escaped name for unit type. + /*! + Return the shortest properly escaped name that can be used to identify + unit type. + */ + extern char *shortest_escaped_name(int u); //! Could given unit type be on given terrain type? *************** *** 722,725 **** --- 745,771 ---- extern void add_properties(Obj *form); + //! Serialize list of unit type-value pairs to GDL. + extern void write_utype_value_list( + char *name, short *arr, int dflt, int addnewline); + //! Serialize list of material type-value pairs to GDL. + extern void write_mtype_value_list( + char *name, short *arr, int dflt, int addnewline); + //! Serialize treasury list to GDL. + /*! Same as material type-value list but with wider values. */ + extern void write_treasury_list( + char *name, long *arr, int dflt, int addnewline); + //! Serialize list of advance type-value pairs to GDL. + extern void write_atype_value_list( + char *name, short *arr, int dflt, int addnewline); + + //! Serialize list of unit type-string pairs to GDL. + extern void write_utype_string_list( + char *name, char **arr, char *dflt, int addnewline); + + //! Serialize game entity type-name list to GDL. + extern void write_type_name_list(int typ, int *flags, int dim); + //! Serialize game entity types to GDL. + extern void write_types(void); + NAMESPACE_GDL_END NAMESPACE_XCONQ_END Index: history.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/history.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** history.h 23 May 2006 20:59:16 -0000 1.1 --- history.h 2 Jun 2006 16:58:33 -0000 1.2 *************** *** 6,12 **** /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2004-2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// --- 6,12 ---- /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1987-1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// *************** *** 129,132 **** --- 129,149 ---- extern HistEvent *history; + // Queries + + //! Find event type from GDL container. + extern int find_event_type(Obj *sym); + + //! Does pattern match event? + extern int pattern_matches_event(Obj *pattern, HistEvent *hevt); + + //! Describe event from GDL list. + extern void event_desc_from_list( + Side *side, Obj *lis, HistEvent *hevt, char *buf); + + // History Management + + //! Record event into game history. + extern HistEvent *record_event(HistEventType type, SideMask observers, ...); + // Lifecycle Management *************** *** 139,142 **** --- 156,164 ---- extern void interp_history(Obj *form); + //! Serialize historical event to GDL. + extern void write_historical_event(HistEvent *hevt); + //! Serialize history to GDL. + extern void write_history(void); + NAMESPACE_GDL_END NAMESPACE_XCONQ_END Index: gvars.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/gvars.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gvars.h 23 May 2006 18:02:09 -0000 1.3 --- gvars.h 2 Jun 2006 16:58:33 -0000 1.4 *************** *** 6,12 **** /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2004-2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// --- 6,12 ---- /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1987-1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2005-2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// *************** *** 187,190 **** --- 187,197 ---- extern void interp_variable(Obj *form, int isnew); + //! Serialize globals to GDL. + /*! + Write the globals. The "complete" flag forces all values out, even + if they match the compiled-in defaults. + */ + extern void write_globals(void); + NAMESPACE_GDL_END NAMESPACE_XCONQ_END Index: pact.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/pact.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pact.h 27 May 2006 23:01:41 -0000 1.1 --- pact.h 2 Jun 2006 16:58:33 -0000 1.2 *************** *** 6,12 **** /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2004-2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// --- 6,12 ---- /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1987-1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// *************** *** 42,47 **** --- 42,54 ---- #if (0) + //! Read agreement from GDL form. extern void interp_agreement(Obj *form); + + //! Serialize agreements to GDL. + extern void write_agreements(void); + //! Serialize agreement to GDL. + extern void write_agreement(struct a_agreement *agreement); + #endif Index: namer.h =================================================================== RCS file: /cvsroot/xconq/xconq/src/include/gdl/namer.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** namer.h 27 May 2006 19:28:16 -0000 1.1 --- namer.h 2 Jun 2006 16:58:33 -0000 1.2 *************** *** 6,12 **** /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2003-2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// --- 6,12 ---- /*//////////////////////////// COPYRIGHT NOTICE //////////////////////////////// ! Copyright (C) 1987-1989 Stanley T. Shebs Copyright (C) 1991-2000 Stanley T. Shebs ! Copyright (C) 2006 Eric A. McDonald //////////////////////////////////// LICENSE /////////////////////////////////// *************** *** 57,60 **** --- 57,63 ---- extern void interp_namer(Obj *form); + //! Serialize namer to GDL. + extern void write_namers(void); + NAMESPACE_GDL_END NAMESPACE_XCONQ_END |
