[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth data/scenarios/multiplayer/scenarios.cf...
|
From: |
Isaac Clerencia |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth data/scenarios/multiplayer/scenarios.cf... |
|
Date: |
Thu, 02 Jun 2005 16:50:27 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Isaac Clerencia <address@hidden> 05/06/02 20:50:27
Modified files:
data/scenarios/multiplayer: scenarios.cfg
po/wesnoth : sr.po
po/wesnoth-tdh : fr.po
src : actions.cpp ai.cpp help.cpp map_label.cpp
multiplayer_connect.cpp playcampaign.cpp
src/widgets : textbox.cpp
Log message:
dos2unix
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/multiplayer/scenarios.cfg.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/sr.po.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-tdh/fr.po.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.224&tr2=1.225&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai.cpp.diff?tr1=1.152&tr2=1.153&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/help.cpp.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/map_label.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.145&tr2=1.146&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playcampaign.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/textbox.cpp.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
Patches:
Index: wesnoth/data/scenarios/multiplayer/scenarios.cfg
diff -u wesnoth/data/scenarios/multiplayer/scenarios.cfg:1.9
wesnoth/data/scenarios/multiplayer/scenarios.cfg:1.10
--- wesnoth/data/scenarios/multiplayer/scenarios.cfg:1.9 Thu Jun 2
19:39:08 2005
+++ wesnoth/data/scenarios/multiplayer/scenarios.cfg Thu Jun 2 20:50:25 2005
@@ -1,603 +1,603 @@
-[multiplayer]
- id=multiplayer_test
- name= _ "Across The River"
- description= _ "This map is a convenient way to do some testing with two
factions, as it is pretty well balanced towards both sides.
-You can use it AI vs AI to see how well a faction fares against another."
- map_data="ffffffffffffffgggggggggggggggggggggggg
-ffffffffffffffffgggggggggggggggCgggtgg
-ffffffffffffffffggggggggggggggC1Cggggg
-fftfffffffffffffffggggtgggggggCCCggggg
-ffffffffffffffffffgggggggggggggggggggg
-fffffffffffffffffggggggggggggggggggggg
-ffffffffffffffffffgggggggggggggggggggg
-fffffgfgfffffftfffffgggggggggggggggRgg
-fffffgggggffffffffffffffgggggggggggggg
-fffgggggggfffffffffffffffgggggggtggggg
-ggggtggggggfffffffffffffffgggggggggggg
-ggggggggggggffffffffffffffgggggggggggm
-gggggggggggggffffffffffcccccggggggggmm
-mmgggggggtggggggfccccccccccccggggggmrm
-mmmmmmgggggggggccccccccggggcccgggmmmrm
-mmmmmmmggggggccccgggggggggggcccgmmmrrm
-mmmmmmmmgggccccgggggggggtggggccgmmrmmm
-mmmmmmmcgcccccgggggggggggggggcccccCcmm
-mmmmmccccccgccccgggggggggggccccccccccc
-ccmccccmcgggggccccggvggggccccggmmmcmcc
-cccccmCmmgggggggccgggggccccfgggmmmmmmm
-mmcmmrrmmgggggggccccgggccfffggggmmmmmm
-mmmrrmmmgggggggggfcccccccffgggggggmmmm
-mmmrmmmggggggggfffffcccffffgvgggggmmmm
-mmmrmgggggggggfffffffffffffgggggggggmg
-mmmgggggggvggfffffffffffffffgggggggggg
-gggggggRgggggfffffffffffffffgggggggggg
-gggggggggggggfffffffvffffffgggggvggfgf
-gggggggggggggffffffffffffffggggggfffff
-ggggggggggggggffffffffffffffgfgfffffff
-gggCggggggggggffffffffffffffffffffffff
-ggC2Cgggggggggggffffffffffffffffffffff
-ggCCCggggggggggggfffffffffffffffffffff
-gvgggggggggggvgggfffffffffffffffffffff
-ggggggggggggggggggffffffffvfffffffffff
-ggggggggggggggggggggffffffffffffffffff
-"
-
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2
- canrecruit=1
- controller=human
- [/side]
- [side]
- side=2
- enemy=1
- canrecruit=1
- controller=human
- [/side]
-
- [event]
- name=moveto
- [filter]
- x=35
- y=18
- side=1
- [/filter]
- [command]
- [teleport]
- [filter]
- x=35
- y=18
- side=1
- [/filter]
- x=8
- y=27
- [/teleport]
- [/command]
- [/event]
-
- [event]
- name=moveto
- [filter]
- x=7
- y=21
- side=2
- [/filter]
- [command]
- [teleport]
- [filter]
- x=7
- y=21
- side=2
- [/filter]
- x=36
- y=8
- [/teleport]
- [/command]
- [/event]
-
-[/multiplayer]
-
-[multiplayer]
- id=multiplayer3
- name= _ "The Valley of Death"
- description= _ " "
- map_data="{maps/Heir_To_The_Throne/Valley_of_Death}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2,3,4
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1,3,4
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=3
- enemy=1,2,4
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=4
- enemy=1,2,3
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-
-
-[multiplayer]
- id=multiplayer_kingofthehill
- name= _ "King of the Hill"
- map_data="{maps/multiplayer/King_of_the_Hill}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2,3,4,
- canrecruit=1
- controller=human
- [/side]
- [side]
- side=2
- enemy=1,3,4,
- canrecruit=1
- controller=human
- [/side]
- [side]
- side=3
- enemy=1,2,4,
- canrecruit=1
- controller=human
- [/side]
- [side]
- side=4
- enemy=1,2,3,
- canrecruit=1
- controller=human
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayerDivideandConquer
- name= _ "2p - Divide and Conquer"
- description= _ "This small duel map divides the field of battle into
three segments. Recommended settings of 2G per village."
-
- map_data="{maps/multiplayer/2p_Divide_and_Conquer}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayerSilverheadCrossing
- name= _ "2p - Silverhead Crossing"
- description= _ "Players must traverse all manner of terrain in pursuit
of victory on this multi-fronted duel map. Recommended settings of 2G per
village."
- map_data="{maps/multiplayer/2p_Silverhead_Crossing}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayerMeteorLake
- name= _ "2p - Meteor Lake"
- description= _ "Long ago, a great meteor fell from the heavens, leaving
its mark on this coniferous region. Recommended settings of 2G per village."
- map_data="{maps/multiplayer/2p_Meteor_Lake}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayerDenofOnis
- name= _ "2p - Den of Onis"
- description= _ "Danger lurks around every corner in this underground
battlefield, a duel map where force and subterfuge meet. Recommended settings
of 2G per village."
- map_data="{maps/multiplayer/2p_Den_of_Onis}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayerHamlets
- name= _ "2p - Hamlets"
- description= _ "Warfare transforms the simple farms and villages of a
peaceful region into a subtly parceled battlefield. Recommended settings of 2G
per village."
- map_data="{maps/multiplayer/2p_Hamlets}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayerHornsharkIsland
- name= _ "2p - Hornshark Island"
- description= _ "Players must navigate the dispersive terrain of this
small but topographically dense island. Recommended settings of 2G per village."
- map_data="{maps/multiplayer/2p_Hornshark_Island}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayerSullasRuins
- name= _ "2p - Sullas Ruins"
- description= _ "Flooded by the seas and battered by the winter
elements, only ruins, water and ice now remain in the shadow of this once
mighty empire. Recommended settings of 2G per village."
- map_data="{maps/multiplayer/2p_Sullas_Ruins}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayer1v1v1Hex
- name= _ "3p - 1v1v1Hex"
- description= _ "Three players do battle in this small, enclosed region.
Recommended settings of 2G per village."
- map_data="{maps/multiplayer/3p_1v1v1Hex}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2,3
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1,3
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=3
- enemy=1,2
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayerLagoon
- name= _ "4p - Lagoon"
- description= _ "Four factions contend for dominance over this watery
settlement. Recommended settings of 1G per village."
- map_data="{maps/multiplayer/4p_Lagoon}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2,3,4
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1,3,4
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=3
- enemy=1,2,4
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=4
- enemy=1,2,3
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayerTheWilderlands
- name= _ "4p - The Wilderlands"
- description= _ "A vast region of wild, untamed wilderness, its terrain
dotted with forests, caves, rivers, and the ruins of ancient fortresses.
Recommended settings of 1G per village."
- map_data="{maps/multiplayer/4p_The_Wilderlands}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2,3,4
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1,3,4
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=3
- enemy=1,2,4
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=4
- enemy=1,2,3
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayer3pMorituri
- name= _ "3p - Morituri"
- description= _ "Only one faction will emerge victorious from this
tightly bordered three-player map. Recommended settings of 2G per village."
- map_data="{maps/multiplayer/3p_Morituri}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2,3
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1,3
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=3
- enemy=1,2
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-[multiplayer]
- id=multiplayer3pTripleBlitz
- name= _ "3p - Triple Blitz"
- description= _ "Three players come head to head on this water-cut
battlefield. Recommended settings of 2G per village."
- map_data="{maps/multiplayer/3p_Triple_Blitz}"
- turns=90
-
- {DAWN}
- {MORNING}
- {AFTERNOON}
- {DUSK}
- {FIRST_WATCH}
- {SECOND_WATCH}
-
- [side]
- side=1
- enemy=2,3
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=2
- enemy=1,3
- canrecruit=1
- controller=human
- gold=100
- [/side]
- [side]
- side=3
- enemy=1,2
- canrecruit=1
- controller=human
- gold=100
- [/side]
-[/multiplayer]
-
-
+[multiplayer]
+ id=multiplayer_test
+ name= _ "Across The River"
+ description= _ "This map is a convenient way to do some testing with two
factions, as it is pretty well balanced towards both sides.
+You can use it AI vs AI to see how well a faction fares against another."
+ map_data="ffffffffffffffgggggggggggggggggggggggg
+ffffffffffffffffgggggggggggggggCgggtgg
+ffffffffffffffffggggggggggggggC1Cggggg
+fftfffffffffffffffggggtgggggggCCCggggg
+ffffffffffffffffffgggggggggggggggggggg
+fffffffffffffffffggggggggggggggggggggg
+ffffffffffffffffffgggggggggggggggggggg
+fffffgfgfffffftfffffgggggggggggggggRgg
+fffffgggggffffffffffffffgggggggggggggg
+fffgggggggfffffffffffffffgggggggtggggg
+ggggtggggggfffffffffffffffgggggggggggg
+ggggggggggggffffffffffffffgggggggggggm
+gggggggggggggffffffffffcccccggggggggmm
+mmgggggggtggggggfccccccccccccggggggmrm
+mmmmmmgggggggggccccccccggggcccgggmmmrm
+mmmmmmmggggggccccgggggggggggcccgmmmrrm
+mmmmmmmmgggccccgggggggggtggggccgmmrmmm
+mmmmmmmcgcccccgggggggggggggggcccccCcmm
+mmmmmccccccgccccgggggggggggccccccccccc
+ccmccccmcgggggccccggvggggccccggmmmcmcc
+cccccmCmmgggggggccgggggccccfgggmmmmmmm
+mmcmmrrmmgggggggccccgggccfffggggmmmmmm
+mmmrrmmmgggggggggfcccccccffgggggggmmmm
+mmmrmmmggggggggfffffcccffffgvgggggmmmm
+mmmrmgggggggggfffffffffffffgggggggggmg
+mmmgggggggvggfffffffffffffffgggggggggg
+gggggggRgggggfffffffffffffffgggggggggg
+gggggggggggggfffffffvffffffgggggvggfgf
+gggggggggggggffffffffffffffggggggfffff
+ggggggggggggggffffffffffffffgfgfffffff
+gggCggggggggggffffffffffffffffffffffff
+ggC2Cgggggggggggffffffffffffffffffffff
+ggCCCggggggggggggfffffffffffffffffffff
+gvgggggggggggvgggfffffffffffffffffffff
+ggggggggggggggggggffffffffvfffffffffff
+ggggggggggggggggggggffffffffffffffffff
+"
+
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2
+ canrecruit=1
+ controller=human
+ [/side]
+ [side]
+ side=2
+ enemy=1
+ canrecruit=1
+ controller=human
+ [/side]
+
+ [event]
+ name=moveto
+ [filter]
+ x=35
+ y=18
+ side=1
+ [/filter]
+ [command]
+ [teleport]
+ [filter]
+ x=35
+ y=18
+ side=1
+ [/filter]
+ x=8
+ y=27
+ [/teleport]
+ [/command]
+ [/event]
+
+ [event]
+ name=moveto
+ [filter]
+ x=7
+ y=21
+ side=2
+ [/filter]
+ [command]
+ [teleport]
+ [filter]
+ x=7
+ y=21
+ side=2
+ [/filter]
+ x=36
+ y=8
+ [/teleport]
+ [/command]
+ [/event]
+
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayer3
+ name= _ "The Valley of Death"
+ description= _ " "
+ map_data="{maps/Heir_To_The_Throne/Valley_of_Death}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2,3,4
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1,3,4
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=3
+ enemy=1,2,4
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=4
+ enemy=1,2,3
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+
+
+[multiplayer]
+ id=multiplayer_kingofthehill
+ name= _ "King of the Hill"
+ map_data="{maps/multiplayer/King_of_the_Hill}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2,3,4,
+ canrecruit=1
+ controller=human
+ [/side]
+ [side]
+ side=2
+ enemy=1,3,4,
+ canrecruit=1
+ controller=human
+ [/side]
+ [side]
+ side=3
+ enemy=1,2,4,
+ canrecruit=1
+ controller=human
+ [/side]
+ [side]
+ side=4
+ enemy=1,2,3,
+ canrecruit=1
+ controller=human
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayerDivideandConquer
+ name= _ "2p - Divide and Conquer"
+ description= _ "This small duel map divides the field of battle into
three segments. Recommended settings of 2G per village."
+
+ map_data="{maps/multiplayer/2p_Divide_and_Conquer}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayerSilverheadCrossing
+ name= _ "2p - Silverhead Crossing"
+ description= _ "Players must traverse all manner of terrain in pursuit
of victory on this multi-fronted duel map. Recommended settings of 2G per
village."
+ map_data="{maps/multiplayer/2p_Silverhead_Crossing}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayerMeteorLake
+ name= _ "2p - Meteor Lake"
+ description= _ "Long ago, a great meteor fell from the heavens, leaving
its mark on this coniferous region. Recommended settings of 2G per village."
+ map_data="{maps/multiplayer/2p_Meteor_Lake}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayerDenofOnis
+ name= _ "2p - Den of Onis"
+ description= _ "Danger lurks around every corner in this underground
battlefield, a duel map where force and subterfuge meet. Recommended settings
of 2G per village."
+ map_data="{maps/multiplayer/2p_Den_of_Onis}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayerHamlets
+ name= _ "2p - Hamlets"
+ description= _ "Warfare transforms the simple farms and villages of a
peaceful region into a subtly parceled battlefield. Recommended settings of 2G
per village."
+ map_data="{maps/multiplayer/2p_Hamlets}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayerHornsharkIsland
+ name= _ "2p - Hornshark Island"
+ description= _ "Players must navigate the dispersive terrain of this
small but topographically dense island. Recommended settings of 2G per village."
+ map_data="{maps/multiplayer/2p_Hornshark_Island}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayerSullasRuins
+ name= _ "2p - Sullas Ruins"
+ description= _ "Flooded by the seas and battered by the winter
elements, only ruins, water and ice now remain in the shadow of this once
mighty empire. Recommended settings of 2G per village."
+ map_data="{maps/multiplayer/2p_Sullas_Ruins}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayer1v1v1Hex
+ name= _ "3p - 1v1v1Hex"
+ description= _ "Three players do battle in this small, enclosed region.
Recommended settings of 2G per village."
+ map_data="{maps/multiplayer/3p_1v1v1Hex}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2,3
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1,3
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=3
+ enemy=1,2
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayerLagoon
+ name= _ "4p - Lagoon"
+ description= _ "Four factions contend for dominance over this watery
settlement. Recommended settings of 1G per village."
+ map_data="{maps/multiplayer/4p_Lagoon}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2,3,4
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1,3,4
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=3
+ enemy=1,2,4
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=4
+ enemy=1,2,3
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayerTheWilderlands
+ name= _ "4p - The Wilderlands"
+ description= _ "A vast region of wild, untamed wilderness, its terrain
dotted with forests, caves, rivers, and the ruins of ancient fortresses.
Recommended settings of 1G per village."
+ map_data="{maps/multiplayer/4p_The_Wilderlands}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2,3,4
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1,3,4
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=3
+ enemy=1,2,4
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=4
+ enemy=1,2,3
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayer3pMorituri
+ name= _ "3p - Morituri"
+ description= _ "Only one faction will emerge victorious from this
tightly bordered three-player map. Recommended settings of 2G per village."
+ map_data="{maps/multiplayer/3p_Morituri}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2,3
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1,3
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=3
+ enemy=1,2
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+[multiplayer]
+ id=multiplayer3pTripleBlitz
+ name= _ "3p - Triple Blitz"
+ description= _ "Three players come head to head on this water-cut
battlefield. Recommended settings of 2G per village."
+ map_data="{maps/multiplayer/3p_Triple_Blitz}"
+ turns=90
+
+ {DAWN}
+ {MORNING}
+ {AFTERNOON}
+ {DUSK}
+ {FIRST_WATCH}
+ {SECOND_WATCH}
+
+ [side]
+ side=1
+ enemy=2,3
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=2
+ enemy=1,3
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+ [side]
+ side=3
+ enemy=1,2
+ canrecruit=1
+ controller=human
+ gold=100
+ [/side]
+[/multiplayer]
+
+
Index: wesnoth/po/wesnoth-tdh/fr.po
diff -u wesnoth/po/wesnoth-tdh/fr.po:1.32 wesnoth/po/wesnoth-tdh/fr.po:1.33
--- wesnoth/po/wesnoth-tdh/fr.po:1.32 Sun May 29 18:46:29 2005
+++ wesnoth/po/wesnoth-tdh/fr.po Thu Jun 2 20:50:26 2005
@@ -1,13 +1,13 @@
-# #-#-#-#-# wesnoth-tdh.po (wesnoth-tdh) #-#-#-#-#
-# translation of wesnoth-tdh.po to French
-# Language french translations for Battle for Wesnoth package
-# vim:set encoding=utf-8:
-# Traduction anglaise du package Battle for Wesnoth.
-# Copyright (C) 2004 THE Battle for Wesnoth'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the Battle for Wesnoth
package.
-# French Wesnoth translation team <address@hidden>, 2004.
-# Yann Dirson <address@hidden>, 2004.
-#
+# #-#-#-#-# wesnoth-tdh.po (wesnoth-tdh) #-#-#-#-#
+# translation of wesnoth-tdh.po to French
+# Language french translations for Battle for Wesnoth package
+# vim:set encoding=utf-8:
+# Traduction anglaise du package Battle for Wesnoth.
+# Copyright (C) 2004 THE Battle for Wesnoth'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Battle for Wesnoth
package.
+# French Wesnoth translation team <address@hidden>, 2004.
+# Yann Dirson <address@hidden>, 2004.
+#
msgid ""
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.7.11-CVS\n"
Index: wesnoth/po/wesnoth/sr.po
diff -u wesnoth/po/wesnoth/sr.po:1.5 wesnoth/po/wesnoth/sr.po:1.6
--- wesnoth/po/wesnoth/sr.po:1.5 Tue May 31 20:29:51 2005
+++ wesnoth/po/wesnoth/sr.po Thu Jun 2 20:50:25 2005
@@ -1,9 +1,9 @@
-# #-#-#-#-# wesnoth.cpp1.po (Battle for Wesnoth VERSION) #-#-#-#-#
-# Serbian translations for Battle for Wesnoth package.
-# Copyright (C) 2005 Wesnoth development team
-# This file is distributed under the same license as the Battle for Wesnoth
package.
-# Automatically generated, 2005.
-#
+# #-#-#-#-# wesnoth.cpp1.po (Battle for Wesnoth VERSION) #-#-#-#-#
+# Serbian translations for Battle for Wesnoth package.
+# Copyright (C) 2005 Wesnoth development team
+# This file is distributed under the same license as the Battle for Wesnoth
package.
+# Automatically generated, 2005.
+#
msgid ""
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.9.0+cvs\n"
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.224 wesnoth/src/actions.cpp:1.225
--- wesnoth/src/actions.cpp:1.224 Mon May 30 03:21:01 2005
+++ wesnoth/src/actions.cpp Thu Jun 2 20:50:26 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.224 2005/05/30 03:21:01 Sirp Exp $ */
+/* $Id: actions.cpp,v 1.225 2005/06/02 20:50:26 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -105,9 +105,9 @@
}
if(u == units.end() && (need_castle ||
!map.on_board(recruit_location))) {
- return _("You don't have a leader to recruit with.");
- }
-
+ return _("You don't have a leader to recruit with.");
+ }
+
wassert(u != units.end() || !need_castle);
if(need_castle && map.is_keep(u->first) == false) {
@@ -120,15 +120,15 @@
const paths::route& rt = a_star_search(u->first,
recruit_location, 100.0, &calc, map.x(), map.y());
if(rt.steps.empty() || units.find(recruit_location) !=
units.end() ||
!map.is_castle(recruit_location)) {
- recruit_location = gamemap::location();
+ recruit_location = gamemap::location();
}
}
if(!map.on_board(recruit_location)) {
recruit_location = find_vacant_tile(map,units,u->first,
need_castle ? VACANT_CASTLE
: VACANT_ANY);
- } else if(units.count(recruit_location) == 1) {
- recruit_location =
find_vacant_tile(map,units,recruit_location,VACANT_ANY);
+ } else if(units.count(recruit_location) == 1) {
+ recruit_location =
find_vacant_tile(map,units,recruit_location,VACANT_ANY);
}
if(!map.on_board(recruit_location)) {
@@ -410,10 +410,10 @@
res.damage_attacker_takes = 0;
if (counterattack) {
const attack_type& defend = defender_attacks[defend_with];
- res.defender_special = defend.special();
-
- if(res.defender_special == to_the_death_string) {
- res.to_the_death = true;
+ res.defender_special = defend.special();
+
+ if(res.defender_special == to_the_death_string) {
+ res.to_the_death = true;
}
//magical attacks always have a 70% chance to hit
Index: wesnoth/src/ai.cpp
diff -u wesnoth/src/ai.cpp:1.152 wesnoth/src/ai.cpp:1.153
--- wesnoth/src/ai.cpp:1.152 Mon May 30 06:44:49 2005
+++ wesnoth/src/ai.cpp Thu Jun 2 20:50:26 2005
@@ -1,4 +1,4 @@
-/* $Id: ai.cpp,v 1.152 2005/05/30 06:44:49 Sirp Exp $ */
+/* $Id: ai.cpp,v 1.153 2005/06/02 20:50:26 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -465,13 +465,13 @@
info_.disp.set_paths(¤t_paths);
}
-
info_.disp.scroll_to_tiles(from.x,from.y,to.x,to.y);
-
+
info_.disp.scroll_to_tiles(from.x,from.y,to.x,to.y);
+
info_.disp.hide_unit(u_it->first,true);
-
unit_display::move_unit(info_.disp,info_.map,steps,current_unit,info_.state.get_time_of_day(),info_.units,info_.teams);
+
unit_display::move_unit(info_.disp,info_.map,steps,current_unit,info_.state.get_time_of_day(),info_.units,info_.teams);
info_.disp.hide_unit(gamemap::location());
- info_.units.erase(u_it);
- u_it = info_.units.end();
+ info_.units.erase(u_it);
+ u_it = info_.units.end();
}
}
}
Index: wesnoth/src/help.cpp
diff -u wesnoth/src/help.cpp:1.103 wesnoth/src/help.cpp:1.104
--- wesnoth/src/help.cpp:1.103 Mon May 30 04:02:00 2005
+++ wesnoth/src/help.cpp Thu Jun 2 20:50:26 2005
@@ -1027,23 +1027,23 @@
ss << "<img>src='" << male_type.image() << "'</img> ";
if (&female_type != &male_type)
- ss << "<img>src='" << female_type.image() << "'</img> ";
+ ss << "<img>src='" << female_type.image() << "'</img> ";
ss << "<format>font_size=" << font::relative_size(11) << "
text=' " << escape(_("level"))
<< " " << type_.level() << "'</format>";
-
- const std::string& male_portrait = male_type.image_profile();
- const std::string& female_portrait =
female_type.image_profile();
-
- if (male_portrait.empty() == false && male_portrait !=
male_type.image()) {
- ss << "<img>src='" << male_portrait << "'
align='right'</img> ";
- }
-
- if (female_portrait.empty() == false && female_portrait !=
male_portrait && female_portrait != female_type.image()) {
- ss << "<img>src='" << female_portrait << "'
align='right'</img> ";
- }
-
- ss << "\n";
+
+ const std::string& male_portrait = male_type.image_profile();
+ const std::string& female_portrait =
female_type.image_profile();
+
+ if (male_portrait.empty() == false && male_portrait !=
male_type.image()) {
+ ss << "<img>src='" << male_portrait << "'
align='right'</img> ";
+ }
+
+ if (female_portrait.empty() == false && female_portrait !=
male_portrait && female_portrait != female_type.image()) {
+ ss << "<img>src='" << female_portrait << "'
align='right'</img> ";
+ }
+
+ ss << "\n";
// Print the units this unit can advance to. Cross reference
// to the topics containing information about those units.
@@ -1188,8 +1188,8 @@
std::vector<item> first_row;
table_spec table;
push_header(first_row, _("Terrain"));
- push_header(first_row, _("Defense"));
- push_header(first_row, _("Movement"));
+ push_header(first_row, _("Defense"));
+ push_header(first_row, _("Movement"));
table.push_back(first_row);
for (std::set<std::string>::const_iterator terrain_it =
@@ -1211,22 +1211,22 @@
row.push_back(std::make_pair(str.str(),
font::line_width(name,
normal_font_size)));
-
- //defense
+
+ //defense
str.str(clear_stringstream);
const int defense =
100 -
movement_type.defense_modifier(*map,terrain);
- str << defense << "%";
- push_tab_pair(row, str.str());
-
+ str << defense << "%";
+ push_tab_pair(row, str.str());
+
//movement
- str.str(clear_stringstream);
- if(moves < 100)
- str << moves;
- else
- str << "--";
- push_tab_pair(row, str.str());
-
+ str.str(clear_stringstream);
+ if(moves < 100)
+ str << moves;
+ else
+ str << "--";
+ push_tab_pair(row, str.str());
+
table.push_back(row);
}
}
Index: wesnoth/src/map_label.cpp
diff -u wesnoth/src/map_label.cpp:1.16 wesnoth/src/map_label.cpp:1.17
--- wesnoth/src/map_label.cpp:1.16 Mon May 30 03:55:34 2005
+++ wesnoth/src/map_label.cpp Thu Jun 2 20:50:26 2005
@@ -6,16 +6,16 @@
#include "map_label.hpp"
namespace {
-const size_t max_label_size = 32;
-
-//our definition of map labels being obscured is if the tile is obscured,
-//or the tile below is obscured. This is because in the case where the tile
-//itself is visible, but the tile below is obscured, the bottom half of the
-//tile will still be shrouded, and the label being drawn looks weird
-bool is_shrouded(const display& disp, const gamemap::location& loc)
-{
- return disp.shrouded(loc.x,loc.y) || disp.shrouded(loc.x,loc.y+1);
-}
+const size_t max_label_size = 32;
+
+//our definition of map labels being obscured is if the tile is obscured,
+//or the tile below is obscured. This is because in the case where the tile
+//itself is visible, but the tile below is obscured, the bottom half of the
+//tile will still be shrouded, and the label being drawn looks weird
+bool is_shrouded(const display& disp, const gamemap::location& loc)
+{
+ return disp.shrouded(loc.x,loc.y) || disp.shrouded(loc.x,loc.y+1);
+}
}
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.145
wesnoth/src/multiplayer_connect.cpp:1.146
--- wesnoth/src/multiplayer_connect.cpp:1.145 Sat May 28 22:29:05 2005
+++ wesnoth/src/multiplayer_connect.cpp Thu Jun 2 20:50:26 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.145 2005/05/28 22:29:05 Sirp Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.146 2005/06/02 20:50:26 isaaccp Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -899,13 +899,13 @@
level_ = state_.snapshot;
// Adds the replay data, and the replay start, to the level, so
- // clients can receive it.
-
- //TO-DO: this should be done only if the player has selected
for the replay to be viewed
+ // clients can receive it.
+
+ //TO-DO: this should be done only if the player has selected
for the replay to be viewed
if(false) {
level_.add_child("replay") = state_.replay_data;
if(!state_.starting_pos.empty())
- level_.add_child("replay_start") =
state_.starting_pos;
+ level_.add_child("replay_start") =
state_.starting_pos;
}
level_.add_child("statistics") = statistics::write_stats();
Index: wesnoth/src/playcampaign.cpp
diff -u wesnoth/src/playcampaign.cpp:1.5 wesnoth/src/playcampaign.cpp:1.6
--- wesnoth/src/playcampaign.cpp:1.5 Mon May 30 06:32:49 2005
+++ wesnoth/src/playcampaign.cpp Thu Jun 2 20:50:26 2005
@@ -1,4 +1,4 @@
-/* $Id: playcampaign.cpp,v 1.5 2005/05/30 06:32:49 Sirp Exp $ */
+/* $Id: playcampaign.cpp,v 1.6 2005/06/02 20:50:26 isaaccp Exp $ */
/*
Copyright (C) 2003-2005 by David White <address@hidden>
Copyright (C) 2005 by Philippe Plantier <address@hidden>
@@ -210,8 +210,8 @@
} else if(scenario->child("end_scenarios")) {
scenario = NULL;
state.scenario = "null";
- } else {
- return QUIT;
+ } else {
+ return QUIT;
}
} else {
Index: wesnoth/src/widgets/textbox.cpp
diff -u wesnoth/src/widgets/textbox.cpp:1.80
wesnoth/src/widgets/textbox.cpp:1.81
--- wesnoth/src/widgets/textbox.cpp:1.80 Mon May 30 21:48:27 2005
+++ wesnoth/src/widgets/textbox.cpp Thu Jun 2 20:50:26 2005
@@ -1,4 +1,4 @@
-/* $Id: textbox.cpp,v 1.80 2005/05/30 21:48:27 Sirp Exp $ */
+/* $Id: textbox.cpp,v 1.81 2005/06/02 20:50:26 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -19,9 +19,9 @@
#include "../language.hpp"
#include "../log.hpp"
#include "../sdl_utils.hpp"
-#include "../serialization/string_utils.hpp"
+#include "../serialization/string_utils.hpp"
#include "../util.hpp"
-#include "../video.hpp"
+#include "../video.hpp"
#include "SDL.h"
@@ -76,11 +76,11 @@
if(text_image_.get() == NULL) {
set_text(text);
return;
- }
-
- //disallow adding multi-line text to a single-line text box
- if(wrap_ == false &&
std::find_if(text.begin(),text.end(),utils::isnewline) != text.end()) {
- return;
+ }
+
+ //disallow adding multi-line text to a single-line text box
+ if(wrap_ == false &&
std::find_if(text.begin(),text.end(),utils::isnewline) != text.end()) {
+ return;
}
const wide_string& wtext = utils::string_to_wstring(text);
@@ -133,10 +133,10 @@
draw_solid_tinted_rectangle(loc.x,loc.y,loc.w,loc.h,0,0,0,
focus() ? alpha_focus_ : alpha_, surf);
- SDL_Rect src;
-
- if(text_image_ == NULL) {
- update_text_cache(true);
+ SDL_Rect src;
+
+ if(text_image_ == NULL) {
+ update_text_cache(true);
}
if(text_image_ != NULL) {
@@ -350,9 +350,9 @@
scrollarea::handle_event(event);
bool changed = false;
-
- const int old_selstart = selstart_;
- const int old_selend = selend_;
+
+ const int old_selstart = selstart_;
+ const int old_selend = selend_;
//Sanity check: verify that selection start and end are within text
//boundaries
@@ -429,7 +429,7 @@
const SDLMod modifiers = SDL_GetModState();
const int c = key.sym;
- const int old_cursor = cursor_;
+ const int old_cursor = cursor_;
if(c == SDLK_LEFT && cursor_ > 0)
--cursor_;
@@ -494,13 +494,13 @@
{
changed = true;
if(is_selection())
- erase_selection();
-
- std::string str = copy_from_clipboard();
-
- //cut off anything after the first newline
-
str.erase(std::find_if(str.begin(),str.end(),utils::isnewline),str.end());
-
+ erase_selection();
+
+ std::string str = copy_from_clipboard();
+
+ //cut off anything after the first newline
+
str.erase(std::find_if(str.begin(),str.end(),utils::isnewline),str.end());
+
wide_string s = utils::string_to_wstring(str);
if(text_.size() < max_size_) {
@@ -509,8 +509,8 @@
}
text_.insert(text_.begin()+cursor_,
s.begin(), s.end());
cursor_ += s.size();
- }
-
+ }
+
}
break;
@@ -547,10 +547,10 @@
//at least the next 500ms.
show_cursor_ = true;
show_cursor_at_ = SDL_GetTicks();
-
- if(changed || old_cursor != cursor_ || old_selstart != selstart_ ||
old_selend != selend_) {
- text_image_ = NULL;
- }
+
+ if(changed || old_cursor != cursor_ || old_selstart != selstart_ ||
old_selend != selend_) {
+ text_image_ = NULL;
+ }
set_dirty(true);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth data/scenarios/multiplayer/scenarios.cf...,
Isaac Clerencia <=