[adonthell-wastesedge-commits] Release_0-3-1 4bcc0dd 066/237: FIXED bugs in automake, silverhair's room connection script and

[Kai Sterker]

tag: Release_0-3-1
commit 4bcc0ddc2bbc6c5ba174d1546886c9dca524186a
Author: adondev <adondev>
Commit: adondev <adondev>

    FIXED bugs in automake, silverhair's room connection script and
    main_menu text scrolling.
---
 configure.in                        |    1 +
 gfx/mapobjects/Makefile.am          |    2 +-
 gfx/portraits/.cvsignore            |    2 ++
 scripts/events/1st_to_silverhair.py |    2 +-
 scripts/modules/main_menu.py        |    4 ++--
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 87f8e38..2968007 100755
--- a/configure.in
+++ b/configure.in
@@ -43,6 +43,7 @@ gfx/mapobjects/walls/inside/Makefile
 gfx/mapobjects/walls/stone/Makefile
 gfx/mapobjects/walls/Makefile
 gfx/mapobjects/Makefile
+gfx/portraits/Makefile
 gfx/window/background/original/Makefile
 gfx/window/background/silverleaf/Makefile
 gfx/window/background/Makefile
diff --git a/gfx/mapobjects/Makefile.am b/gfx/mapobjects/Makefile.am
index c754e2d..5c5de32 100755
--- a/gfx/mapobjects/Makefile.am
+++ b/gfx/mapobjects/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = exteriors floorings furnitures houses icons terrains walls
+SUBDIRS = exteriors floorings furnitures houses icons terrains walls stairs
 
 pkgdatadir = $(gamedatadir)/gfx/mapobjects
 
diff --git a/gfx/portraits/.cvsignore b/gfx/portraits/.cvsignore
new file mode 100644
index 0000000..3dda729
--- /dev/null
+++ b/gfx/portraits/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/scripts/events/1st_to_silverhair.py 
b/scripts/events/1st_to_silverhair.py
index d5c86b1..d57200d 100755
--- a/scripts/events/1st_to_silverhair.py
+++ b/scripts/events/1st_to_silverhair.py
@@ -8,9 +8,9 @@ if p.submap () == 9:
     if not free and p == the_player:
         # -- we only need that for the dialogue, ...
         p.set_val ("at_silverhairs_door", 1)
-        characters["Jelom Rasgar"].launch_action (p)
         p.stand ()
         p.go_north ()
+        characters["Jelom Rasgar"].launch_action (p)
         # -- ... so remove it again afterwards
         p.set_val ("at_silverhairs_door", 0)
     else:
diff --git a/scripts/modules/main_menu.py b/scripts/modules/main_menu.py
index cf70f18..c58eef2 100755
--- a/scripts/modules/main_menu.py
+++ b/scripts/modules/main_menu.py
@@ -126,10 +126,10 @@ class main_menu (win_container):
 
             gametime_start_action ()
             while done != 0:
-                for k in range (gametime_frames_to_do()+1):
+                for k in range (gametime_frames_to_do()):
                     win_manager_update ()
                     self.update ()
-                done = self.create_menu (moves, goals)
+                    done = self.create_menu (moves, goals)
                 win_manager_draw ()
                 self.draw ()
                 screen_show ()