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.339 by root, Thu Nov 26 08:08:40 2009 UTC vs.
Revision 1.346 by root, Sat Jan 16 17:41:01 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
6 * 5 *
7 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
8 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
9 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
10 * option) any later version. 9 * option) any later version.
… …
29 28
30#include <cstdarg> 29#include <cstdarg>
31#include <typeinfo> 30#include <typeinfo>
32 31
33#include "global.h" 32#include "global.h"
34#include "loader.h"
35#include "../random_maps/random_map.h" 33#include "../random_maps/random_map.h"
36#include "evthread.h" 34#include "evthread.h"
37#include "sproto.h" 35#include "sproto.h"
38 36
39#include <unistd.h> 37#include <unistd.h>
… …
97 *cv_cf_client_send_msg, 95 *cv_cf_client_send_msg,
98 *cv_cf_tick, 96 *cv_cf_tick,
99 *cv_cf_match_match; 97 *cv_cf_match_match;
100 98
101#ifndef newSVpv_utf8 99#ifndef newSVpv_utf8
102static inline SV * 100static SV *
103newSVpv_utf8 (const char *s) 101newSVpv_utf8 (const char *s)
104{ 102{
105 if (!s) 103 if (!s)
106 return newSV (0); 104 return newSV (0);
107 105
… …
110 return sv; 108 return sv;
111} 109}
112#endif 110#endif
113 111
114#ifndef newSVpvn_utf8 112#ifndef newSVpvn_utf8
115static inline SV * 113static SV *
116newSVpvn_utf8 (const char *s, STRLEN l, int utf8) 114newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
117{ 115{
118 if (!s) 116 if (!s)
119 return newSV (0); 117 return newSV (0);
120 118
… …
124 SvUTF8_on (sv); 122 SvUTF8_on (sv);
125 123
126 return sv; 124 return sv;
127} 125}
128#endif 126#endif
127
128static noinline utf8_string
129cfSvPVutf8_nolen (SV *sv)
130{
131 SvGETMAGIC (sv);
132
133 if (SvPOK (sv))
134 {
135 if (!SvUTF8 (sv))
136 sv_utf8_upgrade_nomg (sv);
137
138 return SvPVX (sv);
139 }
140
141 return SvPV_nolen (sv);
142}
129 143
130// helper cast function, returns super class * or 0 144// helper cast function, returns super class * or 0
131template<class super> 145template<class super>
132static super * 146static super *
133is_a (attachable *at) 147is_a (attachable *at)
… …
402 hv_clear ((HV *)sv); 416 hv_clear ((HV *)sv);
403 sv_unmagic (sv, PERL_MAGIC_ext); 417 sv_unmagic (sv, PERL_MAGIC_ext);
404} 418}
405#endif 419#endif
406 420
407static long SvPTR_nc (SV *sv) 421static long
422SvPTR_nc (SV *sv)
408{ 423{
409 sv = SvRV (sv); 424 sv = SvRV (sv);
410 425
411 // very important shortcut 426 // very important shortcut
412 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext)) 427 if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
… …
528 SV *sv = to_sv (static_cast<dynbuf *> (v)); 543 SV *sv = to_sv (static_cast<dynbuf *> (v));
529 SvUTF8_on (sv); 544 SvUTF8_on (sv);
530 return sv; 545 return sv;
531} 546}
532 547
533static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 548static inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
534static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 549static inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
535static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 550static inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
536static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 551static inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
537static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); } 552static inline void sv_to (SV *sv, unsigned char &v) { v = SvIV (sv); }
538static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); } 553static inline void sv_to (SV *sv, signed short &v) { v = SvIV (sv); }
… …
1063 CALL_CALL ("ext::books::make_book", G_VOID); 1078 CALL_CALL ("ext::books::make_book", G_VOID);
1064 CALL_END; 1079 CALL_END;
1065} 1080}
1066 1081
1067void 1082void
1068cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1083cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
1069{ 1084{
1070 CALL_BEGIN (4); 1085 CALL_BEGIN (4);
1071 CALL_ARG (ns); 1086 CALL_ARG (ns);
1072 CALL_ARG (type); 1087 CALL_ARG (type);
1073 CALL_ARG_SV (newSVpv_utf8 (msg)); 1088 CALL_ARG_SV (newSVpv_utf8 (msg));
… …
1102 CALL_CALL ("cf::mapscript::activate", G_VOID); 1117 CALL_CALL ("cf::mapscript::activate", G_VOID);
1103 CALL_END; 1118 CALL_END;
1104} 1119}
1105 1120
1106player * 1121player *
1107player::find (const char *name) 1122player::find (const_utf8_string name)
1108{ 1123{
1109 CALL_BEGIN (1); 1124 CALL_BEGIN (1);
1110 CALL_ARG (name); 1125 CALL_ARG (name);
1111 CALL_CALL ("cf::player::find", G_SCALAR); 1126 CALL_CALL ("cf::player::find", G_SCALAR);
1112 1127
… …
1117 1132
1118 return retval; 1133 return retval;
1119} 1134}
1120 1135
1121maptile * 1136maptile *
1122find_style (const char *dirname, const char *stylename, int difficulty) 1137find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
1123{ 1138{
1124 CALL_BEGIN (3); 1139 CALL_BEGIN (3);
1125 CALL_ARG (dirname); 1140 CALL_ARG (dirname);
1126 CALL_ARG (stylename); 1141 CALL_ARG (stylename);
1127 CALL_ARG (difficulty); 1142 CALL_ARG (difficulty);
… …
1134 1149
1135 return retval; 1150 return retval;
1136} 1151}
1137 1152
1138maptile * 1153maptile *
1139maptile::find_sync (const char *path, maptile *origin) 1154maptile::find_sync (const_utf8_string path, maptile *origin)
1140{ 1155{
1141 CALL_BEGIN (2); 1156 CALL_BEGIN (2);
1142 CALL_ARG (path); 1157 CALL_ARG (path);
1143 CALL_ARG (origin); 1158 CALL_ARG (origin);
1144 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1159 CALL_CALL ("cf::map::find_sync", G_SCALAR);
… …
1150 1165
1151 return retval; 1166 return retval;
1152} 1167}
1153 1168
1154maptile * 1169maptile *
1155maptile::find_async (const char *path, maptile *origin, bool load) 1170maptile::find_async (const_utf8_string path, maptile *origin, bool load)
1156{ 1171{
1157 CALL_BEGIN (3); 1172 CALL_BEGIN (3);
1158 CALL_ARG (path); 1173 CALL_ARG (path);
1159 CALL_ARG (origin); 1174 CALL_ARG (origin);
1160 CALL_ARG (load); 1175 CALL_ARG (load);
… …
1189 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1204 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1190 CALL_END; 1205 CALL_END;
1191} 1206}
1192 1207
1193void 1208void
1194object::player_goto (const char *path, int x, int y) 1209object::player_goto (const_utf8_string path, int x, int y)
1195{ 1210{
1196 if (type != PLAYER) 1211 if (type != PLAYER)
1197 return; 1212 return;
1198 1213
1199 CALL_BEGIN (4); 1214 CALL_BEGIN (4);
… …
1203 CALL_ARG (y); 1218 CALL_ARG (y);
1204 CALL_CALL ("cf::object::player::goto", G_VOID); 1219 CALL_CALL ("cf::object::player::goto", G_VOID);
1205 CALL_END; 1220 CALL_END;
1206} 1221}
1207 1222
1208const char * 1223const_utf8_string
1209object::ref () const 1224object::ref () const
1210{ 1225{
1211 if (type == PLAYER) 1226 if (type == PLAYER)
1212 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name); 1227 return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
1213 else 1228 else
1214 return 0; 1229 return 0;
1215} 1230}
1216 1231
1217object * 1232object *
1218object::deref (const char *ref) 1233object::deref (const_utf8_string ref)
1219{ 1234{
1220 object *retval = 0; 1235 object *retval = 0;
1221 1236
1222 if (ref) 1237 if (ref)
1223 { 1238 {
… …
1233 1248
1234 return retval; 1249 return retval;
1235} 1250}
1236 1251
1237void 1252void
1238log_backtrace (const char *msg) 1253log_backtrace (const_utf8_string msg)
1239{ 1254{
1240#if HAVE_BACKTRACE 1255#if HAVE_BACKTRACE
1241 void *addr [20]; 1256 void *addr [20];
1242 int size = backtrace (addr, 20); 1257 int size = backtrace (addr, 20);
1243 1258
… …
1249 CALL_END; 1264 CALL_END;
1250#endif 1265#endif
1251} 1266}
1252 1267
1253bool 1268bool
1254is_match_expr (const char *expr) 1269is_match_expr (const_utf8_string expr)
1255{ 1270{
1256 return !strncmp (expr, "match ", sizeof ("match ") - 1); 1271 return !strncmp (expr, "match ", sizeof ("match ") - 1);
1257} 1272}
1258 1273
1259bool 1274bool
1260match (const char *expr, object *ob, object *self, object *source, object *originator) 1275match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1261{ 1276{
1262 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1277 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1263 expr += sizeof ("match ") - 1; 1278 expr += sizeof ("match ") - 1;
1264 1279
1265 CALL_BEGIN (5); 1280 CALL_BEGIN (5);
… …
1276 1291
1277 return matched; 1292 return matched;
1278} 1293}
1279 1294
1280object * 1295object *
1281match_one (const char *expr, object *ob, object *self, object *source, object *originator) 1296match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
1282{ 1297{
1283 if (!strncmp (expr, "match ", sizeof ("match ") - 1)) 1298 if (!strncmp (expr, "match ", sizeof ("match ") - 1))
1284 expr += sizeof ("match ") - 1; 1299 expr += sizeof ("match ") - 1;
1285 1300
1286 CALL_BEGIN (5); 1301 CALL_BEGIN (5);
… …
2129int mortals_size () 2144int mortals_size ()
2130 CODE: 2145 CODE:
2131 RETVAL = attachable::mortals.size (); 2146 RETVAL = attachable::mortals.size ();
2132 OUTPUT: RETVAL 2147 OUTPUT: RETVAL
2133 2148
2134const char *slot_use_name (U32 slot) 2149const_utf8_string slot_use_name (U32 slot)
2135 ALIAS: 2150 ALIAS:
2136 slot_nonuse_name = 1 2151 slot_nonuse_name = 1
2137 CODE: 2152 CODE:
2138{ 2153{
2139 if (slot >= NUM_BODY_LOCATIONS) 2154 if (slot >= NUM_BODY_LOCATIONS)
… …
2546 for (int x = 0; x < THIS->width; ++x) 2561 for (int x = 0; x < THIS->width; ++x)
2547 for (int y = 0; y < THIS->height; ++y) 2562 for (int y = 0; y < THIS->height; ++y)
2548 { 2563 {
2549 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2564 for (object *op = THIS->at (x, y).bot; op; op = op->above)
2550 if (op->flag [FLAG_IS_FLOOR]) 2565 if (op->flag [FLAG_IS_FLOOR])
2551 goto skip_space; 2566 goto skip;
2552 2567
2553 { 2568 {
2554 int offs = offset + y * stride + x; 2569 int offs = offset + y * stride + x;
2570
2555 if (IN_RANGE_EXC (offs, 0, idxlen)) 2571 if (IN_RANGE_EXC (offs, 0, idxlen))
2556 { 2572 {
2557 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2573 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2558 { 2574 {
2559 object *ob = get_archetype (SvPVutf8_nolen (*elem)); 2575 object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
2560 ob->flag [FLAG_NO_MAP_SAVE] = true; 2576 ob->flag [FLAG_NO_MAP_SAVE] = true;
2561 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2577 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2562 2578
2563 if (ob->randomitems) 2579 if (ob->randomitems && !ob->above)
2564 { 2580 {
2565 if (!ob->above)
2566 {
2567 ob->create_treasure (ob->randomitems); 2581 ob->create_treasure (ob->randomitems);
2568 2582
2569 for (object *op = ob->above; op; op = op->above) 2583 for (object *op = ob->above; op; op = op->above)
2570 op->flag [FLAG_NO_MAP_SAVE] = true; 2584 op->flag [FLAG_NO_MAP_SAVE] = true;
2571 } 2585 // TODO: if this is a pickable object, then the item
2572 2586 // will at a bit weird - saving inside the player
2573 ob->randomitems = 0; 2587 // will clear the flag, but when the player drops
2588 // it without logging out, it keeps the flag.
2589 // nobody ahs reported this, but this can be rather
2590 // annoying on persistent maps.
2574 } 2591 }
2575 } 2592 }
2576 } 2593 }
2577 } 2594 }
2578 2595
2579 skip_space: ; 2596 skip: ;
2580 } 2597 }
2581} 2598}
2582 2599
2583void 2600void
2584maptile::set_regiondata (SV *data, int offset, int stride, SV *palette) 2601maptile::set_regiondata (SV *data, int offset, int stride, SV *palette)
… …
2594 2611
2595 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2612 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2596 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2613 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2597 2614
2598 for (int i = av_len ((AV *)palette) + 1; i--; ) 2615 for (int i = av_len ((AV *)palette) + 1; i--; )
2599 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2616 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2600 2617
2601 for (int y = 0; y < THIS->height; ++y) 2618 for (int y = 0; y < THIS->height; ++y)
2602 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2619 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2603 2620
2604 sfree (THIS->regions, THIS->size ()); 2621 sfree (THIS->regions, THIS->size ());
… …
2829archetype *archetypes (U32 index) 2846archetype *archetypes (U32 index)
2830 CODE: 2847 CODE:
2831 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2848 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2832 OUTPUT: RETVAL 2849 OUTPUT: RETVAL
2833 2850
2834object *instantiate (archetype *arch)
2835 CODE:
2836 RETVAL = arch_to_object (arch);
2837 OUTPUT:
2838 RETVAL
2839
2840INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h | 2851INCLUDE: $PERL $srcdir/genacc archetype ../include/object.h |
2841 2852
2842MODULE = cf PACKAGE = cf::party 2853MODULE = cf PACKAGE = cf::party
2843 2854
2844partylist *first () 2855partylist *first ()
… …
3006 sv_to (data, d->data); 3017 sv_to (data, d->data);
3007 STRLEN clen; 3018 STRLEN clen;
3008 char *cdata = SvPVbyte (chksum, clen); 3019 char *cdata = SvPVbyte (chksum, clen);
3009 clen = min (CHKSUM_MAXLEN, clen); 3020 clen = min (CHKSUM_MAXLEN, clen);
3010 3021
3022 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
3023
3011 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen)) 3024 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
3012 { 3025 {
3013 d->chksum_len = clen; 3026 d->chksum_len = clen;
3014 memcpy (d->chksum, cdata, clen); 3027 memcpy (d->chksum, cdata, clen);
3015 3028
… …
3088 } 3101 }
3089 else 3102 else
3090 anim = &animation::create (name, av_len (av) + 1, facings); 3103 anim = &animation::create (name, av_len (av) + 1, facings);
3091 3104
3092 for (int i = 0; i < anim->num_animations; ++i) 3105 for (int i = 0; i < anim->num_animations; ++i)
3093 anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1))); 3106 anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
3094} 3107}
3095 OUTPUT: RETVAL 3108 OUTPUT: RETVAL
3096 3109
3097void invalidate_all () 3110void invalidate_all ()
3098 CODE: 3111 CODE:

Diff Legend

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