Merge branch 'master' into rexy-graphics

This commit is contained in:
rexy712 2020-08-29 13:08:21 -07:00
commit 10cdd3b52b

View File

@ -144,7 +144,7 @@ void gay_thread(audio::mixer& m, std::atomic_bool& should_gay_thread_stop){
int main(){
srand(time(NULL));
audio::mixer mix(audio::mixer::mode::STEREO, 1);
audio::mixer mix(audio::mixer::mode::STEREO, 1, 44100);
game_state gs = {};
manager.init(640, 480, "Tic-Tac-Gugh");