Attachment #41229 for bug #64595

View | Details | Raw Unified | Return to bug 64595
Collapse All | Expand All

Lines 6-13 Link Here

(-)wesnoth/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= wesnoth	8	PORTNAME= wesnoth
9	PORTVERSION= 0.6.1	9	PORTVERSION= 0.7
10	PORTREVISION= 2
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= http://www.wesnoth.org/files/	11	MASTER_SITES= http://www.wesnoth.org/files/
13		12
Lines 19-25 Link Here
19	USE_X_PREFIX= yes	18	USE_X_PREFIX= yes
20	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
21		20
22	MAN6= wesnoth.6 wesnothd.6	21	MAN6= wesnoth.6 wesnoth_editor.6 wesnothd.6
23		22
24	.if defined(WITH_DEBUG)	23	.if defined(WITH_DEBUG)
25	CONFIGURE_ARGS+= --enable-debug	24	CONFIGURE_ARGS+= --enable-debug

Lines 1-2 Link Here

(-)wesnoth/distinfo (-2 / +2 lines)
1	MD5 (wesnoth-0.6.1.tar.gz) = 716f3507d044318b63c907134356708c	1	MD5 (wesnoth-0.7.tar.gz) = 8c38f71db9c689148c300474992eb260
2	SIZE (wesnoth-0.6.1.tar.gz) = 11616064	2	SIZE (wesnoth-0.7.tar.gz) = 17497561




--- src/widgets/menu.cpp.orig	Thu Jan 29 22:23:06 2004
+++ src/widgets/menu.cpp	Thu Jan 29 22:23:49 2004
@@ -191,8 +191,8 @@
 			x = event.button.x;
 			y = event.button.y;
 		} else {
-			x = reinterpret_cast<int>(event.user.data1);
-			y = reinterpret_cast<int>(event.user.data2);
+			x = (int)event.user.data1;
+			y = (int)event.user.data2;
 		}
 
 		const int item = hit(x,y);

Lines 19-24 Link Here

(-)wesnoth/pkg-plist (-10 / +362 lines)
19	share/wesnoth/data/maps/map-test	19	share/wesnoth/data/maps/map-test
20	share/wesnoth/data/maps/map-threerivers	20	share/wesnoth/data/maps/map-threerivers
21	share/wesnoth/data/maps/map-tutorial	21	share/wesnoth/data/maps/map-tutorial
		22	share/wesnoth/data/maps/map-tutorial2
22	share/wesnoth/data/maps/map0	23	share/wesnoth/data/maps/map0
23	share/wesnoth/data/maps/map0-bak	24	share/wesnoth/data/maps/map0-bak
24	share/wesnoth/data/maps/map0b	25	share/wesnoth/data/maps/map0b
Lines 36-65 Link Here
36	share/wesnoth/data/maps/map7	37	share/wesnoth/data/maps/map7
37	share/wesnoth/data/maps/map8	38	share/wesnoth/data/maps/map8
38	share/wesnoth/data/maps/map9	39	share/wesnoth/data/maps/map9
		40	share/wesnoth/data/maps/north-elves
39	share/wesnoth/data/maps/north-winter	41	share/wesnoth/data/maps/north-winter
40	share/wesnoth/data/maps/sceptre	42	share/wesnoth/data/maps/sceptre
41	share/wesnoth/data/maps/snowplains	43	share/wesnoth/data/maps/snowplains
42	share/wesnoth/data/maps/swampland	44	share/wesnoth/data/maps/swampland
		45	share/wesnoth/data/maps/undeadbook
		46	share/wesnoth/data/maps/undeadtower
43	share/wesnoth/data/maps/undmap1	47	share/wesnoth/data/maps/undmap1
44	share/wesnoth/data/maps/undmap2	48	share/wesnoth/data/maps/undmap2
		49	share/wesnoth/data/maps/undmap3
		50	share/wesnoth/data/maps/undmapbrother
		51	share/wesnoth/data/maps/undmapmages
		52	share/wesnoth/data/maps/undmapskull
45	share/wesnoth/data/multiplayer.cfg	53	share/wesnoth/data/multiplayer.cfg
46	share/wesnoth/data/names.cfg	54	share/wesnoth/data/names.cfg
47	share/wesnoth/data/ranmap.cfg
48	share/wesnoth/data/sample_translation.cfg	55	share/wesnoth/data/sample_translation.cfg
49	share/wesnoth/data/scenario-test.cfg	56	share/wesnoth/data/scenario-test.cfg
50	share/wesnoth/data/scenarios/A_Choice_Must_Be_Made.cfg	57	share/wesnoth/data/scenarios/A_Choice_Must_Be_Made.cfg
51	share/wesnoth/data/scenarios/Bay_of_Pearls.cfg	58	share/wesnoth/data/scenarios/Bay_of_Pearls.cfg
52	share/wesnoth/data/scenarios/Blackwater_Port.cfg	59	share/wesnoth/data/scenarios/Blackwater_Port.cfg
53	share/wesnoth/data/scenarios/Brother_Against_Brother.cfg	60	share/wesnoth/data/scenarios/Brother_Against_Brother.cfg
		61	share/wesnoth/data/scenarios/Crelanus_Book.cfg
54	share/wesnoth/data/scenarios/Crossroads.cfg	62	share/wesnoth/data/scenarios/Crossroads.cfg
55	share/wesnoth/data/scenarios/Dwarven_Doors.cfg	63	share/wesnoth/data/scenarios/Dwarven_Doors.cfg
		64	share/wesnoth/data/scenarios/Elven_Council.cfg
56	share/wesnoth/data/scenarios/Elves_Besieged.cfg	65	share/wesnoth/data/scenarios/Elves_Besieged.cfg
57	share/wesnoth/data/scenarios/Ford_of_Abez.cfg	66	share/wesnoth/data/scenarios/Ford_of_Abez.cfg
58	share/wesnoth/data/scenarios/Gryphon_Mountain.cfg	67	share/wesnoth/data/scenarios/Gryphon_Mountain.cfg
59	share/wesnoth/data/scenarios/Hasty_Alliance.cfg	68	share/wesnoth/data/scenarios/Hasty_Alliance.cfg
60	share/wesnoth/data/scenarios/High_King_at_Sea.cfg	69	share/wesnoth/data/scenarios/High_King_at_Sea.cfg
		70	share/wesnoth/data/scenarios/Home_North_Elves.cfg
		71	share/wesnoth/data/scenarios/Inside_The_Tower.cfg
61	share/wesnoth/data/scenarios/Isle_of_Anduin.cfg	72	share/wesnoth/data/scenarios/Isle_of_Anduin.cfg
62	share/wesnoth/data/scenarios/Isle_of_the_Damned.cfg	73	share/wesnoth/data/scenarios/Isle_of_the_Damned.cfg
		74	share/wesnoth/data/scenarios/Mages_And_Elves.cfg
63	share/wesnoth/data/scenarios/Mountain_Pass.cfg	75	share/wesnoth/data/scenarios/Mountain_Pass.cfg
64	share/wesnoth/data/scenarios/Muff_Malal_Peninsula.cfg	76	share/wesnoth/data/scenarios/Muff_Malal_Peninsula.cfg
65	share/wesnoth/data/scenarios/Northern_Winter.cfg	77	share/wesnoth/data/scenarios/Northern_Winter.cfg
Lines 67-96 Link Here
67	share/wesnoth/data/scenarios/Princess_of_Wesnoth.cfg	79	share/wesnoth/data/scenarios/Princess_of_Wesnoth.cfg
68	share/wesnoth/data/scenarios/Random_Scenario.cfg	80	share/wesnoth/data/scenarios/Random_Scenario.cfg
69	share/wesnoth/data/scenarios/Sceptre.cfg	81	share/wesnoth/data/scenarios/Sceptre.cfg
70	share/wesnoth/data/scenarios/Siege_to_Elefansar.cfg
71	share/wesnoth/data/scenarios/Snow_Plains.cfg	82	share/wesnoth/data/scenarios/Snow_Plains.cfg
72	share/wesnoth/data/scenarios/Swamp_Of_Dread.cfg	83	share/wesnoth/data/scenarios/Swamp_Of_Dread.cfg
73	share/wesnoth/data/scenarios/The_Liberation_Front.cfg
74	share/wesnoth/data/scenarios/The_Lost_General.cfg	84	share/wesnoth/data/scenarios/The_Lost_General.cfg
		85	share/wesnoth/data/scenarios/The_Siege_of_Elensefar.cfg
75	share/wesnoth/data/scenarios/The_Skull_of_Agarash.cfg	86	share/wesnoth/data/scenarios/The_Skull_of_Agarash.cfg
76	share/wesnoth/data/scenarios/Valley_of_Death.cfg	87	share/wesnoth/data/scenarios/Valley_of_Death.cfg
77	share/wesnoth/data/schedules.cfg	88	share/wesnoth/data/schedules.cfg
78	share/wesnoth/data/terrain.cfg	89	share/wesnoth/data/terrain.cfg
		90	share/wesnoth/data/terrain_generator.cfg
		91	share/wesnoth/data/themes/default.cfg
		92	share/wesnoth/data/translations/brazilian.cfg
79	share/wesnoth/data/translations/danish.cfg	93	share/wesnoth/data/translations/danish.cfg
80	share/wesnoth/data/translations/dutch.cfg	94	share/wesnoth/data/translations/dutch.cfg
81	share/wesnoth/data/translations/english.cfg	95	share/wesnoth/data/translations/english.cfg
		96	share/wesnoth/data/translations/finnish.cfg
82	share/wesnoth/data/translations/french.cfg	97	share/wesnoth/data/translations/french.cfg
83	share/wesnoth/data/translations/german.cfg	98	share/wesnoth/data/translations/german.cfg
84	share/wesnoth/data/translations/hungarian.cfg	99	share/wesnoth/data/translations/hungarian.cfg
85	share/wesnoth/data/translations/italian.cfg	100	share/wesnoth/data/translations/italian.cfg
		101	share/wesnoth/data/translations/norwegian.cfg
86	share/wesnoth/data/translations/polish.cfg	102	share/wesnoth/data/translations/polish.cfg
		103	share/wesnoth/data/translations/portuguesebr.cfg
		104	share/wesnoth/data/translations/slovak.cfg
87	share/wesnoth/data/translations/spanish.cfg	105	share/wesnoth/data/translations/spanish.cfg
		106	share/wesnoth/data/translations/swedish.cfg
88	share/wesnoth/data/tutorial.cfg	107	share/wesnoth/data/tutorial.cfg
		108	share/wesnoth/data/tutorial2.cfg
89	share/wesnoth/data/units/Ancient_Lich.cfg	109	share/wesnoth/data/units/Ancient_Lich.cfg
90	share/wesnoth/data/units/Arch_Mage.cfg	110	share/wesnoth/data/units/Arch_Mage.cfg
91	share/wesnoth/data/units/Assassin.cfg	111	share/wesnoth/data/units/Assassin.cfg
		112	share/wesnoth/data/units/Bandit.cfg
92	share/wesnoth/data/units/Blood_Bat.cfg	113	share/wesnoth/data/units/Blood_Bat.cfg
93	share/wesnoth/data/units/Bone_Shooter.cfg	114	share/wesnoth/data/units/Bone_Shooter.cfg
		115	share/wesnoth/data/units/Bowman.cfg
94	share/wesnoth/data/units/Cavalry.cfg	116	share/wesnoth/data/units/Cavalry.cfg
95	share/wesnoth/data/units/Cave_Spider.cfg	117	share/wesnoth/data/units/Cave_Spider.cfg
96	share/wesnoth/data/units/Chocobone.cfg	118	share/wesnoth/data/units/Chocobone.cfg
Lines 98-104 Link Here
98	share/wesnoth/data/units/Cuttle_Fish.cfg	120	share/wesnoth/data/units/Cuttle_Fish.cfg
99	share/wesnoth/data/units/Dark_Adept.cfg	121	share/wesnoth/data/units/Dark_Adept.cfg
100	share/wesnoth/data/units/Dark_Apprentice.cfg	122	share/wesnoth/data/units/Dark_Apprentice.cfg
		123	share/wesnoth/data/units/Dark_Spirit.cfg
101	share/wesnoth/data/units/Death_Knight.cfg	124	share/wesnoth/data/units/Death_Knight.cfg
		125	share/wesnoth/data/units/Deathmaster.cfg
		126	share/wesnoth/data/units/Demilich.cfg
102	share/wesnoth/data/units/Dragoon.cfg	127	share/wesnoth/data/units/Dragoon.cfg
103	share/wesnoth/data/units/Duelist.cfg	128	share/wesnoth/data/units/Duelist.cfg
104	share/wesnoth/data/units/Dwarvish_Berserker.cfg	129	share/wesnoth/data/units/Dwarvish_Berserker.cfg
Lines 127-132 Link Here
127	share/wesnoth/data/units/Evil_Necromancer.cfg	152	share/wesnoth/data/units/Evil_Necromancer.cfg
128	share/wesnoth/data/units/Fencer.cfg	153	share/wesnoth/data/units/Fencer.cfg
129	share/wesnoth/data/units/Fighter.cfg	154	share/wesnoth/data/units/Fighter.cfg
		155	share/wesnoth/data/units/Footpad.cfg
130	share/wesnoth/data/units/Galleon.cfg	156	share/wesnoth/data/units/Galleon.cfg
131	share/wesnoth/data/units/General.cfg	157	share/wesnoth/data/units/General.cfg
132	share/wesnoth/data/units/Ghost.cfg	158	share/wesnoth/data/units/Ghost.cfg
Lines 138-164 Link Here
138	share/wesnoth/data/units/Gryphon_Rider.cfg	164	share/wesnoth/data/units/Gryphon_Rider.cfg
139	share/wesnoth/data/units/Halbardier.cfg	165	share/wesnoth/data/units/Halbardier.cfg
140	share/wesnoth/data/units/Heavy_Infantry.cfg	166	share/wesnoth/data/units/Heavy_Infantry.cfg
		167	share/wesnoth/data/units/Heavy_Infantryman.cfg
141	share/wesnoth/data/units/Horseman.cfg	168	share/wesnoth/data/units/Horseman.cfg
		169	share/wesnoth/data/units/Initiate.cfg
142	share/wesnoth/data/units/Knight.cfg	170	share/wesnoth/data/units/Knight.cfg
143	share/wesnoth/data/units/Lich.cfg	171	share/wesnoth/data/units/Lich.cfg
144	share/wesnoth/data/units/Lieutenant.cfg	172	share/wesnoth/data/units/Lieutenant.cfg
		173	share/wesnoth/data/units/Longbowman.cfg
145	share/wesnoth/data/units/Lord.cfg	174	share/wesnoth/data/units/Lord.cfg
146	share/wesnoth/data/units/Mage.cfg	175	share/wesnoth/data/units/Mage.cfg
147	share/wesnoth/data/units/Mage_of_Light.cfg	176	share/wesnoth/data/units/Mage_of_Light.cfg
		177	share/wesnoth/data/units/Master_Bowman.cfg
148	share/wesnoth/data/units/Merman.cfg	178	share/wesnoth/data/units/Merman.cfg
149	share/wesnoth/data/units/Merman_Lord.cfg	179	share/wesnoth/data/units/Merman_Lord.cfg
150	share/wesnoth/data/units/Naga.cfg	180	share/wesnoth/data/units/Naga.cfg
151	share/wesnoth/data/units/Necromancer.cfg	181	share/wesnoth/data/units/Necromancer.cfg
		182	share/wesnoth/data/units/Nightgaunt.cfg
152	share/wesnoth/data/units/Ogre.cfg	183	share/wesnoth/data/units/Ogre.cfg
153	share/wesnoth/data/units/Orcish_Archer.cfg	184	share/wesnoth/data/units/Orcish_Archer.cfg
154	share/wesnoth/data/units/Orcish_Assassin.cfg	185	share/wesnoth/data/units/Orcish_Assassin.cfg
155	share/wesnoth/data/units/Orcish_Crossbow.cfg	186	share/wesnoth/data/units/Orcish_Crossbow.cfg
		187	share/wesnoth/data/units/Orcish_Crossbowman.cfg
156	share/wesnoth/data/units/Orcish_Grunt.cfg	188	share/wesnoth/data/units/Orcish_Grunt.cfg
157	share/wesnoth/data/units/Orcish_Slayer.cfg	189	share/wesnoth/data/units/Orcish_Slayer.cfg
158	share/wesnoth/data/units/Orcish_Warlord.cfg	190	share/wesnoth/data/units/Orcish_Warlord.cfg
159	share/wesnoth/data/units/Orcish_Warrior.cfg	191	share/wesnoth/data/units/Orcish_Warrior.cfg
		192	share/wesnoth/data/units/Outlaw.cfg
160	share/wesnoth/data/units/Paladin.cfg	193	share/wesnoth/data/units/Paladin.cfg
161	share/wesnoth/data/units/Pikeman.cfg	194	share/wesnoth/data/units/Pikeman.cfg
		195	share/wesnoth/data/units/Poacher.cfg
162	share/wesnoth/data/units/Princess.cfg	196	share/wesnoth/data/units/Princess.cfg
163	share/wesnoth/data/units/Red_Mage.cfg	197	share/wesnoth/data/units/Red_Mage.cfg
164	share/wesnoth/data/units/Revenant.cfg	198	share/wesnoth/data/units/Revenant.cfg
Lines 167-179 Link Here
167	share/wesnoth/data/units/Sea_Hag.cfg	201	share/wesnoth/data/units/Sea_Hag.cfg
168	share/wesnoth/data/units/Sea_Orc.cfg	202	share/wesnoth/data/units/Sea_Orc.cfg
169	share/wesnoth/data/units/Sea_Serpent.cfg	203	share/wesnoth/data/units/Sea_Serpent.cfg
		204	share/wesnoth/data/units/Shadow.cfg
170	share/wesnoth/data/units/Shock_Trooper.cfg	205	share/wesnoth/data/units/Shock_Trooper.cfg
171	share/wesnoth/data/units/Skeleton.cfg	206	share/wesnoth/data/units/Skeleton.cfg
172	share/wesnoth/data/units/Skeleton_Archer.cfg	207	share/wesnoth/data/units/Skeleton_Archer.cfg
173	share/wesnoth/data/units/Sleeping_Gryphon.cfg	208	share/wesnoth/data/units/Sleeping_Gryphon.cfg
174	share/wesnoth/data/units/Spearman.cfg	209	share/wesnoth/data/units/Spearman.cfg
		210	share/wesnoth/data/units/Spectre.cfg
175	share/wesnoth/data/units/Swordsman.cfg	211	share/wesnoth/data/units/Swordsman.cfg
176	share/wesnoth/data/units/Thief.cfg	212	share/wesnoth/data/units/Thief.cfg
		213	share/wesnoth/data/units/Thug.cfg
		214	share/wesnoth/data/units/Trapper.cfg
		215	share/wesnoth/data/units/Triton.cfg
177	share/wesnoth/data/units/Troll.cfg	216	share/wesnoth/data/units/Troll.cfg
178	share/wesnoth/data/units/Troll_Warrior.cfg	217	share/wesnoth/data/units/Troll_Warrior.cfg
179	share/wesnoth/data/units/Troll_Whelp.cfg	218	share/wesnoth/data/units/Troll_Whelp.cfg
Lines 182-187 Link Here
182	share/wesnoth/data/units/White_Mage.cfg	221	share/wesnoth/data/units/White_Mage.cfg
183	share/wesnoth/data/units/Wolf_Rider.cfg	222	share/wesnoth/data/units/Wolf_Rider.cfg
184	share/wesnoth/data/units/Wraith.cfg	223	share/wesnoth/data/units/Wraith.cfg
		224	share/wesnoth/data/units/Youth.cfg
185	share/wesnoth/data/utils.cfg	225	share/wesnoth/data/utils.cfg
186	share/wesnoth/fonts/Vera.ttf	226	share/wesnoth/fonts/Vera.ttf
187	share/wesnoth/images/Afternoon.png	227	share/wesnoth/images/Afternoon.png
Lines 193-198 Link Here
193	share/wesnoth/images/Night.png	233	share/wesnoth/images/Night.png
194	share/wesnoth/images/SecondWatch.png	234	share/wesnoth/images/SecondWatch.png
195	share/wesnoth/images/ally-energy.png	235	share/wesnoth/images/ally-energy.png
		236	share/wesnoth/images/arch-mage-attack2.png
		237	share/wesnoth/images/arch-mage-defend.png
196	share/wesnoth/images/arch-mage.png	238	share/wesnoth/images/arch-mage.png
197	share/wesnoth/images/assassin.png	239	share/wesnoth/images/assassin.png
198	share/wesnoth/images/bone-n.png	240	share/wesnoth/images/bone-n.png
Lines 201-222 Link Here
201	share/wesnoth/images/buttons/button-active.png	243	share/wesnoth/images/buttons/button-active.png
202	share/wesnoth/images/buttons/button-pressed.png	244	share/wesnoth/images/buttons/button-pressed.png
203	share/wesnoth/images/buttons/button.png	245	share/wesnoth/images/buttons/button.png
		246	share/wesnoth/images/buttons/checkbox-active-pressed.png
		247	share/wesnoth/images/buttons/checkbox-active.png
		248	share/wesnoth/images/buttons/checkbox-pressed.png
		249	share/wesnoth/images/buttons/checkbox.png
204	share/wesnoth/images/buttons/downarrow-button-active.png	250	share/wesnoth/images/buttons/downarrow-button-active.png
205	share/wesnoth/images/buttons/downarrow-button-pressed.png	251	share/wesnoth/images/buttons/downarrow-button-pressed.png
206	share/wesnoth/images/buttons/downarrow-button.png	252	share/wesnoth/images/buttons/downarrow-button.png
		253	share/wesnoth/images/buttons/lite-active.png
		254	share/wesnoth/images/buttons/lite-pressed.png
		255	share/wesnoth/images/buttons/lite.png
		256	share/wesnoth/images/buttons/scrollbottom-active.png
		257	share/wesnoth/images/buttons/scrollbottom.png
		258	share/wesnoth/images/buttons/scrollgroove-bottom.png
		259	share/wesnoth/images/buttons/scrollgroove-mid.png
		260	share/wesnoth/images/buttons/scrollgroove-top.png
		261	share/wesnoth/images/buttons/scrollmid-active.png
		262	share/wesnoth/images/buttons/scrollmid.png
		263	share/wesnoth/images/buttons/scrolltop-active.png
		264	share/wesnoth/images/buttons/scrolltop.png
207	share/wesnoth/images/buttons/slider-selected.png	265	share/wesnoth/images/buttons/slider-selected.png
208	share/wesnoth/images/buttons/slider.png	266	share/wesnoth/images/buttons/slider.png
209	share/wesnoth/images/buttons/uparrow-button-active.png	267	share/wesnoth/images/buttons/uparrow-button-active.png
210	share/wesnoth/images/buttons/uparrow-button-pressed.png	268	share/wesnoth/images/buttons/uparrow-button-pressed.png
211	share/wesnoth/images/buttons/uparrow-button.png	269	share/wesnoth/images/buttons/uparrow-button.png
212	share/wesnoth/images/cavespider.png	270	share/wesnoth/images/cavespider.png
213	share/wesnoth/images/cross.png	271	share/wesnoth/images/cockatrice-attack1.png
		272	share/wesnoth/images/cockatrice-attack2.png
		273	share/wesnoth/images/cockatrice.png
214	share/wesnoth/images/cuttlefish.png	274	share/wesnoth/images/cuttlefish.png
215	share/wesnoth/images/darkmissile-n.png	275	share/wesnoth/images/darkmissile-n.png
216	share/wesnoth/images/darkmissile-ne.png	276	share/wesnoth/images/darkmissile-ne.png
217	share/wesnoth/images/dwarf-berserker.png	277	share/wesnoth/images/dwarf-berserker.png
		278	share/wesnoth/images/dwarf-fighter-attack.png
218	share/wesnoth/images/dwarf-fighter-defend.png	279	share/wesnoth/images/dwarf-fighter-defend.png
219	share/wesnoth/images/dwarf-fighter.png	280	share/wesnoth/images/dwarf-fighter.png
		281	share/wesnoth/images/dwarf-lord-attack.png
		282	share/wesnoth/images/dwarf-lord-defend.png
		283	share/wesnoth/images/dwarf-lord.png
220	share/wesnoth/images/dwarf-runemaster-attack.png	284	share/wesnoth/images/dwarf-runemaster-attack.png
221	share/wesnoth/images/dwarf-runemaster-defend.png	285	share/wesnoth/images/dwarf-runemaster-defend.png
222	share/wesnoth/images/dwarf-runemaster.png	286	share/wesnoth/images/dwarf-runemaster.png
Lines 224-229 Link Here
224	share/wesnoth/images/dwarf-thunderer-attack1.png	288	share/wesnoth/images/dwarf-thunderer-attack1.png
225	share/wesnoth/images/dwarf-thunderer-defend.png	289	share/wesnoth/images/dwarf-thunderer-defend.png
226	share/wesnoth/images/dwarf-thunderer.png	290	share/wesnoth/images/dwarf-thunderer.png
		291	share/wesnoth/images/dwarf-warrior-attack.png
		292	share/wesnoth/images/dwarf-warrior-defend.png
227	share/wesnoth/images/dwarf-warrior.png	293	share/wesnoth/images/dwarf-warrior.png
228	share/wesnoth/images/elder-mage-attack.png	294	share/wesnoth/images/elder-mage-attack.png
229	share/wesnoth/images/elder-mage-defend.png	295	share/wesnoth/images/elder-mage-defend.png
Lines 231-247 Link Here
231	share/wesnoth/images/elvish-archer-attack.png	297	share/wesnoth/images/elvish-archer-attack.png
232	share/wesnoth/images/elvish-archer-attack1.png	298	share/wesnoth/images/elvish-archer-attack1.png
233	share/wesnoth/images/elvish-archer-attack2.png	299	share/wesnoth/images/elvish-archer-attack2.png
		300	share/wesnoth/images/elvish-archer-bow-defend.png
		301	share/wesnoth/images/elvish-archer-defend.png
234	share/wesnoth/images/elvish-archer.png	302	share/wesnoth/images/elvish-archer.png
		303	share/wesnoth/images/elvish-avenger-attack.png
		304	share/wesnoth/images/elvish-avenger-attack1.png
		305	share/wesnoth/images/elvish-avenger-attack2.png
		306	share/wesnoth/images/elvish-avenger-bow-defend.png
		307	share/wesnoth/images/elvish-avenger-bow.png
		308	share/wesnoth/images/elvish-avenger-defend.png
235	share/wesnoth/images/elvish-avenger.png	309	share/wesnoth/images/elvish-avenger.png
236	share/wesnoth/images/elvish-captain-attack.png	310	share/wesnoth/images/elvish-captain-attack.png
237	share/wesnoth/images/elvish-captain-bow-attack1.png	311	share/wesnoth/images/elvish-captain-bow-attack1.png
238	share/wesnoth/images/elvish-captain-bow-attack2.png	312	share/wesnoth/images/elvish-captain-bow-attack2.png
		313	share/wesnoth/images/elvish-captain-bow-defend.png
239	share/wesnoth/images/elvish-captain-bow.png	314	share/wesnoth/images/elvish-captain-bow.png
240	share/wesnoth/images/elvish-captain-defend.png	315	share/wesnoth/images/elvish-captain-defend.png
241	share/wesnoth/images/elvish-captain.png	316	share/wesnoth/images/elvish-captain.png
242	share/wesnoth/images/elvish-champion-attack.png	317	share/wesnoth/images/elvish-champion-attack.png
243	share/wesnoth/images/elvish-champion-defend.png	318	share/wesnoth/images/elvish-champion-defend.png
244	share/wesnoth/images/elvish-champion.png	319	share/wesnoth/images/elvish-champion.png
		320	share/wesnoth/images/elvish-druid-defend.png
245	share/wesnoth/images/elvish-druid.png	321	share/wesnoth/images/elvish-druid.png
246	share/wesnoth/images/elvish-fighter-attack.png	322	share/wesnoth/images/elvish-fighter-attack.png
247	share/wesnoth/images/elvish-fighter-bow-attack1.png	323	share/wesnoth/images/elvish-fighter-bow-attack1.png
Lines 253-271 Link Here
253	share/wesnoth/images/elvish-hero-attack.png	329	share/wesnoth/images/elvish-hero-attack.png
254	share/wesnoth/images/elvish-hero.png	330	share/wesnoth/images/elvish-hero.png
255	share/wesnoth/images/elvish-lord.png	331	share/wesnoth/images/elvish-lord.png
		332	share/wesnoth/images/elvish-marksman-attack.png
		333	share/wesnoth/images/elvish-marksman-attack1.png
		334	share/wesnoth/images/elvish-marksman-attack2.png
		335	share/wesnoth/images/elvish-marksman-bow-defend.png
256	share/wesnoth/images/elvish-marksman.png	336	share/wesnoth/images/elvish-marksman.png
		337	share/wesnoth/images/elvish-marshal-attack.png
		338	share/wesnoth/images/elvish-marshal-bow.png
		339	share/wesnoth/images/elvish-marshal-defend.png
257	share/wesnoth/images/elvish-marshal.png	340	share/wesnoth/images/elvish-marshal.png
		341	share/wesnoth/images/elvish-outrider-attack.png
		342	share/wesnoth/images/elvish-outrider-defend.png
258	share/wesnoth/images/elvish-outrider.png	343	share/wesnoth/images/elvish-outrider.png
259	share/wesnoth/images/elvish-ranger-attack.png	344	share/wesnoth/images/elvish-ranger-attack.png
260	share/wesnoth/images/elvish-ranger-attack1.png	345	share/wesnoth/images/elvish-ranger-attack1.png
261	share/wesnoth/images/elvish-ranger-attack2.png	346	share/wesnoth/images/elvish-ranger-attack2.png
		347	share/wesnoth/images/elvish-ranger-bow-defend.png
		348	share/wesnoth/images/elvish-ranger-defend.png
262	share/wesnoth/images/elvish-ranger.png	349	share/wesnoth/images/elvish-ranger.png
263	share/wesnoth/images/elvish-scout-attack.png	350	share/wesnoth/images/elvish-scout-attack.png
		351	share/wesnoth/images/elvish-scout-defend.png
264	share/wesnoth/images/elvish-scout.png	352	share/wesnoth/images/elvish-scout.png
265	share/wesnoth/images/elvish-shaman-attack.png	353	share/wesnoth/images/elvish-shaman-attack.png
266	share/wesnoth/images/elvish-shaman-attack2.png	354	share/wesnoth/images/elvish-shaman-attack2.png
267	share/wesnoth/images/elvish-shaman-defend.png	355	share/wesnoth/images/elvish-shaman-defend.png
268	share/wesnoth/images/elvish-shaman.png	356	share/wesnoth/images/elvish-shaman.png
		357	share/wesnoth/images/elvish-sharpshooter-attack.png
		358	share/wesnoth/images/elvish-sharpshooter-attack1.png
		359	share/wesnoth/images/elvish-sharpshooter-attack2.png
269	share/wesnoth/images/elvish-sharpshooter.png	360	share/wesnoth/images/elvish-sharpshooter.png
270	share/wesnoth/images/elvish-shyde.png	361	share/wesnoth/images/elvish-shyde.png
271	share/wesnoth/images/enemy-energy.png	362	share/wesnoth/images/enemy-energy.png
Lines 284-318 Link Here
284	share/wesnoth/images/gryphon.png	375	share/wesnoth/images/gryphon.png
285	share/wesnoth/images/horseman-attack.png	376	share/wesnoth/images/horseman-attack.png
286	share/wesnoth/images/horseman.png	377	share/wesnoth/images/horseman.png
		378	share/wesnoth/images/human-battleprincess.png
		379	share/wesnoth/images/human-bowman-attack-sword.png
		380	share/wesnoth/images/human-bowman-attack1.png
		381	share/wesnoth/images/human-bowman-attack2.png
		382	share/wesnoth/images/human-bowman-defend.png
		383	share/wesnoth/images/human-bowman.png
287	share/wesnoth/images/human-dragoon.png	384	share/wesnoth/images/human-dragoon.png
288	share/wesnoth/images/human-duelist-defend.png	385	share/wesnoth/images/human-duelist-defend.png
289	share/wesnoth/images/human-duelist.png	386	share/wesnoth/images/human-duelist.png
290	share/wesnoth/images/human-fencer-defend.png	387	share/wesnoth/images/human-fencer-defend.png
291	share/wesnoth/images/human-fencer.png	388	share/wesnoth/images/human-fencer.png
		389	share/wesnoth/images/human-general-defend.png
292	share/wesnoth/images/human-general.png	390	share/wesnoth/images/human-general.png
293	share/wesnoth/images/human-halbardier.png	391	share/wesnoth/images/human-halbardier.png
		392	share/wesnoth/images/human-heavyinfantry-attack.png
		393	share/wesnoth/images/human-heavyinfantry-defend.png
294	share/wesnoth/images/human-heavyinfantry.png	394	share/wesnoth/images/human-heavyinfantry.png
295	share/wesnoth/images/human-lieutenant.png	395	share/wesnoth/images/human-lieutenant.png
		396	share/wesnoth/images/human-longbowman-attack-sword.png
		397	share/wesnoth/images/human-longbowman-attack1.png
		398	share/wesnoth/images/human-longbowman-attack2.png
		399	share/wesnoth/images/human-longbowman-defend-close.png
		400	share/wesnoth/images/human-longbowman-defend.png
		401	share/wesnoth/images/human-longbowman.png
		402	share/wesnoth/images/human-masterbowman.png
296	share/wesnoth/images/human-pikeman.png	403	share/wesnoth/images/human-pikeman.png
		404	share/wesnoth/images/human-princess-attack.png
		405	share/wesnoth/images/human-princess-defend.png
297	share/wesnoth/images/human-princess.png	406	share/wesnoth/images/human-princess.png
298	share/wesnoth/images/human-queen.png	407	share/wesnoth/images/human-queen.png
		408	share/wesnoth/images/human-royalguard-defend.png
299	share/wesnoth/images/human-royalguard.png	409	share/wesnoth/images/human-royalguard.png
		410	share/wesnoth/images/human-scout-attack.png
300	share/wesnoth/images/human-scout.png	411	share/wesnoth/images/human-scout.png
		412	share/wesnoth/images/human-shocktrooper-attack.png
301	share/wesnoth/images/human-shocktrooper.png	413	share/wesnoth/images/human-shocktrooper.png
302	share/wesnoth/images/human-spearman-attack.png	414	share/wesnoth/images/human-spearman-attack.png
303	share/wesnoth/images/human-spearman-attack2.png	415	share/wesnoth/images/human-spearman-attack2.png
304	share/wesnoth/images/human-spearman-defend.png	416	share/wesnoth/images/human-spearman-defend.png
305	share/wesnoth/images/human-spearman.png	417	share/wesnoth/images/human-spearman.png
		418	share/wesnoth/images/human-swordman-attack.png
		419	share/wesnoth/images/human-swordman-defend.png
306	share/wesnoth/images/human-swordman.png	420	share/wesnoth/images/human-swordman.png
307	share/wesnoth/images/icon.png
308	share/wesnoth/images/ink.png	421	share/wesnoth/images/ink.png
309	share/wesnoth/images/item-flamesword.png	422	share/wesnoth/images/item-ball1.png
310	share/wesnoth/images/item-holywater.png	423	share/wesnoth/images/item-ball2.png
311	share/wesnoth/images/item-sceptreoffire.png	424	share/wesnoth/images/item-barrel.png
		425	share/wesnoth/images/item-book1.png
		426	share/wesnoth/images/item-book2.png
		427	share/wesnoth/images/item-book3.png
		428	share/wesnoth/images/item-book4.png
		429	share/wesnoth/images/item-box.png
		430	share/wesnoth/images/item-dragonstatue.png
		431	share/wesnoth/images/item-flower1.png
		432	share/wesnoth/images/item-flower2.png
		433	share/wesnoth/images/item-flower3.png
		434	share/wesnoth/images/item-flower4.png
		435	share/wesnoth/images/item-leanto.png
		436	share/wesnoth/images/item-monolith.png
		437	share/wesnoth/images/item-monolith1.png
		438	share/wesnoth/images/item-monolith2.png
		439	share/wesnoth/images/item-monolith3.png
		440	share/wesnoth/images/item-monolith4.png
		441	share/wesnoth/images/item-ornate1.png
		442	share/wesnoth/images/item-ornate2.png
		443	share/wesnoth/images/item-pine1.png
		444	share/wesnoth/images/item-pine2.png
		445	share/wesnoth/images/item-potion1.png
		446	share/wesnoth/images/item-potion2.png
		447	share/wesnoth/images/item-potion3.png
		448	share/wesnoth/images/item-potion4.png
		449	share/wesnoth/images/item-ring1.png
		450	share/wesnoth/images/item-ring2.png
		451	share/wesnoth/images/item-rock1.png
		452	share/wesnoth/images/item-rock2.png
		453	share/wesnoth/images/item-rock3.png
		454	share/wesnoth/images/item-rock4.png
		455	share/wesnoth/images/item-slab.png
		456	share/wesnoth/images/item-well.png
312	share/wesnoth/images/knight.png	457	share/wesnoth/images/knight.png
313	share/wesnoth/images/konrad-commander-attack1.png	458	share/wesnoth/images/konrad-commander-attack1.png
314	share/wesnoth/images/konrad-commander-attack2.png	459	share/wesnoth/images/konrad-commander-attack2.png
315	share/wesnoth/images/konrad-commander.png	460	share/wesnoth/images/konrad-commander.png
		461	share/wesnoth/images/konrad-fighter-attack.png
		462	share/wesnoth/images/konrad-fighter-defend.png
		463	share/wesnoth/images/konrad-fighter.png
		464	share/wesnoth/images/konrad-lord-attack.png
316	share/wesnoth/images/konrad-lord.png	465	share/wesnoth/images/konrad-lord.png
317	share/wesnoth/images/konrad-young-attack.png	466	share/wesnoth/images/konrad-young-attack.png
318	share/wesnoth/images/konrad-young.png	467	share/wesnoth/images/konrad-young.png
Lines 325-352 Link Here
325	share/wesnoth/images/mage.png	474	share/wesnoth/images/mage.png
326	share/wesnoth/images/magicmissile-n.png	475	share/wesnoth/images/magicmissile-n.png
327	share/wesnoth/images/magicmissile-ne.png	476	share/wesnoth/images/magicmissile-ne.png
		477	share/wesnoth/images/merman-defend.png
		478	share/wesnoth/images/merman-king-attack.png
		479	share/wesnoth/images/merman-king-defend.png
328	share/wesnoth/images/merman-king.png	480	share/wesnoth/images/merman-king.png
329	share/wesnoth/images/merman.png	481	share/wesnoth/images/merman.png
		482	share/wesnoth/images/misc/axe.png
		483	share/wesnoth/images/misc/baneblade.png
		484	share/wesnoth/images/misc/battleaxe.png
		485	share/wesnoth/images/misc/blank.png
330	share/wesnoth/images/misc/botleft-corner.png	486	share/wesnoth/images/misc/botleft-corner.png
331	share/wesnoth/images/misc/botright-corner.png	487	share/wesnoth/images/misc/botright-corner.png
		488	share/wesnoth/images/misc/bow.png
332	share/wesnoth/images/misc/cage.png	489	share/wesnoth/images/misc/cage.png
333	share/wesnoth/images/misc/character-box.png	490	share/wesnoth/images/misc/character-box.png
334	share/wesnoth/images/misc/chest.png	491	share/wesnoth/images/misc/chest.png
		492	share/wesnoth/images/misc/claws.png
		493	share/wesnoth/images/misc/club.png
335	share/wesnoth/images/misc/compass-north.png	494	share/wesnoth/images/misc/compass-north.png
336	share/wesnoth/images/misc/compass-south.png	495	share/wesnoth/images/misc/compass-south.png
337	share/wesnoth/images/misc/cross.png	496	share/wesnoth/images/misc/cross.png
		497	share/wesnoth/images/misc/dagger.png
		498	share/wesnoth/images/misc/dark-missile.png
		499	share/wesnoth/images/misc/darkstaff.png
		500	share/wesnoth/images/misc/darts.png
338	share/wesnoth/images/misc/delfador.png	501	share/wesnoth/images/misc/delfador.png
		502	share/wesnoth/images/misc/disk.png
339	share/wesnoth/images/misc/dot.png	503	share/wesnoth/images/misc/dot.png
		504	share/wesnoth/images/misc/druidstaff.png
		505	share/wesnoth/images/misc/entangle.png
		506	share/wesnoth/images/misc/fangs.png
		507	share/wesnoth/images/misc/fireball.png
		508	share/wesnoth/images/misc/fist.png
340	share/wesnoth/images/misc/font8x8.png	509	share/wesnoth/images/misc/font8x8.png
341	share/wesnoth/images/misc/foot-left-n.png	510	share/wesnoth/images/misc/foot-left-n.png
342	share/wesnoth/images/misc/foot-left-nw.png	511	share/wesnoth/images/misc/foot-left-nw.png
343	share/wesnoth/images/misc/foot-right-n.png	512	share/wesnoth/images/misc/foot-right-n.png
344	share/wesnoth/images/misc/foot-right-nw.png	513	share/wesnoth/images/misc/foot-right-nw.png
		514	share/wesnoth/images/misc/frenzy.png
		515	share/wesnoth/images/misc/gold.png
		516	share/wesnoth/images/misc/halberd.png
		517	share/wesnoth/images/misc/hammer.png
		518	share/wesnoth/images/misc/hatchet.png
		519	share/wesnoth/images/misc/income.png
		520	share/wesnoth/images/misc/invisible.png
		521	share/wesnoth/images/misc/item-darktome.png
		522	share/wesnoth/images/misc/item-flamesword.png
		523	share/wesnoth/images/misc/item-healingpotion.png
		524	share/wesnoth/images/misc/item-holywater.png
		525	share/wesnoth/images/misc/item-sceptreoffire.png
		526	share/wesnoth/images/misc/item-staff.png
345	share/wesnoth/images/misc/item-stormtrident.png	527	share/wesnoth/images/misc/item-stormtrident.png
346	share/wesnoth/images/misc/kalenz.png	528	share/wesnoth/images/misc/kalenz.png
		529	share/wesnoth/images/misc/knife.png
347	share/wesnoth/images/misc/konrad.png	530	share/wesnoth/images/misc/konrad.png
		531	share/wesnoth/images/misc/lance.png
		532	share/wesnoth/images/misc/lightingbolt.png
348	share/wesnoth/images/misc/lisar.png	533	share/wesnoth/images/misc/lisar.png
349	share/wesnoth/images/misc/lobby.png	534	share/wesnoth/images/misc/lobby.png
		535	share/wesnoth/images/misc/logo.png
		536	share/wesnoth/images/misc/longbow.png
		537	share/wesnoth/images/misc/mace.png
		538	share/wesnoth/images/misc/mainmenu-background.png
		539	share/wesnoth/images/misc/mainmenu-border-botleft.png
		540	share/wesnoth/images/misc/mainmenu-border-botright.png
		541	share/wesnoth/images/misc/mainmenu-border-bottom.png
		542	share/wesnoth/images/misc/mainmenu-border-left.png
		543	share/wesnoth/images/misc/mainmenu-border-right.png
		544	share/wesnoth/images/misc/mainmenu-border-top.png
		545	share/wesnoth/images/misc/mainmenu-border-topleft.png
		546	share/wesnoth/images/misc/mainmenu-border-topright.png
350	share/wesnoth/images/misc/map.png	547	share/wesnoth/images/misc/map.png
351	share/wesnoth/images/misc/menu-background.png	548	share/wesnoth/images/misc/menu-background.png
352	share/wesnoth/images/misc/menu-border-botleft.png	549	share/wesnoth/images/misc/menu-border-botleft.png
Lines 357-365 Link Here
357	share/wesnoth/images/misc/menu-border-top.png	554	share/wesnoth/images/misc/menu-border-top.png
358	share/wesnoth/images/misc/menu-border-topleft.png	555	share/wesnoth/images/misc/menu-border-topleft.png
359	share/wesnoth/images/misc/menu-border-topright.png	556	share/wesnoth/images/misc/menu-border-topright.png
		557	share/wesnoth/images/misc/menu2-background.png
		558	share/wesnoth/images/misc/menu2-border-botleft.png
		559	share/wesnoth/images/misc/menu2-border-botright.png
		560	share/wesnoth/images/misc/menu2-border-bottom.png
		561	share/wesnoth/images/misc/menu2-border-left.png
		562	share/wesnoth/images/misc/menu2-border-right.png
		563	share/wesnoth/images/misc/menu2-border-top.png
		564	share/wesnoth/images/misc/menu2-border-topleft.png
		565	share/wesnoth/images/misc/menu2-border-topright.png
		566	share/wesnoth/images/misc/missile.png
		567	share/wesnoth/images/misc/paladinsword.png
		568	share/wesnoth/images/misc/pike.png
		569	share/wesnoth/images/misc/poisoned.png
		570	share/wesnoth/images/misc/rapier.png
		571	share/wesnoth/images/misc/rightside-bg.png
360	share/wesnoth/images/misc/rightside-bottom.png	572	share/wesnoth/images/misc/rightside-bottom.png
361	share/wesnoth/images/misc/rightside-editor.png	573	share/wesnoth/images/misc/rightside-editor.png
362	share/wesnoth/images/misc/rightside.png	574	share/wesnoth/images/misc/rightside.png
		575	share/wesnoth/images/misc/short-sword.png
		576	share/wesnoth/images/misc/sling.png
		577	share/wesnoth/images/misc/slowed.png
		578	share/wesnoth/images/misc/spear.png
		579	share/wesnoth/images/misc/staff.png
		580	share/wesnoth/images/misc/status-bg.png
		581	share/wesnoth/images/misc/story0a.png
		582	share/wesnoth/images/misc/story0b.png
363	share/wesnoth/images/misc/story1.png	583	share/wesnoth/images/misc/story1.png
364	share/wesnoth/images/misc/story2.png	584	share/wesnoth/images/misc/story2.png
365	share/wesnoth/images/misc/story3.png	585	share/wesnoth/images/misc/story3.png
Lines 368-375 Link Here
368	share/wesnoth/images/misc/story6.png	588	share/wesnoth/images/misc/story6.png
369	share/wesnoth/images/misc/story7.png	589	share/wesnoth/images/misc/story7.png
370	share/wesnoth/images/misc/story8.png	590	share/wesnoth/images/misc/story8.png
		591	share/wesnoth/images/misc/story9.png
		592	share/wesnoth/images/misc/sword.png
		593	share/wesnoth/images/misc/tentacle.png
		594	share/wesnoth/images/misc/thorns.png
		595	share/wesnoth/images/misc/title.png
		596	share/wesnoth/images/misc/top-bg.png
371	share/wesnoth/images/misc/topleft-corner.png	597	share/wesnoth/images/misc/topleft-corner.png
372	share/wesnoth/images/misc/topright-corner.png	598	share/wesnoth/images/misc/topright-corner.png
		599	share/wesnoth/images/misc/torch.png
		600	share/wesnoth/images/misc/trident.png
		601	share/wesnoth/images/misc/tutorial1.png
		602	share/wesnoth/images/misc/tutorial2.png
		603	share/wesnoth/images/misc/tutorial3.png
		604	share/wesnoth/images/misc/tutorial3b.png
		605	share/wesnoth/images/misc/tutorial4.png
		606	share/wesnoth/images/misc/tutorial5.png
		607	share/wesnoth/images/misc/tutorial6.png
		608	share/wesnoth/images/misc/tutorial7.png
		609	share/wesnoth/images/misc/units.png
		610	share/wesnoth/images/misc/upkeep.png
		611	share/wesnoth/images/misc/villages.png
		612	share/wesnoth/images/misc/waterspray.png
		613	share/wesnoth/images/misc/web.png
		614	share/wesnoth/images/misc/woodensword.png
373	share/wesnoth/images/missile-n.png	615	share/wesnoth/images/missile-n.png
374	share/wesnoth/images/missile-ne.png	616	share/wesnoth/images/missile-ne.png
375	share/wesnoth/images/missile-nw.png	617	share/wesnoth/images/missile-nw.png
Lines 381-394 Link Here
381	share/wesnoth/images/missiledagger-ne.png	623	share/wesnoth/images/missiledagger-ne.png
382	share/wesnoth/images/missilespear-n.png	624	share/wesnoth/images/missilespear-n.png
383	share/wesnoth/images/missilespear-ne.png	625	share/wesnoth/images/missilespear-ne.png
		626	share/wesnoth/images/missilestone.png
384	share/wesnoth/images/moved-energy.png	627	share/wesnoth/images/moved-energy.png
		628	share/wesnoth/images/naga-defend.png
385	share/wesnoth/images/naga.png	629	share/wesnoth/images/naga.png
		630	share/wesnoth/images/neutral-bandit-attack.png
		631	share/wesnoth/images/neutral-bandit-defend.png
		632	share/wesnoth/images/neutral-bandit.png
		633	share/wesnoth/images/neutral-footpad-attack.png
		634	share/wesnoth/images/neutral-footpad-attack1.png
		635	share/wesnoth/images/neutral-footpad-attack2.png
		636	share/wesnoth/images/neutral-footpad-defend.png
		637	share/wesnoth/images/neutral-footpad.png
		638	share/wesnoth/images/neutral-outlaw-attack.png
		639	share/wesnoth/images/neutral-outlaw-attack1.png
		640	share/wesnoth/images/neutral-outlaw-attack2.png
		641	share/wesnoth/images/neutral-outlaw-defend.png
		642	share/wesnoth/images/neutral-outlaw.png
		643	share/wesnoth/images/neutral-poacher-attack.png
		644	share/wesnoth/images/neutral-poacher-attack1.png
		645	share/wesnoth/images/neutral-poacher-attack2.png
		646	share/wesnoth/images/neutral-poacher-defend.png
		647	share/wesnoth/images/neutral-poacher.png
		648	share/wesnoth/images/neutral-thug-attack.png
		649	share/wesnoth/images/neutral-thug-defend.png
		650	share/wesnoth/images/neutral-thug.png
		651	share/wesnoth/images/neutral-trapper-attack.png
		652	share/wesnoth/images/neutral-trapper-attack1.png
		653	share/wesnoth/images/neutral-trapper-attack2.png
		654	share/wesnoth/images/neutral-trapper-defend.png
		655	share/wesnoth/images/neutral-trapper.png
386	share/wesnoth/images/ogre.png	656	share/wesnoth/images/ogre.png
387	share/wesnoth/images/orc-archer-attack.png	657	share/wesnoth/images/orc-archer-attack.png
388	share/wesnoth/images/orc-archer-attack2.png	658	share/wesnoth/images/orc-archer-attack2.png
389	share/wesnoth/images/orc-archer.png	659	share/wesnoth/images/orc-archer.png
		660	share/wesnoth/images/orc-assassin-attack.png
390	share/wesnoth/images/orc-assassin.png	661	share/wesnoth/images/orc-assassin.png
391	share/wesnoth/images/orc-slayer.png	662	share/wesnoth/images/orc-slayer.png
		663	share/wesnoth/images/orc-xbowman-attack.png
392	share/wesnoth/images/orc-xbowman.png	664	share/wesnoth/images/orc-xbowman.png
393	share/wesnoth/images/orcish-grunt-attack.png	665	share/wesnoth/images/orcish-grunt-attack.png
394	share/wesnoth/images/orcish-grunt-defend.png	666	share/wesnoth/images/orcish-grunt-defend.png
Lines 399-408 Link Here
399	share/wesnoth/images/paladin.png	671	share/wesnoth/images/paladin.png
400	share/wesnoth/images/partmoved-energy.png	672	share/wesnoth/images/partmoved-energy.png
401	share/wesnoth/images/red-mage.png	673	share/wesnoth/images/red-mage.png
		674	share/wesnoth/images/rogue-attack.png
		675	share/wesnoth/images/rogue-defend.png
402	share/wesnoth/images/rogue.png	676	share/wesnoth/images/rogue.png
		677	share/wesnoth/images/sea-hag-defend.png
403	share/wesnoth/images/sea-hag.png	678	share/wesnoth/images/sea-hag.png
404	share/wesnoth/images/sea-orc.png	679	share/wesnoth/images/sea-orc.png
405	share/wesnoth/images/seaserpent.png	680	share/wesnoth/images/seaserpent.png
		681	share/wesnoth/images/terrain/alpha.png
406	share/wesnoth/images/terrain/bridge-n-s.png	682	share/wesnoth/images/terrain/bridge-n-s.png
407	share/wesnoth/images/terrain/bridge-ne-sw.png	683	share/wesnoth/images/terrain/bridge-ne-sw.png
408	share/wesnoth/images/terrain/bridge-se-nw.png	684	share/wesnoth/images/terrain/bridge-se-nw.png
Lines 459-470 Link Here
459	share/wesnoth/images/terrain/flag-neutral.png	735	share/wesnoth/images/terrain/flag-neutral.png
460	share/wesnoth/images/terrain/flag-snow-neutral.png	736	share/wesnoth/images/terrain/flag-snow-neutral.png
461	share/wesnoth/images/terrain/flag-team1.png	737	share/wesnoth/images/terrain/flag-team1.png
		738	share/wesnoth/images/terrain/flag-team10.png
462	share/wesnoth/images/terrain/flag-team2.png	739	share/wesnoth/images/terrain/flag-team2.png
463	share/wesnoth/images/terrain/flag-team3.png	740	share/wesnoth/images/terrain/flag-team3.png
464	share/wesnoth/images/terrain/flag-team4.png	741	share/wesnoth/images/terrain/flag-team4.png
465	share/wesnoth/images/terrain/flag-team5.png	742	share/wesnoth/images/terrain/flag-team5.png
466	share/wesnoth/images/terrain/flag-team6.png	743	share/wesnoth/images/terrain/flag-team6.png
467	share/wesnoth/images/terrain/flag.png	744	share/wesnoth/images/terrain/flag-team7.png
		745	share/wesnoth/images/terrain/flag-team8.png
		746	share/wesnoth/images/terrain/flag-team9.png
		747	share/wesnoth/images/terrain/fog-n.png
		748	share/wesnoth/images/terrain/fog-ne.png
		749	share/wesnoth/images/terrain/fog-nw.png
		750	share/wesnoth/images/terrain/fog-s.png
		751	share/wesnoth/images/terrain/fog-se.png
		752	share/wesnoth/images/terrain/fog-sw.png
		753	share/wesnoth/images/terrain/fog.png
468	share/wesnoth/images/terrain/forest-n.png	754	share/wesnoth/images/terrain/forest-n.png
469	share/wesnoth/images/terrain/forest-ne.png	755	share/wesnoth/images/terrain/forest-ne.png
470	share/wesnoth/images/terrain/forest-nw.png	756	share/wesnoth/images/terrain/forest-nw.png
Lines 494-499 Link Here
494	share/wesnoth/images/terrain/grassland-sw-nw.png	780	share/wesnoth/images/terrain/grassland-sw-nw.png
495	share/wesnoth/images/terrain/grassland-sw.png	781	share/wesnoth/images/terrain/grassland-sw.png
496	share/wesnoth/images/terrain/grassland.png	782	share/wesnoth/images/terrain/grassland.png
		783	share/wesnoth/images/terrain/grid.png
497	share/wesnoth/images/terrain/hills-n-ne.png	784	share/wesnoth/images/terrain/hills-n-ne.png
498	share/wesnoth/images/terrain/hills-n.png	785	share/wesnoth/images/terrain/hills-n.png
499	share/wesnoth/images/terrain/hills-ne.png	786	share/wesnoth/images/terrain/hills-ne.png
Lines 507-512 Link Here
507	share/wesnoth/images/terrain/human-village.png	794	share/wesnoth/images/terrain/human-village.png
508	share/wesnoth/images/terrain/keep.png	795	share/wesnoth/images/terrain/keep.png
509	share/wesnoth/images/terrain/lava.png	796	share/wesnoth/images/terrain/lava.png
		797	share/wesnoth/images/terrain/mask.png
510	share/wesnoth/images/terrain/mine.png	798	share/wesnoth/images/terrain/mine.png
511	share/wesnoth/images/terrain/mountains-n.png	799	share/wesnoth/images/terrain/mountains-n.png
512	share/wesnoth/images/terrain/mountains-ne.png	800	share/wesnoth/images/terrain/mountains-ne.png
Lines 524-533 Link Here
524	share/wesnoth/images/terrain/ocean-se.png	812	share/wesnoth/images/terrain/ocean-se.png
525	share/wesnoth/images/terrain/ocean-sw.png	813	share/wesnoth/images/terrain/ocean-sw.png
526	share/wesnoth/images/terrain/ocean.png	814	share/wesnoth/images/terrain/ocean.png
		815	share/wesnoth/images/terrain/out.png
527	share/wesnoth/images/terrain/pier.png	816	share/wesnoth/images/terrain/pier.png
528	share/wesnoth/images/terrain/road.png	817	share/wesnoth/images/terrain/road.png
529	share/wesnoth/images/terrain/rocks.png	818	share/wesnoth/images/terrain/rocks.png
530	share/wesnoth/images/terrain/signpost.png	819	share/wesnoth/images/terrain/signpost.png
		820	share/wesnoth/images/terrain/snow-forest-n.png
		821	share/wesnoth/images/terrain/snow-forest-ne.png
		822	share/wesnoth/images/terrain/snow-forest-nw.png
		823	share/wesnoth/images/terrain/snow-forest-s.png
		824	share/wesnoth/images/terrain/snow-forest-se.png
		825	share/wesnoth/images/terrain/snow-forest-sw.png
		826	share/wesnoth/images/terrain/snow-forest.png
		827	share/wesnoth/images/terrain/snow-hills-n-ne.png
		828	share/wesnoth/images/terrain/snow-hills-n.png
		829	share/wesnoth/images/terrain/snow-hills-ne.png
		830	share/wesnoth/images/terrain/snow-hills-nw.png
		831	share/wesnoth/images/terrain/snow-hills-s-sw.png
		832	share/wesnoth/images/terrain/snow-hills-s.png
		833	share/wesnoth/images/terrain/snow-hills-se.png
		834	share/wesnoth/images/terrain/snow-hills-sw.png
		835	share/wesnoth/images/terrain/snow-hills.png
531	share/wesnoth/images/terrain/snow-n-ne-se-s.png	836	share/wesnoth/images/terrain/snow-n-ne-se-s.png
532	share/wesnoth/images/terrain/snow-n-ne-se.png	837	share/wesnoth/images/terrain/snow-n-ne-se.png
533	share/wesnoth/images/terrain/snow-n-ne.png	838	share/wesnoth/images/terrain/snow-n-ne.png
Lines 554-562 Link Here
554	share/wesnoth/images/terrain/swampwater2.png	859	share/wesnoth/images/terrain/swampwater2.png
555	share/wesnoth/images/terrain/swampwater3.png	860	share/wesnoth/images/terrain/swampwater3.png
556	share/wesnoth/images/terrain/temple.png	861	share/wesnoth/images/terrain/temple.png
		862	share/wesnoth/images/terrain/test.png
		863	share/wesnoth/images/terrain/void-n.png
		864	share/wesnoth/images/terrain/void-ne.png
		865	share/wesnoth/images/terrain/void-nw.png
		866	share/wesnoth/images/terrain/void-s.png
		867	share/wesnoth/images/terrain/void-se.png
		868	share/wesnoth/images/terrain/void-sw.png
557	share/wesnoth/images/terrain/void.png	869	share/wesnoth/images/terrain/void.png
		870	share/wesnoth/images/thief-attack.png
		871	share/wesnoth/images/thief-defend.png
558	share/wesnoth/images/thief.png	872	share/wesnoth/images/thief.png
559	share/wesnoth/images/title.png
560	share/wesnoth/images/troll-grunt-attack.png	873	share/wesnoth/images/troll-grunt-attack.png
561	share/wesnoth/images/troll-grunt.png	874	share/wesnoth/images/troll-grunt.png
562	share/wesnoth/images/troll-warrior-attack.png	875	share/wesnoth/images/troll-warrior-attack.png
Lines 567-579 Link Here
567	share/wesnoth/images/undead-adept-attack.png	880	share/wesnoth/images/undead-adept-attack.png
568	share/wesnoth/images/undead-adept-defend.png	881	share/wesnoth/images/undead-adept-defend.png
569	share/wesnoth/images/undead-adept.png	882	share/wesnoth/images/undead-adept.png
		883	share/wesnoth/images/undead-ancient-lich-attack.png
		884	share/wesnoth/images/undead-ancient-lich-defend.png
570	share/wesnoth/images/undead-ancient-lich.png	885	share/wesnoth/images/undead-ancient-lich.png
571	share/wesnoth/images/undead-archer.png	886	share/wesnoth/images/undead-archer.png
		887	share/wesnoth/images/undead-bat-attack.png
572	share/wesnoth/images/undead-bat.png	888	share/wesnoth/images/undead-bat.png
		889	share/wesnoth/images/undead-blackspell.png
573	share/wesnoth/images/undead-bloodbat.png	890	share/wesnoth/images/undead-bloodbat.png
574	share/wesnoth/images/undead-boneshooter.png	891	share/wesnoth/images/undead-boneshooter.png
575	share/wesnoth/images/undead-chocobone.png	892	share/wesnoth/images/undead-chocobone.png
576	share/wesnoth/images/undead-deathknight.png	893	share/wesnoth/images/undead-deathknight.png
		894	share/wesnoth/images/undead-ghost-attack.png
		895	share/wesnoth/images/undead-ghost-attack1.png
		896	share/wesnoth/images/undead-ghost-defend.png
577	share/wesnoth/images/undead-ghost.png	897	share/wesnoth/images/undead-ghost.png
578	share/wesnoth/images/undead-ghoul-attack.png	898	share/wesnoth/images/undead-ghoul-attack.png
579	share/wesnoth/images/undead-ghoul-defend.png	899	share/wesnoth/images/undead-ghoul-defend.png
Lines 583-611 Link Here
583	share/wesnoth/images/undead-necromancer-attack2.png	903	share/wesnoth/images/undead-necromancer-attack2.png
584	share/wesnoth/images/undead-necromancer-defend.png	904	share/wesnoth/images/undead-necromancer-defend.png
585	share/wesnoth/images/undead-necromancer.png	905	share/wesnoth/images/undead-necromancer.png
		906	share/wesnoth/images/undead-nightgaunt-attack.png
		907	share/wesnoth/images/undead-nightgaunt-attack2.png
		908	share/wesnoth/images/undead-nightgaunt-defend.png
		909	share/wesnoth/images/undead-nightgaunt.png
		910	share/wesnoth/images/undead-revenant-attack.png
586	share/wesnoth/images/undead-revenant.png	911	share/wesnoth/images/undead-revenant.png
		912	share/wesnoth/images/undead-shadow-attack.png
		913	share/wesnoth/images/undead-shadow-defend.png
		914	share/wesnoth/images/undead-shadow.png
		915	share/wesnoth/images/undead-skeleton-defend.png
587	share/wesnoth/images/undead-skeleton.png	916	share/wesnoth/images/undead-skeleton.png
		917	share/wesnoth/images/undead-spectre-attack.png
		918	share/wesnoth/images/undead-spectre-attack1.png
		919	share/wesnoth/images/undead-spectre-defend.png
		920	share/wesnoth/images/undead-spectre.png
		921	share/wesnoth/images/undead-wraith-attack1.png
588	share/wesnoth/images/undead-wraith.png	922	share/wesnoth/images/undead-wraith.png
589	share/wesnoth/images/undead-zombie-attack.png	923	share/wesnoth/images/undead-zombie-attack.png
590	share/wesnoth/images/undead-zombie.png	924	share/wesnoth/images/undead-zombie.png
591	share/wesnoth/images/unmoved-energy.png	925	share/wesnoth/images/unmoved-energy.png
592	share/wesnoth/images/water_spay.png	926	share/wesnoth/images/water_spay.png
593	share/wesnoth/images/web.png	927	share/wesnoth/images/web.png
		928	share/wesnoth/images/wesnoth-icon.png
594	share/wesnoth/images/white-cleric.png	929	share/wesnoth/images/white-cleric.png
595	share/wesnoth/images/white-mage.png	930	share/wesnoth/images/white-mage.png
596	share/wesnoth/images/whitemissile-n.png	931	share/wesnoth/images/whitemissile-n.png
597	share/wesnoth/images/whitemissile-ne.png	932	share/wesnoth/images/whitemissile-ne.png
598	share/wesnoth/images/wolf-rider-attack.png	933	share/wesnoth/images/wolf-rider-attack.png
		934	share/wesnoth/images/wolf-rider-defend.png
599	share/wesnoth/images/wolf-rider.png	935	share/wesnoth/images/wolf-rider.png
		936	share/wesnoth/music/elf-land.ogg
		937	share/wesnoth/music/frantic.ogg
		938	share/wesnoth/music/underground.ogg
600	share/wesnoth/music/wesnoth-1.ogg	939	share/wesnoth/music/wesnoth-1.ogg
601	share/wesnoth/music/wesnoth-2.ogg	940	share/wesnoth/music/wesnoth-2.ogg
602	share/wesnoth/music/wesnoth-3.ogg	941	share/wesnoth/music/wesnoth-3.ogg
603	share/wesnoth/music/wesnoth-4.ogg	942	share/wesnoth/music/wesnoth-4.ogg
604	share/wesnoth/music/wesnoth-5.ogg	943	share/wesnoth/music/wesnoth-5.ogg
605	share/wesnoth/music/wesnoth-6.ogg	944	share/wesnoth/music/wesnoth-6.ogg
		945	share/wesnoth/music/wesnoth-7.ogg
		946	share/wesnoth/music/wesnoth-8.ogg
606	share/wesnoth/sounds/arrow-hit.wav	947	share/wesnoth/sounds/arrow-hit.wav
607	share/wesnoth/sounds/arrow-miss.wav	948	share/wesnoth/sounds/arrow-miss.wav
608	share/wesnoth/sounds/bell.wav	949	share/wesnoth/sounds/bell.wav
		950	share/wesnoth/sounds/dart.wav
609	share/wesnoth/sounds/fire.wav	951	share/wesnoth/sounds/fire.wav
610	share/wesnoth/sounds/firearrow.wav	952	share/wesnoth/sounds/firearrow.wav
611	share/wesnoth/sounds/fist-swish.wav	953	share/wesnoth/sounds/fist-swish.wav
Lines 613-623 Link Here
613	share/wesnoth/sounds/gunshot.wav	955	share/wesnoth/sounds/gunshot.wav
614	share/wesnoth/sounds/heal.wav	956	share/wesnoth/sounds/heal.wav
615	share/wesnoth/sounds/horse-canter.wav	957	share/wesnoth/sounds/horse-canter.wav
		958	share/wesnoth/sounds/knife.wav
616	share/wesnoth/sounds/lightning.wav	959	share/wesnoth/sounds/lightning.wav
		960	share/wesnoth/sounds/mace.wav
617	share/wesnoth/sounds/magicmissile.wav	961	share/wesnoth/sounds/magicmissile.wav
		962	share/wesnoth/sounds/mermen-hit.wav
		963	share/wesnoth/sounds/net.wav
618	share/wesnoth/sounds/pistol.wav	964	share/wesnoth/sounds/pistol.wav
		965	share/wesnoth/sounds/skeleton-hit.wav
		966	share/wesnoth/sounds/spear.wav
		967	share/wesnoth/sounds/staff.wav
619	share/wesnoth/sounds/sword-clang.wav	968	share/wesnoth/sounds/sword-clang.wav
620	share/wesnoth/sounds/sword-swish.wav	969	share/wesnoth/sounds/sword-swish.wav
		970	share/wesnoth/sounds/ugg.wav
		971	share/wesnoth/sounds/wolf-cry.wav
621	@dirrm share/wesnoth/sounds	972	@dirrm share/wesnoth/sounds
622	@dirrm share/wesnoth/music	973	@dirrm share/wesnoth/music
623	@dirrm share/wesnoth/images/terrain	974	@dirrm share/wesnoth/images/terrain
Lines 627-632 Link Here
627	@dirrm share/wesnoth/fonts	978	@dirrm share/wesnoth/fonts
628	@dirrm share/wesnoth/data/units	979	@dirrm share/wesnoth/data/units
629	@dirrm share/wesnoth/data/translations	980	@dirrm share/wesnoth/data/translations
		981	@dirrm share/wesnoth/data/themes
630	@dirrm share/wesnoth/data/scenarios	982	@dirrm share/wesnoth/data/scenarios
631	@dirrm share/wesnoth/data/maps	983	@dirrm share/wesnoth/data/maps
632	@dirrm share/wesnoth/data	984	@dirrm share/wesnoth/data

Return to bug 64595

Lines 1-13 Link Here

(-)wesnoth/files/patch-src::widgets::menu.cpp (-13 lines)
1	--- src/widgets/menu.cpp.orig Thu Jan 29 22:23:06 2004
2	+++ src/widgets/menu.cpp Thu Jan 29 22:23:49 2004
3	@@ -191,8 +191,8 @@
4	x = event.button.x;
5	y = event.button.y;
6	} else {
7	- x = reinterpret_cast<int>(event.user.data1);
8	- y = reinterpret_cast<int>(event.user.data2);
9	+ x = (int)event.user.data1;
10	+ y = (int)event.user.data2;
11	}
12
13	const int item = hit(x,y);