Fixed lib, included LWJGL license

nickpenaranda · Apr 12, 2012 · dcd6904 · dcd6904
1 parent 1865a8f
commit dcd6904
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 bin/*
 .settings
+.classpath
diff --git a/LICENSE-LWJGL b/LICENSE-LWJGL
@@ -0,0 +1,31 @@
+/* 
+ * Copyright (c) 2002-2008 Lightweight Java Game Library Project
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are 
+ * met:
+ * 
+ * * Redistributions of source code must retain the above copyright 
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'Light Weight Java Game Library' nor the names of 
+ *   its contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
diff --git a/lib/jinput.jar b/lib/jinput.jar
diff --git a/lib/linux_natives.jar b/lib/linux_natives.jar
diff --git a/lib/lwjgl-debug.jar b/lib/lwjgl-debug.jar
diff --git a/lib/lwjgl.jar b/lib/lwjgl.jar
diff --git a/lib/lwjgl_applet.jar b/lib/lwjgl_applet.jar
diff --git a/lib/lwjgl_util.jar b/lib/lwjgl_util.jar
diff --git a/lib/lwjgl_util_applet.jar b/lib/lwjgl_util_applet.jar
diff --git a/lib/macosx_natives.jar b/lib/macosx_natives.jar
diff --git a/lib/slick.jar b/lib/slick.jar
diff --git a/lib/solaris_natives.jar b/lib/solaris_natives.jar
diff --git a/lib/windows_natives.jar b/lib/windows_natives.jar
diff --git a/src/com/nickpenaranda/kokgee/KokgeeGame.java b/src/com/nickpenaranda/kokgee/KokgeeGame.java
@@ -103,7 +103,7 @@ private enum Movement {
 
   private boolean bBoost;
   private boolean bEnableBoost;
-
+  private boolean bSounds;
   private boolean bForcePhysics; // @HACK
 
   /*
@@ -157,14 +157,17 @@ public void init(GameContainer arg0) throws SlickException {
     bForcePhysics = false;
     movement = Movement.NONE;
 
+    bSounds = true;
     try {
-      mSoundGameover = new Sound("./res/you_lose.wav");
-      mSoundSetPiece = new Sound("./res/block_set.wav");
-      mSoundClear1 =   new Sound("./res/clear_x1.wav");
-      mSoundClear2 =   new Sound("./res/clear_x2.wav");
-      mSoundClear3 =   new Sound("./res/clear_x3.wav");
-      mSoundClear4 =   new Sound("./res/clear_x4.wav");
+      mSoundGameover = new Sound("res/you_lose.wav");
+      mSoundSetPiece = new Sound("res/block_set.wav");
+      mSoundClear1 =   new Sound("res/clear_x1.wav");
+      mSoundClear2 =   new Sound("res/clear_x2.wav");
+      mSoundClear3 =   new Sound("res/clear_x3.wav");
+      mSoundClear4 =   new Sound("res/clear_x4.wav");
     } catch(SlickException e) {
+      e.printStackTrace();
+      bSounds = false;
       // @TODO Do the right thing!!!
     }
 
@@ -401,7 +404,8 @@ private void haltPiece() {
     int ox = mPiece.getX();
     int oy = mPiece.getY();
 
-    mSoundSetPiece.play();
+    if(bSounds)
+      mSoundSetPiece.play();
 
     for(int k : mPiece.getParts()) {
       int px = ox + ((k - 1) % 4);
@@ -410,7 +414,8 @@ private void haltPiece() {
         mBoard[px][py] = mPiece.getColor();
       else {
         // @ENDGAME
-        mSoundGameover.play();
+        if(bSounds)
+          mSoundGameover.play();
         //System.exit(-1);
       }
 
@@ -454,19 +459,21 @@ private void checkLines() {
         break;
     }
 
-    switch(numComplete) {
-      case 1:
-        mSoundClear1.play();
-        break;
-      case 2:
-        mSoundClear2.play();
-        break;
-      case 3:
-        mSoundClear3.play();
-        break;
-      case 4:
-        mSoundClear4.play();
-        break;
+    if(bSounds) {
+      switch(numComplete) {
+        case 1:
+          mSoundClear1.play();
+          break;
+        case 2:
+          mSoundClear2.play();
+          break;
+        case 3:
+          mSoundClear3.play();
+          break;
+        case 4:
+          mSoundClear4.play();
+          break;
+      }
     }
   }