[ViewVC] Diff of: cvs/deliantra/server/server/cfperl.xs

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.342 by root, Fri Dec 18 03:49:46 2009 UTC vs.
Revision 1.346 by root, Sat Jan 16 17:41:01 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2006,2007 by Marc Lehmann <cf@schmorp.de>
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
 #include <cstdarg>
 #include <typeinfo>
 #include "global.h"
-#include "loader.h"
 #include "../random_maps/random_map.h"
 #include "evthread.h"
 #include "sproto.h"
 #include <unistd.h>
    *cv_cf_client_send_msg,
    *cv_cf_tick,
    *cv_cf_match_match;
 #ifndef newSVpv_utf8
-static inline SV *
+static SV *
 newSVpv_utf8 (const char *s)
 {
   if (!s)
     return newSV (0);
   return sv;
 }
 #endif
 #ifndef newSVpvn_utf8
-static inline SV *
+static SV *
 newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
 {
   if (!s)
     return newSV (0);
     SvUTF8_on (sv);
   return sv;
 }
 #endif
+static noinline utf8_string
+cfSvPVutf8_nolen (SV *sv)
+{
+  SvGETMAGIC (sv);
+  if (SvPOK (sv))
+    {
+      if (!SvUTF8 (sv))
+        sv_utf8_upgrade_nomg (sv);
+      return SvPVX (sv);
+    }
+  return SvPV_nolen (sv);
+}
 // helper cast function, returns super class * or 0
 template<class super>
 static super *
 is_a (attachable *at)
   SV *sv = to_sv (static_cast<dynbuf *> (v));
   SvUTF8_on (sv);
   return sv;
 }
-static inline void sv_to (SV *sv, shstr              &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
+static inline void sv_to (SV *sv, shstr              &v) { v = SvOK (sv) ? cfSvPVutf8_nolen (sv) : 0; }
 static inline void sv_to (SV *sv, char *             &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
 static inline void sv_to (SV *sv, bool               &v) { v = SvIV (sv); }
 static inline void sv_to (SV *sv,   signed char      &v) { v = SvIV (sv); }
 static inline void sv_to (SV *sv, unsigned char      &v) { v = SvIV (sv); }
 static inline void sv_to (SV *sv,   signed short     &v) { v = SvIV (sv); }
   CALL_CALL ("ext::books::make_book", G_VOID);
   CALL_END;
 }
 void
-cfperl_send_msg (client *ns, int color, const char *type, const char *msg)
+cfperl_send_msg (client *ns, int color, const_utf8_string type, const_utf8_string msg)
 {
   CALL_BEGIN (4);
   CALL_ARG (ns);
   CALL_ARG (type);
   CALL_ARG_SV (newSVpv_utf8 (msg));
   CALL_CALL ("cf::mapscript::activate", G_VOID);
   CALL_END;
 }
 player *
-player::find (const char *name)
+player::find (const_utf8_string name)
 {
   CALL_BEGIN (1);
   CALL_ARG (name);
   CALL_CALL ("cf::player::find", G_SCALAR);
   return retval;
 }
 maptile *
-find_style (const char *dirname, const char *stylename, int difficulty)
+find_style (const_utf8_string dirname, const_utf8_string stylename, int difficulty)
 {
   CALL_BEGIN (3);
   CALL_ARG (dirname);
   CALL_ARG (stylename);
   CALL_ARG (difficulty);
   return retval;
 }
 maptile *
-maptile::find_sync (const char *path, maptile *origin)
+maptile::find_sync (const_utf8_string path, maptile *origin)
 {
   CALL_BEGIN (2);
   CALL_ARG (path);
   CALL_ARG (origin);
   CALL_CALL ("cf::map::find_sync", G_SCALAR);
   return retval;
 }
 maptile *
-maptile::find_async (const char *path, maptile *origin, bool load)
+maptile::find_async (const_utf8_string path, maptile *origin, bool load)
 {
   CALL_BEGIN (3);
   CALL_ARG (path);
   CALL_ARG (origin);
   CALL_ARG (load);
   CALL_CALL ("cf::object::player::enter_exit", G_VOID);
   CALL_END;
 }
 void
-object::player_goto (const char *path, int x, int y)
+object::player_goto (const_utf8_string path, int x, int y)
 {
   if (type != PLAYER)
     return;
   CALL_BEGIN (4);
   CALL_ARG (y);
   CALL_CALL ("cf::object::player::goto", G_VOID);
   CALL_END;
 }
-const char *
+const_utf8_string
 object::ref () const
 {
   if (type == PLAYER)
     return format ("player/<1.%llx>/%s", (unsigned long long)uuid.seq, &name);
   else
     return 0;
 }
 object *
-object::deref (const char *ref)
+object::deref (const_utf8_string ref)
 {
   object *retval = 0;
   if (ref)
     {
   return retval;
 }
 void
-log_backtrace (const char *msg)
+log_backtrace (const_utf8_string msg)
 {
 #if HAVE_BACKTRACE
   void *addr [20];
   int size = backtrace (addr, 20);
   CALL_END;
 #endif
 }
 bool
-is_match_expr (const char *expr)
+is_match_expr (const_utf8_string expr)
 {
   return !strncmp (expr, "match ", sizeof ("match ") - 1);
 }
 bool
-match (const char *expr, object *ob, object *self, object *source, object *originator)
+match (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
 {
   if (!strncmp (expr, "match ", sizeof ("match ") - 1))
     expr += sizeof ("match ") - 1;
   CALL_BEGIN (5);
   return matched;
 }
 object *
-match_one (const char *expr, object *ob, object *self, object *source, object *originator)
+match_one (const_utf8_string expr, object *ob, object *self, object *source, object *originator)
 {
   if (!strncmp (expr, "match ", sizeof ("match ") - 1))
     expr += sizeof ("match ") - 1;
   CALL_BEGIN (5);
 int mortals_size ()
 	CODE:
         RETVAL = attachable::mortals.size ();
 	OUTPUT: RETVAL
-const char *slot_use_name (U32 slot)
+const_utf8_string slot_use_name (U32 slot)
 	ALIAS:
         slot_nonuse_name = 1
         CODE:
 {
         if (slot >= NUM_BODY_LOCATIONS)
                 if (IN_RANGE_EXC (offs, 0, idxlen))
                   {
                     if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
                       {
-                        object *ob = get_archetype (SvPVutf8_nolen (*elem));
+                        object *ob = get_archetype (cfSvPVutf8_nolen (*elem));
                         ob->flag [FLAG_NO_MAP_SAVE] = true;
                         THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
                         if (ob->randomitems && !ob->above)
                           {
         region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
         uint8_t *regions = salloc<uint8_t> (THIS->size ());
         for (int i = av_len ((AV *)palette) + 1; i--; )
-          regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
+          regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
         for (int y = 0; y < THIS->height; ++y)
           memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
         sfree (THIS->regions, THIS->size ());
         sv_to (data, d->data);
         STRLEN clen;
         char *cdata = SvPVbyte (chksum, clen);
         clen = min (CHKSUM_MAXLEN, clen);
+        assert (("cf::face::set_data must be called with a non-empty checksum", clen));
         if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
           {
             d->chksum_len = clen;
             memcpy (d->chksum, cdata, clen);
           }
         else
           anim = &animation::create (name, av_len (av) + 1, facings);
         for (int i = 0; i < anim->num_animations; ++i)
-          anim->faces [i] = face_find (SvPVutf8_nolen (*av_fetch (av, i, 1)));
+          anim->faces [i] = face_find (cfSvPVutf8_nolen (*av_fetch (av, i, 1)));
 }
 	OUTPUT: RETVAL
 void invalidate_all ()
 	CODE:

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.342 by root, Fri Dec 18 03:49:46 2009 UTC vs. Revision 1.346 by root, Sat Jan 16 17:41:01 2010 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.342 by root, Fri Dec 18 03:49:46 2009 UTC vs.
Revision 1.346 by root, Sat Jan 16 17:41:01 2010 UTC