[ScryMUD] SVN Commit Info r973 - trunk/mud/grrmud/server

[svn-log at scrymud.net]

Author: eroper
Date: 2008-02-29 21:45:32 -0800 (Fri, 29 Feb 2008)
New Revision: 973

Modified:
   trunk/mud/grrmud/server/misc.cc
   trunk/mud/grrmud/server/script.cc
Log:
Changed a few instances where pointers were being cast to unsigned ints.


Modified: trunk/mud/grrmud/server/misc.cc
===================================================================
--- trunk/mud/grrmud/server/misc.cc	2008-02-29 16:46:17 UTC (rev 972)
+++ trunk/mud/grrmud/server/misc.cc	2008-03-01 05:45:32 UTC (rev 973)
@@ -1743,8 +1743,8 @@
       }
    }
    else {
-      Sprintf(buf, "Failed to remove object ptr: %i from it's list.",
-              (int)(&obj));
+      Sprintf(buf, "Failed to remove object ptr: %p from it's list.",
+              &obj);
       mudlog << "Failed to remove object ptr: " << &obj << " from it's list:"
              << obj.in_list << endl;
       core_dump(buf);

Modified: trunk/mud/grrmud/server/script.cc
===================================================================
--- trunk/mud/grrmud/server/script.cc	2008-02-29 16:46:17 UTC (rev 972)
+++ trunk/mud/grrmud/server/script.cc	2008-03-01 05:45:32 UTC (rev 973)
@@ -59,7 +59,7 @@
       if (mudlog.ofLevel(SCRIPT)) {
          mudlog << "In always_pay, invalid target ptr: critter: "
                 << *(pc.getName()) << " amount: " << amount << " target name: " 
-                << targ << " target pointer: " << (int)targptr << "\n";
+                << targ << " target pointer: " << targptr << "\n";
       }//if
       return -1;
     }
@@ -1305,28 +1305,28 @@
       
 
       if (strncmp("**%M", targ_str, 4) == 0) { //actor
-         sprintf(tmp_buf, "**M@%8X_%i ", (unsigned int)(&act), rm.getIdNum());
+         sprintf(tmp_buf, "**M@%p_%i ", &act, rm.getIdNum());
          targ_str = tmp_buf;
       }//if
       else if (strncmp("**%m", targ_str, 4) == 0) { //target
-         sprintf(tmp_buf, "**M@%8X_%i ", (unsigned int)(targ_crit),
+         sprintf(tmp_buf, "**M@%p_%i ", targ_crit,
                  rm.getIdNum());
          targ_str = tmp_buf;
       }//if
       else if (strncmp("**%S", targ_str, 4) == 0) { //script owner, default
          if (object_owner) {
             // For Object Scripts
-            sprintf(tmp_buf, "**O@%8X_%i ", (unsigned int)(object_owner),
+            sprintf(tmp_buf, "**O@%p_%i ", object_owner,
                     rm.getIdNum());
          }
          else {
-            sprintf(tmp_buf, "**M@%8X_%i ", (unsigned int)(script_owner),
+            sprintf(tmp_buf, "**M@%p_%i ", script_owner,
                     rm.getIdNum());
          }
          targ_str = tmp_buf;
       }//if
       else if (strncmp("**%o", targ_str, 4) == 0) { //target
-         sprintf(tmp_buf, "**O@%8X_%i ", (unsigned int)(targ_obj),
+         sprintf(tmp_buf, "**O@%p_%i ", targ_obj,
                  rm.getIdNum());
          targ_str = tmp_buf;
       }//if