ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/cfperl.xs
(Generate patch)

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.367 by root, Mon Apr 12 05:22:38 2010 UTC vs.
Revision 1.371 by root, Thu Apr 15 02:51:39 2010 UTC

… …
1139 1139
1140 return retval; 1140 return retval;
1141} 1141}
1142 1142
1143maptile * 1143maptile *
1144find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty) 1144find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty, bool recurse)
1145{ 1145{
1146 CALL_BEGIN (3); 1146 CALL_BEGIN (4);
1147 CALL_ARG (dirname); 1147 CALL_ARG (dirname);
1148 CALL_ARG (stylename); 1148 CALL_ARG (stylename);
1149 CALL_ARG (difficulty); 1149 CALL_ARG (difficulty);
1150 CALL_ARG (recurse);
1150 CALL_CALL ("ext::map_random::find_style", G_SCALAR); 1151 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1151 1152
1152 maptile *retval = 0; 1153 maptile *retval = 0;
1153 if (count) sv_to (POPs, retval); 1154 if (count) sv_to (POPs, retval);
1154 1155
… …
1664 switch (items) 1665 switch (items)
1665 { 1666 {
1666 case 0: RETVAL = gen (); break; 1667 case 0: RETVAL = gen (); break;
1667 case 1: RETVAL = gen (SvUV (ST (0))); break; 1668 case 1: RETVAL = gen (SvUV (ST (0))); break;
1668 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1669 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1669 default: croak ("cf::rndm requires none, one or two parameters."); break; 1670 default: croak ("cf::rndm requires zero, one or two parameters."); break;
1670 } 1671 }
1671} 1672}
1672 OUTPUT: 1673 OUTPUT:
1673 RETVAL 1674 RETVAL
1674 1675
… …
2027} 2028}
2028 OUTPUT: 2029 OUTPUT:
2029 RETVAL 2030 RETVAL
2030 2031
2031object *find_best_object_match (object *op, utf8_string match) 2032object *find_best_object_match (object *op, utf8_string match)
2032
2033object *find_marked_object (object *op)
2034
2035int need_identify (object *obj);
2036 2033
2037int apply_shop_mat (object *shop_mat, object *op); 2034int apply_shop_mat (object *shop_mat, object *op);
2038 2035
2039int move (object *op, int dir, object *originator = op) 2036int move (object *op, int dir, object *originator = op)
2040 CODE: 2037 CODE:
… …
2807 while (!RETVAL); // crude way to leave index 0 2804 while (!RETVAL); // crude way to leave index 0
2808 2805
2809 faces [RETVAL].name = name; 2806 faces [RETVAL].name = name;
2810 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2807 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2811 2808
2812 if (!strcmp (name, BLANK_FACE_NAME)) blank_face = RETVAL; 2809 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2813 if (!strcmp (name, EMPTY_FACE_NAME)) empty_face = RETVAL; 2810 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2811 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2814} 2812}
2815 OUTPUT: RETVAL 2813 OUTPUT: RETVAL
2816 2814
2817void set_type (faceidx idx, int value) 2815void set_type (faceidx idx, int value)
2818 ALIAS: 2816 ALIAS:

Diff Legend

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