Permalink
Browse files

merge

  • Loading branch information...
2 parents 88b2ebc + 1f2a5cf commit 9b142f76c3ee9c2c69de8e6880df68cbb3a83cb6 George Buckenham committed Sep 5, 2010
Showing with 3 additions and 3 deletions.
  1. +3 −3 game.py
View
@@ -85,12 +85,12 @@ def init(self):
word.sound = pygame.mixer.Sound(word.audiofile)
- word.sound.set_volume(0.2)
+ word.sound.set_volume(0.7)
self.get_swears()
def get_swears(self):
- for swear in ["fuck", "shit", "balls", "cunt", "dick"]:
+ for swear in ["fuck", "ass", "balls", "cunt", "dick"]:
word = Word(0, swear)
print "fetching " + word.text
try:
@@ -163,7 +163,7 @@ def check_words(self, time):
for word in self.all_words:
if (word.time < time - self.error_margin and not word.hit):
word.hit = True
- self.display.incorrect(word.column)
+ self.incorrect(word.column)
def process_input(self):
for event in pygame.event.get():

0 comments on commit 9b142f7

Please sign in to comment.