[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth data/scenarios/Heir_To_The_Throne/Home_...
From: |
David White |
Subject: |
[Wesnoth-cvs-commits] wesnoth data/scenarios/Heir_To_The_Throne/Home_... |
Date: |
Sat, 28 Aug 2004 15:38:59 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: David White <address@hidden> 04/08/28 19:34:02
Modified files:
data/scenarios/Heir_To_The_Throne: Home_Clan.cfg
src : sound.cpp
src/editor : editor_main.cpp
Added files:
data/maps/Heir_To_The_Throne: Battle_for_Wesnoth
data/scenarios/Heir_To_The_Throne: Battle_for_Wesnoth.cfg
Log message:
added basic final scenario
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/maps/Heir_To_The_Throne/Battle_for_Wesnoth?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sound.cpp.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/editor/editor_main.cpp.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.10
wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.11
--- wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg:1.10 Sat Aug
28 18:16:16 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Home_Clan.cfg Sat Aug 28
19:34:02 2004
@@ -12,7 +12,7 @@
{SECOND_WATCH}
turns=64
- next_scenario=null
+ next_scenario=battle_for_wesnoth
objectives= _ "
Victory:
Index: wesnoth/src/editor/editor_main.cpp
diff -u wesnoth/src/editor/editor_main.cpp:1.15
wesnoth/src/editor/editor_main.cpp:1.16
--- wesnoth/src/editor/editor_main.cpp:1.15 Mon Aug 23 06:41:00 2004
+++ wesnoth/src/editor/editor_main.cpp Sat Aug 28 19:34:02 2004
@@ -242,6 +242,8 @@
catch (gamemap::incorrect_format_exception) {
std::cerr << "The map is not in a correct format,
sorry." << std::endl;
return 1;
+ } catch (CVideo::quit& e) {
+ return 0;
}
}
return 0;
Index: wesnoth/src/sound.cpp
diff -u wesnoth/src/sound.cpp:1.19 wesnoth/src/sound.cpp:1.20
--- wesnoth/src/sound.cpp:1.19 Fri Aug 27 15:31:02 2004
+++ wesnoth/src/sound.cpp Sat Aug 28 19:34:02 2004
@@ -1,4 +1,4 @@
-/* $Id: sound.cpp,v 1.19 2004/08/27 15:31:02 cedricd Exp $ */
+/* $Id: sound.cpp,v 1.20 2004/08/28 19:34:02 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -43,7 +43,7 @@
manager::manager()
{
- const int res =
Mix_OpenAudio(MIX_DEFAULT_FREQUENCY,MIX_DEFAULT_FORMAT,2,1024);
+ const int res =
Mix_OpenAudio(MIX_DEFAULT_FREQUENCY,MIX_DEFAULT_FORMAT,2,4096);
if(res >= 0) {
mix_ok = true;
Mix_AllocateChannels(16);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth data/scenarios/Heir_To_The_Throne/Home_...,
David White <=