~ubuntu-branches/ubuntu/lucid/tuxtype/lucid-proposed

« back to all changes in this revision

Viewing changes to src/laser.c

  • Committer: Bazaar Package Importer
  • Author(s): Holger Levsen
  • Date: 2009-11-25 13:17:11 UTC
  • mfrom: (2.1.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091125131711-nhssnv6ewxj4ubrv
Tags: 1.8.0-1
* New upstream release, quoting from the upstream changelog:
  - new music files and backgrounds contributed by Caroline Ford,
    some old sounds (the ones with suboptimal free licensing) removed -
    Tux Typing is now 100% DFSG-compliant (Closes: #400924)
  - fixed a problem that was causing the wrong key to flash in the bottom
    row of keys
  - game Instructions - simplified and reactivated cascade and laser game
    instruction scripts, fixed scripting background image so that it scales
    properly in fullscreen
  - scripting - Added some basic scripts so that new users will have a
    complete lesson set out of the box. Added a howto in the docs.
  - Sarah Frisk's word list editor from GSoC 2009 has been merged in as
    a new, somewhat "beta" feature. (Closes: #94986)
* tuxtype.postinst: Make tuxtype binary and shared wordlist directory 
  setgid games, so that wordlists can be edited and shared. This is done
  with dpkg-statoverride, so local admins can override this decission.

Show diffs side-by-side

added added

removed removed

Lines of Context:
318
318
                        while (tux_img == old_tux_img)
319
319
                                tux_img = IMG_TUX_CONSOLE1 + (rand() % 3);
320
320
 
321
 
                        PlaySound(sounds[SND_CLICK]);
 
321
                        PlaySound(sounds[SND_TOCK]);
322
322
                }
323
323
      
324
324
      
867
867
          int i = 0;
868
868
          comet_type* prev_comet = NULL;
869
869
 
870
 
          if(!word || wcslen(word) == 0)
 
870
          if(!word
 
871
             || (wcslen(word) == 0)
 
872
             || (wcslen(word) > NUM_CITIES - 1))
871
873
          {
872
 
            fprintf(stderr, "Error - GetWord() returned NULL or zero-length word\n");
 
874
            fprintf(stderr, "Error - GetWord() returned NULL, zero-length, or too-long word\n");
873
875
            return; 
874
876
          }
875
877