- Aufraeumarbeiten

- Datenbank-Export enthaelt nur eigene Daten und Fakedaten
- Anzeigefehler bei Werbevertraegen behoben

git-svn-id: svn://gwron.kicks-ass.net/TVTower@213 c8c01e27-c2b2-4c14-9fc5-b7b90e2c6539

Author: ronny

trunk/TVTower

@@ -31,9 +31,6 @@ REM
 	- OpenGL ... - WindowDeco nicht stylebar
 * Live-Events:
 	- Fussball, Formel1, Konzerte, ... fehlen noch
-* Quiz/Call-In
-	- Werbung: Werbebloecke die prozentual von der Zuschauerzahl
-	  Einkuenfte erzielen
 * Eigenproduktionen:
 	- Filme - die auch bspweise in den Wiederverkauf
 	  gelangen koennen. Hier sollte evtl der "Kino"-Wert

trunk/TVTower.bmx

@@ -840,7 +840,7 @@ Type TContract Extends TProgrammeElementBase {_exposeToLua="selected"}
 		font.drawBlock(getLocale("AD_PROFIT")+": "	, x+10 , y+94 , 130, 16)
 		font.drawBlock(functions.convertValue(String( self.getProfit() ), 2, 0)+" "+CURRENCYSIGN , x+10 , y+94 , 130, 16,2)
 		font.drawBlock(getLocale("AD_TOSEND")+": "    , x+150, y+94 , 127, 16)
-		font.DrawBlock(self.GetSpotsToSend()+"/"+self.GetSpotCount() , x+150, y+91 , 127, 16,2)
+		font.DrawBlock(self.GetSpotsToSend()+"/"+self.GetSpotCount() , x+150, y+94 , 127, 16,2)
 
 		font.drawBlock(getLocale("AD_PENALTY")+": "       , x+10 , y+117, 130, 16)
 		font.drawBlock(functions.convertValue(String( self.GetPenalty() ), 2, 0)+" "+CURRENCYSIGN, x+10 , y+117, 130, 16,2)
@@ -1042,6 +1042,7 @@ Type TProgramme Extends TProgrammeElement {_exposeToLua="selected"} 			'parent o
 		If actors = "" Then obj.actors = Self.actors Else obj.actors = actors
 		If director = "" Then obj.director = Self.director Else obj.director = director
 		If country = "" Then obj.country = Self.country Else obj.country = country
+		If description = "" Then obj.description = Self.description Else obj.description = description
 
 		obj.topicality		= obj.ComputeTopicality()
 		obj.maxtopicality	= obj.topicality

trunk/grafiken/buero/BueroPack.ini

@@ -2021,12 +2021,12 @@ PrintDebug ("Base", "creating GUIelements", DEBUG_START)
 Global MainMenuButton_Start:TGUIButton		= new TGUIButton.Create(TPoint.Create(600, 300), 120, 0, 1, 1, GetLocale("MENU_SOLO_GAME"), "MainMenu", Assets.fonts.baseFontBold)
 Global MainMenuButton_Network:TGUIButton	= new TGUIButton.Create(TPoint.Create(600, 348), 120, 0, 1, 1, GetLocale("MENU_NETWORKGAME"), "MainMenu", Assets.fonts.baseFontBold)
 Global MainMenuButton_Online:TGUIButton		= new TGUIButton.Create(TPoint.Create(600, 396), 120, 0, 1, 1, GetLocale("MENU_ONLINEGAME"), "MainMenu", Assets.fonts.baseFontBold)
-
+rem
 Global Test:TGUIDropDown = new TGUIDropDown.Create(20,20,150,1,1,"test","MainMenu", Assets.GetFont("Default", 11, BOLDFONT))
 Test.AddEntry("test2")
 Test.AddEntry("test3")
 Test.AddEntry("test4")
-
+endrem
 Global NetgameLobbyButton_Join:TGUIButton	= new TGUIButton.Create(TPoint.Create(600, 300), 120, 0, 1, 1, GetLocale("MENU_JOIN"), "NetGameLobby", Assets.fonts.baseFontBold)
 Global NetgameLobbyButton_Create:TGUIButton	= new TGUIButton.Create(TPoint.Create(600, 345), 120, 0, 1, 1, GetLocale("MENU_CREATE_GAME"), "NetGameLobby", Assets.fonts.baseFontBold)
 Global NetgameLobbyButton_Back:TGUIButton	= new TGUIButton.Create(TPoint.Create(600, 390), 120, 0, 1, 1, GetLocale("MENU_BACK"), "NetGameLobby", Assets.fonts.baseFontBold)

trunk/grafiken/buero/filmmenu.txt

@@ -1 +1 @@
-30.05.13 15:03
+30.05.13 18:18