[CF-Devel] CVS update: crossfire/include
Crossfire CVS devel
mwedel at scruznet.com
Mon Aug 7 00:16:34 CDT 2000
Date: Sunday August 6, 2000 @ 22:16
Author: cvs
Update of /home/cvs/CVS/crossfire/include
In directory boltzmann.eecs.berkeley.edu:/tmp/cvs-serv6595/include
Modified Files:
newserver.h libproto.h
Log Message:
The following change basically does the following: When the server sends an
item name to the client, this item name is now two pieces - the first piece
of the name is its singular form, the second piece is the plural name. This
now makes items in the inventory appear more proper in terms of pluralization
and just normal English. I did notice that the server does not know how
to properly make 'torch' plural - it turns it into torchs. A matching
check in for the client has also been done.
include/newserver.h: Update VERSION_SC to 1024
common/item.c: Change query_base_name to take a second option on whether
we should generate a plural version of the name or not.
socket/item.c: Modify functions to use second argument on the query_base_name
function. Update item commands to send two part names (singular & plural).
Modify esrv_send_look to use item1 protocol command instead of item command.
server/c_object.c: Update item_matched_string to use second option to
query_base_name. Modify function to check against both singular and
plural versions of name.
server/shop.c: Modify shop_listing command usage in query_basename to use
second option. It will also generate the singular name, but that is only
used on sorting, so I don't think it will generally cause any problems.
include/libproto.h: rebuilt because query_base_name has an addition opt.
Mark Wedel 8/13/2000
****************************************
Index: crossfire/include/newserver.h
diff -u crossfire/include/newserver.h:1.4 crossfire/include/newserver.h:1.5
--- crossfire/include/newserver.h:1.4 Sat Jun 3 00:01:42 2000
+++ crossfire/include/newserver.h Sun Aug 6 22:16:33 2000
@@ -1,6 +1,6 @@
/*
* static char *rcsid_newserver_h =
- * "$Id: newserver.h,v 1.4 2000/06/03 07:01:42 cvs Exp $";
+ * "$Id: newserver.h,v 1.5 2000/08/07 05:16:33 cvs Exp $";
*/
/*
@@ -125,7 +125,7 @@
extern FaceInfo faces[MAXFACENUM]; /* face information */
#define VERSION_CS 1022
-#define VERSION_SC 1023
+#define VERSION_SC 1024
#define VERSION_INFO "Crossfire Server"
Index: crossfire/include/libproto.h
diff -u crossfire/include/libproto.h:1.4 crossfire/include/libproto.h:1.5
--- crossfire/include/libproto.h:1.4 Thu Jun 15 23:08:06 2000
+++ crossfire/include/libproto.h Sun Aug 6 22:16:33 2000
@@ -2,7 +2,7 @@
* This file was automatically generated by version 1.7 of cextract.
* Manual editing not recommended.
*
- * Created: Sun Mar 28 01:31:27 1999
+ * Created: Fri Aug 4 17:36:36 2000
*/
#ifndef __CEXTRACT__
#ifdef __STDC__
@@ -49,7 +49,6 @@
extern void change_book ( object *book, int msgtype );
extern void change_luck ( object *op, int value );
extern int change_map_light ( mapstruct *m, int change );
-extern int operate_altar ( object *altar, object **sacrifice );
extern int check_altar_sacrifice ( object *altar, object *sacrifice );
extern int check_dm_add_exp_to_obj ( object *exp_ob, int i );
extern void check_formulae ( void );
@@ -58,7 +57,7 @@
extern object * check_inv_recursive ( object *op, object *trig );
extern int check_path ( char *name, int prepend_dir );
extern void check_stat_bounds ( living *stats );
-extern int check_trigger ( object *op, object *sacrifice );
+extern int check_trigger ( object *op, object *cause );
extern int check_walk_on ( object *op, object *originator );
extern void check_wall ( object *op, int x, int y );
extern void clean_object ( object *op );
@@ -72,6 +71,7 @@
extern void close_and_delete ( FILE *fp, int compressed );
extern void copy_map ( mapstruct *m1, mapstruct *m2 );
extern void copy_object ( object *op2, object *op );
+extern void copy_owner ( object *op, object *clone );
extern int count_active ( void );
extern int count_free ( void );
extern int count_used ( void );
@@ -101,7 +101,7 @@
extern void dummy_function_ob_int ( object *ob, int i );
extern void dummy_function_player_int ( player *p, int j );
extern void dummy_function_txtnr ( char *txt, int nr );
-extern void dummy_move_apply_func (object *, object *, object * );
+extern void dummy_move_apply_func ( object *ob, object *ob2, object *ob3 );
extern void dump_abilities ( void );
extern void dump_alchemy ( void );
extern void dump_alchemy_costs ( void );
@@ -173,7 +173,6 @@
extern mapstruct *get_empty_map ( int sizex, int sizey );
extern recipelist * get_formulalist ( int i );
extern char *get_levelnumber ( int i );
-extern int was_destroyed (object *op, tag_t old_tag);
extern mapstruct *get_linked_map ( char *path );
extern int get_magic ( int diff );
extern object *get_nearest_part ( object *op, object *pl );
@@ -259,6 +258,7 @@
extern object *ObjectCreateArch ( archetype * at );
extern object *ObjectCreateClone ( object *asrc );
extern FILE *open_and_uncompress ( char *name, int flag, int *compressed );
+extern int operate_altar ( object *altar, object **sacrifice );
extern void player_lvl_adj ( object *who, object *op );
extern object *pntr_to_god_obj ( godlink *godlnk );
extern object *present ( unsigned char type, mapstruct *m, int x, int y );
@@ -268,7 +268,7 @@
extern void print_los ( object *op );
extern void print_monsters ( void );
extern void push_button ( object *op );
-extern char *query_base_name ( object *op );
+extern char *query_base_name ( object *op, int plural );
extern char *query_name ( object *op );
extern int query_refcount ( const char *str );
extern char *query_short_name ( object *op );
@@ -295,7 +295,6 @@
extern long seconds ( void );
extern void second_arch_pass ( FILE *fp );
extern void set_abs_magic ( object *op, int magic );
-extern void set_move_apply ( type_move_apply_func addr );
extern void set_attr_value ( living *stats, int attr, signed char value );
extern void set_block ( int x, int y, int bx, int by );
extern void set_cheat ( object *op );
@@ -313,11 +312,11 @@
extern void set_map_reset_time ( mapstruct *map );
extern void set_max_time ( long t );
extern void set_monster_check_apply ( type_func_ob_ob addr );
+extern void set_move_apply ( type_move_apply_func addr );
extern void set_move_creator ( type_func_ob addr );
-extern void set_move_teleporter ( type_func_ob addr );
extern void set_move_firewall ( type_func_ob addr );
+extern void set_move_teleporter ( type_func_ob addr );
extern void set_owner ( object *op, object *owner );
-extern void copy_owner ( object *op, object *clone );
extern void set_process_active_maps ( type_func_void addr );
extern void set_remove_friendly_object ( type_func_ob addr );
extern void set_ring_bonus ( object *op, int bonus );
@@ -354,6 +353,7 @@
extern void use_trigger ( object *op );
extern void verify_button_links ( mapstruct *map );
extern int wall ( mapstruct *m, int x, int y );
+extern int was_destroyed ( object *op, tag_t old_tag );
extern void write_book_archive ( void );
extern int yyerror ( char *s );
extern void yyrestart ( FILE *input_file );
More information about the crossfire
mailing list