[adonthell-wastesedge-commits] Release_0-3-1 770b604 235/237: REMOVED ^M's from end of line

[Kai Sterker]

tag: Release_0-3-1
commit 770b604be0a29a734eccc88d897cda75ecc61d26
Author: adondev <adondev>
Commit: adondev <adondev>

    REMOVED ^M's from end of line
---
 scripts/dialogues/erek_start.py |   52 +++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index 7814cae..6af38cb 100755
--- a/scripts/dialogues/erek_start.py
+++ b/scripts/dialogues/erek_start.py
@@ -22,32 +22,32 @@ class erek_start:
        def clear (self):
                del self.dialogue
 
-       # Returns whom the Player told about his connection
-       # with Lady Silverhair
-       def get_right_npc (self):
-           if adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") & 
1 == 1:
-               return "Master Orloth"
-       
-           elif adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") 
& 2 == 2:
-               return "the mercenary"
-       
-           else:
-               return "Tristan the merchant"
-       
-       # -- 'teleport' to Bjarn's room
-       def __del__ (self):
-           if adonthell.gamedata_get_quest("demo").get_val ("bjarn_door_open") 
== 2:
-               erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
-               from events import switch_submap
-               erek.set_val ("goto", erek.submap ())
-               switch_submap (self.the_player, 7, 1, 6, 3)
-               switch_submap (erek, 7, 2, 7, 0)
-       
-           if adonthell.gamedata_get_quest("demo").get_val ("convince_jelom") 
== 2:
-               erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
-               erek.set_schedule_active (0)
-               from events import switch_submap
-               switch_submap (self.the_player, 9, 1, 3, 3)
+       # Returns whom the Player told about his connection
+       # with Lady Silverhair
+       def get_right_npc (self):
+           if adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") & 
1 == 1:
+               return "Master Orloth"
+       
+           elif adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") 
& 2 == 2:
+               return "the mercenary"
+       
+           else:
+               return "Tristan the merchant"
+       
+       # -- 'teleport' to Bjarn's room
+       def __del__ (self):
+           if adonthell.gamedata_get_quest("demo").get_val ("bjarn_door_open") 
== 2:
+               erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
+               from events import switch_submap
+               erek.set_val ("goto", erek.submap ())
+               switch_submap (self.the_player, 7, 1, 6, 3)
+               switch_submap (erek, 7, 2, 7, 0)
+       
+           if adonthell.gamedata_get_quest("demo").get_val ("convince_jelom") 
== 2:
+               erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
+               erek.set_schedule_active (0)
+               from events import switch_submap
+               switch_submap (self.the_player, 9, 1, 3, 3)
                switch_submap (erek, 9, 2, 4, 0)