diff -C 3 -r1.36 -r1.37

*** src/dialog.cc	13 Oct 2007 19:47:25 -0000	1.36

--- src/dialog.cc	1 Mar 2009 12:26:14 -0000	1.37

***************

*** 265,271 ****

  {

      u_int32 begin, end, len;

      PyObject *result;

!     char *tmp, *start, *mid, *str = NULL;

      character *the_player = data::the_player;

      string newstr (s); 

--- 265,272 ----

  {

      u_int32 begin, end, len;

      PyObject *result;

!     const char *start;

!     char *tmp, *mid, *str = NULL;

      character *the_player = data::the_player;

      string newstr (s); 

***************

*** 318,324 ****

          // Error!

          cout << "\n*** Error, unknown macro " << start << flush;

!         start[0] = ' ';

      }

      // execute python functions

--- 319,325 ----

          // Error!

          cout << "\n*** Error, unknown macro " << start << flush;

!         newstr[newstr.length () - strlen (start)] = ' ';

      }

      // execute python functions