Mercurial > sumwars

changeset 1360:ace3785eac3b 0.5.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated contributor list
author wuha
date Fri, 04 Jun 2010 22:41:31 +0000
parents 864c0b2c16eb
children 0283874baf5c
files src/gui/creditswindow.cpp
diffstat 1 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui/creditswindow.cpp	Fri Jun 04 19:55:11 2010 +0000
+++ b/src/gui/creditswindow.cpp	Fri Jun 04 22:41:31 2010 +0000
@@ -21,15 +21,18 @@
 	pane->setPosition(CEGUI::UVector2(cegui_reldim(0.0f), cegui_reldim(0.0f)));
 	pane->setSize(CEGUI::UVector2(cegui_reldim(1.0f), cegui_reldim( 1.0f)));
 	pane->setInheritsAlpha(false);
+	pane->setContentPaneAutoSized(true);
 	
 	CEGUI::Window* credits;
 	credits = win_mgr.createWindow("TaharezLook/StaticText", "CreditWindow");
 	pane->addChildWindow(credits);
-	credits->setPosition(CEGUI::UVector2(cegui_reldim(0.0f), cegui_reldim( 0.0f)));
+	credits->setPosition(CEGUI::UVector2(cegui_reldim(0.0f), cegui_reldim( 0.00f)));
 	credits->setSize(CEGUI::UVector2(cegui_reldim(1.00f), cegui_reldim( 1.0f)));
 	credits->setProperty("FrameEnabled", "false");
 	credits->setProperty("BackgroundEnabled", "true");
 	credits->setProperty("HorzFormatting", "HorzCentred");
+	credits->setMaxSize(CEGUI::UVector2(cegui_reldim(1.00f), cegui_reldim(10.0f)));
+	
 	std::string content = "Programming: \
 			\n Hans Wulf (Lastmerlin) \
 			\n fusion44 \
@@ -38,12 +41,16 @@
 			\n Andreas Schönefeldt \
 			\n Steffen Schönefeldt (Nori) \
 			\n psycho \
+			\n Francesco Miglietta (hal9000 ) \
 			\n\n Scripting: \
 			\n Steffen Schönefeldt (Nori) \
 			\n Hans Wulf (Lastmerlin) \
 			\n\nStory: \
 			\n Steffen Schönefeldt (Nori) \
 			\n Andreas Schönefeldt \
+			\n\nSounds: \
+			\n Michael Kempf (Hangman) \
+			\n artisticdude \
 			\n\n Translation: \
 			\n Steffen Schönefeldt (Nori) \
 			\n Michael Kempf (Hangman) \
@@ -56,6 +63,7 @@
 			\n\nWebsite: \
 			\n Andreas Schönefeldt \
 			\n Michael Kempf (Hangman)";
+	
 	credits->setText((CEGUI::utf8*) content.c_str());
 	credits->setProperty("BackgroundColours", "tl:99000000 tr:99000000 bl:99000000 br:99000000");
 	credits->setAlpha(0.9);
@@ -71,6 +79,7 @@
 	CEGUI::WindowManager& win_mgr = CEGUI::WindowManager::getSingleton();
 	CEGUI::Window* wtext = win_mgr.getWindow("CreditWindow");
 	
+	
 	CEGUI::Font* fnt = wtext->getFont();
 	
 	// Set Size of the Window automatically
@@ -95,6 +104,9 @@
 		float alltime = 20000;	// time for scrolling
 		float pos = (m_shown_timer.getTime()-starttime)/alltime;
 		
+		if (pos < 0)
+			pos = 0;
+		
 		if (pos > 1.0)
 			pos = 1.0;