Blame adonthell-0.3.5-fix-build-with-gcc-4.4.patch
|
 |
1a6973d |
Index: adonthell-0.3/src/dialog.cc
|
|
|
1a6973d |
===================================================================
|
|
|
1a6973d |
RCS file: /sources/adonthell/adonthell-0.3/src/dialog.cc,v
|
|
|
1a6973d |
retrieving revision 1.36
|
|
|
1a6973d |
retrieving revision 1.37
|
|
|
1a6973d |
diff -u -r1.36 -r1.37
|
|
|
1a6973d |
--- adonthell-0.3/src/dialog.cc 13 Oct 2007 19:47:25 -0000 1.36
|
|
|
1a6973d |
+++ adonthell-0.3/src/dialog.cc 1 Mar 2009 12:26:14 -0000 1.37
|
|
|
1a6973d |
@@ -1,5 +1,5 @@
|
|
|
1a6973d |
/*
|
|
|
1a6973d |
- $Id: dialog.cc,v 1.36 2007/10/13 19:47:25 ksterker Exp $
|
|
|
1a6973d |
+ $Id: dialog.cc,v 1.37 2009/03/01 12:26:14 ksterker Exp $
|
|
|
1a6973d |
|
|
|
1a6973d |
(C) Copyright 2000/2001/2002 Kai Sterker <kaisterker@linuxgames.com>
|
|
|
1a6973d |
Part of the Adonthell Project http://adonthell.linuxgames.com
|
|
|
1a6973d |
@@ -265,7 +265,8 @@
|
|
|
1a6973d |
{
|
|
|
1a6973d |
u_int32 begin, end, len;
|
|
|
1a6973d |
PyObject *result;
|
|
|
1a6973d |
- char *tmp, *start, *mid, *str = NULL;
|
|
|
1a6973d |
+ const char *start;
|
|
|
1a6973d |
+ char *tmp, *mid, *str = NULL;
|
|
|
1a6973d |
character *the_player = data::the_player;
|
|
|
1a6973d |
string newstr (s);
|
|
|
1a6973d |
|
|
|
1a6973d |
@@ -318,7 +319,7 @@
|
|
|
1a6973d |
|
|
|
1a6973d |
// Error!
|
|
|
1a6973d |
cout << "\n*** Error, unknown macro " << start << flush;
|
|
|
1a6973d |
- start[0] = ' ';
|
|
|
1a6973d |
+ newstr[newstr.length () - strlen (start)] = ' ';
|
|
|
1a6973d |
}
|
|
|
1a6973d |
|
|
|
1a6973d |
// execute python functions
|