Maybe now finally no more crashing in paths? Needs playtesting, I know we all

like that!

5 files changed, 20 insertions, 16 deletions

diff --git a/.cvsignore b/.cvsignore
index aebe5ffa..ce7d7c3b 100755
--- a/.cvsignore
+++ b/.cvsignore
@@ -15,3 +15,6 @@ configure
 libtool
 autom4te.cache
 tmw.log
+missing
+install-sh
+depcomp
diff --git a/ChangeLog b/ChangeLog
index 8e9781f4..c797f3e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 0.0.11  (.... 2005)
 - Added walking with mouse by clicking where you want to go
+- Chat now appears in a window
 - More complete support for new map format (collision, compression)
 - Fixed problem where players would often turn up with black hair
 - Fixed not showing other players dead when they die
-- Fixed a crash in being path handling
+- Fixed multiple crashes in being path handling
 - Fixed initial starting position for new player characters
 
 0.0.10  (5 March 2005)
diff --git a/autogen.sh b/autogen.sh
index 30c85fb6..8f047c99 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,9 +4,9 @@ echo "Generating build information using aclocal, autoheader, automake and autoc
 echo
 
 # Regerate configuration files
-aclocal-1.9
+aclocal
 autoheader
-automake-1.9 --gnu --add-missing --copy
+automake --gnu --add-missing --copy
 autoconf
 
 echo
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b59d450..63482415 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -116,6 +116,6 @@ INCLUDES= $(all_includes)
 
 # the library search path.
 tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) -lguichan_sdl -lguichan `pkg-config --libs libxml-2.0`
-tmw_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0`
+tmw_CXXFLAGS = -Wall $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` -fno-inline
 tmw_LDADD = $(LIBSDL_LIBS) -lguichan_opengl -lguichan -lGL -lphysfs
 tmw_TARGET = ../tmw
diff --git a/src/game.cpp b/src/game.cpp
index 9d55b3e4..c9d611bf 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -537,15 +537,17 @@ void do_parse() {
                     break;
                     // Add new being / stop monster
                 case 0x0078:
-                    if (find_node(RFIFOL(2)) == NULL) {
+                    being = find_node(RFIFOL(2));
+
+                    if (being == NULL) {
                         being = new Being();
                         being->id = RFIFOL(2);
                         being->speed = RFIFOW(6);
                         if (being->speed == 0) {
-                            being->speed = 150; // Else division by 0 when calculating frame
+                            // Else division by 0 when calculating frame
+                            being->speed = 150;
                         }
                         being->job = RFIFOW(14);
-                        being->clearPath();
                         being->x = get_x(RFIFOP(46));
                         being->y = get_y(RFIFOP(46));
                         being->direction = get_direction(RFIFOP(46));
@@ -554,15 +556,13 @@ void do_parse() {
                         add_node(being);
                     }
                     else {
-                        if (being) {
-                            being->clearPath();
-                            being->x = get_x(RFIFOP(46));
-                            being->y = get_y(RFIFOP(46));
-                            being->direction = get_direction(RFIFOP(46));
-                            being->frame = 0;
-                            being->walk_time = tick_time;
-                            being->action = STAND;
-                        }
+                        being->clearPath();
+                        being->x = get_x(RFIFOP(46));
+                        being->y = get_y(RFIFOP(46));
+                        being->direction = get_direction(RFIFOP(46));
+                        being->frame = 0;
+                        being->walk_time = tick_time;
+                        being->action = STAND;
                     }
                     break;