--- deliantra/server/include/preprocess	2006/09/13 02:05:19	1.6
+++ deliantra/server/include/preprocess	2007/04/14 07:23:00	1.21
@@ -1,5 +1,7 @@
 #!/opt/bin/perl
 
+my %ARG = @ARGV;
+
 use List::Util;
 
 # todo: gather dynamically
@@ -68,6 +70,7 @@
    dam
    dam_modifier
    damned
+   destroy_on_death
    dex
    direction
    duration
@@ -94,6 +97,7 @@
    has_ready_skill
    has_ready_wand
    has_ready_weapon
+   has_ready_range
    hitback
    hp
    identified
@@ -105,6 +109,7 @@
    is_blind
    is_buildable
    is_cauldron
+   is_dust
    is_floor
    is_hilly
    is_lightable
@@ -155,6 +160,7 @@
    no_steal
    no_strength
    nrof
+   obj_original
    object
    oid
    one_hit
@@ -166,6 +172,7 @@
    path_repelled
    perm_exp
    pick_up
+   player_sold
    pow
    protected
    race
@@ -246,7 +253,96 @@
    xrays
    y
 
-   Object
+   maplore
+   endmaplore
+   enter_x
+   enter_y
+   width
+   height
+   reset_timeout
+   reset_time
+   swap_time
+   difficulty
+   darkness
+   fixed_resettime
+   per_player
+   per_party
+   region
+   shopitems
+   shopgreed
+   shopmin
+   shopmax
+   shoprace
+   outdoor
+   tile_path_1
+   tile_path_2
+   tile_path_3
+   tile_path_4
+
+   file_format_version
+
+   temp
+   pressure
+   humid
+   windspeed
+   winddir
+   sky
+
+   map
+   savebed_map
+   bed_x
+   bed_y
+   password
+   shoottype
+   bowtype
+   petmode
+   gen_hp
+   gen_sp
+   gen_grace
+   listening
+   peaceful
+   digestion
+   pickup
+   outputs_sync
+   outputs_count
+   usekeys
+   unapply
+   weapon_sp
+   lev_array
+   endplst
+
+   visibility
+   magicmap
+
+   match
+   parent
+   longname
+   jail_map
+   jail_x
+   jail_y
+   fallback
+   nomore
+
+   chance
+   mods
+   diff
+   saves
+   description
+   density
+   damage
+
+   anim
+   mina
+   facings
+   player
+
+   allowed
+   keycode
+   trans
+   yield
+   ingred
+   cauldron
+
    Str
    Dex
    Con
@@ -254,11 +350,10 @@
    Cha
    Int
    Pow
-   More
 );
 
-open GPERF, "|-", "gperf -m50 >kw_hash.h"
-   or die "gperf: $!";
+open GPERF, "|-", "exec $ARG{GPERF} -m50 >kw_hash.h"
+   or die "$ARGV{GPERF}: $!";
 
 print GPERF <<EOF;
 %language=C++
@@ -292,6 +387,9 @@
 printf GPERF "\nextern const unsigned char keyword_len [] = { 5, 7, %s };\n\n",
        join ", ", map length, @kw;
 
+close GPERF
+   or die "$ARG{GPERF}: failed to run";
+
 open KW, ">", "keyword.h";
 
 print KW <<EOF;
@@ -299,7 +397,9 @@
 #define KW_H__
 
 enum keyword {
-  KW_EOF, KW_ERROR,
+  KW_NULL = 0,
+  KW_EOF  = 0,
+  KW_ERROR,
 EOF
 
 for (@kw) {