]> code.bitgloo.com Git - clyne/gamedev.git/commitdiff
Did Shit
authordrumsetmonkey <abelleisle@roadrunner.com>
Wed, 9 Dec 2015 13:30:04 +0000 (08:30 -0500)
committerdrumsetmonkey <abelleisle@roadrunner.com>
Wed, 9 Dec 2015 13:30:04 +0000 (08:30 -0500)
1  2 
main.cpp
src/ui.cpp

diff --cc main.cpp
index e02677d2ec4369dc4c290f808b4c72edf5f01670,4cafc249fecb6f8f8621a6e369aa736e48ec6d43..bde880d11dc82c39075f90a1e4c26e3ec172453b
+++ b/main.cpp
@@@ -403,9 -403,6 +405,9 @@@ int main(/*int argc, char *argv[]*/)
        */
        
        names = fopen("assets/names_en-us", "r+");
-       Mix_Volume(3,25);
 +
 +      crickets=Mix_LoadWAV("assets/sounds/crickets.wav");
++      //Mix_Volume(2,25);
        
        /*
         *      Create all the worlds, entities, mobs, and the player. This function is defined in
@@@ -955,10 -955,8 +960,10 @@@ void logic()
        if(!(tickCount%DAY_CYCLE)||!tickCount){
                if(weather==SUNNY){
                        weather=DARK;
-                       Mix_PlayChannel(3,crickets,0);
++                      Mix_PlayChannel(2,crickets,0);
                }else{
                        weather=SUNNY;
-                       Mix_Pause(3);
++                      Mix_Pause(2);
                }
        }
  
diff --cc src/ui.cpp
Simple merge