Merge branch 'master' of http://git.wolfsberg.local/philipp.clima/heisser_draht
This commit is contained in:
		@@ -479,24 +479,24 @@ def enter_name():
 | 
				
			|||||||
        # add all needed surfaces
 | 
					        # add all needed surfaces
 | 
				
			||||||
        highscore_surface = pygame_font_1.render('High Score!', True, pygame_font_main_color)
 | 
					        highscore_surface = pygame_font_1.render('High Score!', True, pygame_font_main_color)
 | 
				
			||||||
        highscore_rectangle = highscore_surface.get_rect()
 | 
					        highscore_rectangle = highscore_surface.get_rect()
 | 
				
			||||||
        highscore_rectangle.topleft = (700, 250)
 | 
					        highscore_rectangle.topleft = (700, 350)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        screen.blit(highscore_surface, highscore_rectangle)
 | 
					        screen.blit(highscore_surface, highscore_rectangle)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        textbox_text_surface = pygame_font_2.render('Enter Name:', True, pygame_font_main_color)
 | 
					        textbox_text_surface = pygame_font_2.render('Enter Name:', True, pygame_font_main_color)
 | 
				
			||||||
        textbox_text_rectangle = textbox_text_surface.get_rect()
 | 
					        textbox_text_rectangle = textbox_text_surface.get_rect()
 | 
				
			||||||
        textbox_text_rectangle.topleft = (700, 400)
 | 
					        textbox_text_rectangle.topleft = (700, 500)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        textbox_surface = pygame_font_2.render(str(name), True, pygame_font_main_color)
 | 
					        textbox_surface = pygame_font_2.render(str(name), True, pygame_font_main_color)
 | 
				
			||||||
        textbox_rectangle = textbox_surface.get_rect()
 | 
					        textbox_rectangle = textbox_surface.get_rect()
 | 
				
			||||||
        textbox_rectangle.topleft = (800, 480)
 | 
					        textbox_rectangle.topleft = (800, 580)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # draw everything
 | 
					        # draw everything
 | 
				
			||||||
        screen.blit(textbox_text_surface, textbox_text_rectangle)
 | 
					        screen.blit(textbox_text_surface, textbox_text_rectangle)
 | 
				
			||||||
        screen.blit(textbox_surface, textbox_rectangle)
 | 
					        screen.blit(textbox_surface, textbox_rectangle)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # add the border and logos
 | 
					        # add the border and logos
 | 
				
			||||||
        draw_border()
 | 
					        #draw_border()
 | 
				
			||||||
        draw_logos()
 | 
					        draw_logos()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # display everything
 | 
					        # display everything
 | 
				
			||||||
@@ -852,7 +852,7 @@ while True:
 | 
				
			|||||||
        pass
 | 
					        pass
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # overlaying structure - this is to be drawn no matter what's below
 | 
					    # overlaying structure - this is to be drawn no matter what's below
 | 
				
			||||||
    draw_border()
 | 
					    #draw_border()
 | 
				
			||||||
    draw_logos()
 | 
					    draw_logos()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # flip everything, update display, do a tick
 | 
					    # flip everything, update display, do a tick
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								img/bg.png
									
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								img/bg.png
									
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 354 KiB After Width: | Height: | Size: 320 KiB  | 
		Reference in New Issue
	
	Block a user