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

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.68 by root, Sun May 27 23:22:29 2007 UTC vs.
Revision 1.77 by root, Tue Jun 5 13:05:02 2007 UTC

+/*
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ *
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ *
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ */
 //
 // cfperl.h perl interface
 //
 #ifndef CFPERL_H__
 #define CFPERL_H__
   MTH void refcnt_inc () const { ++refcnt; }
   MTH void refcnt_dec () const { --refcnt; }
   MTH int refcnt_cnt () const;
   // check wether the object has died and destroy
-  MTH void refcnt_chk () { if (refcnt <= 0) do_check (); }
+  MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
   // destroy the object unless it was already destroyed
   // this politely asks everybody interested the reduce
   // the refcount to 0 as soon as possible.
   MTH void destroy ();
       add (' '), add (v);
     add ('\n');
   }
-  //TODO//temporary, used only for saving body locations
-  void put (const char *k, int v)
-  {
-    add (k);
-    add (' ');
-    add (sint32 (v));
-    add ('\n');
-  }
   template<typename T>
   void put_string (keyword k, const T &v)
   {
     int klen = keyword_len [k];
     int vlen = v ? strlen (v) + 1 : 0;
     put_string (k, v);
   }
   void put (keyword k, double v)
   {
-    force (32);
+    force (MAX_KEYWORD_LEN + 2 + 32);
+    fadd (keyword_str [k], keyword_len [k]);
+    fadd (' ');
-    ptr += sprintf (ptr, "%.7g", v);
+    falloc (sprintf (ptr, "%.7g", v));
+    fadd ('\n');
   }
   void put_(keyword k, sint64 v)
   {
+    force (MAX_KEYWORD_LEN + 2 + sint64_digits);
-    add (keyword_str [k], keyword_len [k]);
+    fadd (keyword_str [k], keyword_len [k]);
-    add (' ');
+    fadd (' ');
     add (v);
-    add ('\n');
+    fadd ('\n');
   }
   void put_(keyword k, sint32 v)
   {
+    force (MAX_KEYWORD_LEN + 2 + sint32_digits);
-    add (keyword_str [k], keyword_len [k]);
+    fadd (keyword_str [k], keyword_len [k]);
-    add (' ');
+    fadd (' ');
     add (v);
-    add ('\n');
+    fadd ('\n');
-  }
-  void put (keyword kbeg, keyword kend, const shstr &v)
-  {
-    add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
-    if (expect_true (v))
-      {
-        add (v);
-        add ('\n');
-      }
-    add (keyword_str [kend], keyword_len [kend]); add ('\n');
   }
   void put (keyword k,          float     v) { put (k, (double)v); }
   void put (keyword k,   signed char      v) { put_(k, (sint32)v); }
   void put (keyword k, unsigned char      v) { put_(k, (sint32)v); }
   void put (keyword k,   signed long      v) { put_(k, (sint64)v); }
   void put (keyword k, unsigned long      v) { put_(k, (sint64)v); }
   void put (keyword k,   signed long long v) { put_(k, (sint64)v); }
   void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
+  void put (keyword kbeg, keyword kend, const shstr &v)
+  {
+    force (MAX_KEYWORD_LEN + 1);
+    fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n');
+    if (expect_true (v))
+      {
+        add (v);
+        add ('\n');
+      }
+    force (MAX_KEYWORD_LEN + 1);
+    fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n');
+  }
   template<typename T>
   void put (keyword k, const T *v)
   {
-    if (expect_true (v))
-      put (k, v->name);
-    else
-      put (k, (const char *)0);
+    put (k, v ? &v->name : (const char *)0);
   }
   template<typename T>
   void put (keyword k, const refptr<T> &v)
   {
   void get (attachable *obj, int oid);
   // parse next line
   void next ();
   // skip the current key-value (usually fetch next line, for
-  // multiline-fields, skips untilt he corresponding end-kw
+  // multiline-fields, skips till the corresponding end-kw
   void skip ();
-  //TODO: remove, deprecated
-  keyword get_kv ()
-  {
-    next ();
-    return kw;
-  }
   char *get_str () { return value; } // may be 0
   void get_ml (keyword kend, shstr &sh);
   void get_ornull (shstr &sh) const { sh = value; }
   void get (shstr &sh)        const { sh = value; } // might want to check for non-null here
   bool   get_bool   () const { return *value_nn == '1'; }
   sint32 get_sint32 () const;
-  sint64 get_sint64 () const { return atoll (value_nn); }
+  sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); }
-  double get_double () const { return atof  (value_nn); }
+  double get_double () const { return strtod  (value_nn, 0); }
   void get (float  &v) { v = get_double (); }
   void get (double &v) { v = get_double (); }
   void get (bool   &i) { i = get_bool   (); }
   {
     if (expect_false (++cede_counter >= count))
       do_cede_every ();
   }
-  static void cede_to_tick ()
+  static bool cede_to_tick ()
   {
-    if (expect_false (time () >= next_cede))
+    if (expect_true (time () < next_cede))
+      return false;
-      do_cede_to_tick ();
+    do_cede_to_tick ();
+    return true;
   }
-  static void cede_to_tick_every (int count)
+  static bool cede_to_tick_every (int count)
   {
-    if (expect_false (++cede_counter >= count))
+    if (expect_true (++cede_counter < count))
+      return false;
-      cede_to_tick ();
+    return cede_to_tick ();
   }
   static void wait_for_tick ();
   static void wait_for_tick_begin ();
 };

Diff Legend

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

Comparing deliantra/server/include/cfperl.h (file contents): Revision 1.68 by root, Sun May 27 23:22:29 2007 UTC vs. Revision 1.77 by root, Tue Jun 5 13:05:02 2007 UTC

Diff Legend

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.68 by root, Sun May 27 23:22:29 2007 UTC vs.
Revision 1.77 by root, Tue Jun 5 13:05:02 2007 UTC