aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-03-29 08:48:52 -0400
committerClyne Sullivan <tullivan99@gmail.com>2016-03-29 08:48:52 -0400
commita9a9777190086bd2ce2aa54e20a1101509614463 (patch)
treedfd754e45f2d8fc4cf955470681c39c502cde1b4 /main.cpp
parent82c178d797b9a23c31d7dad1cc8cac29d27c6eb1 (diff)
began reworking indoors
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index f4a0005..4140ac7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -243,8 +243,10 @@ int main(int argc, char *argv[]){
std::cout << "SDL_mixer could not initialize! Error: " << Mix_GetError() << std::endl;
return -1;
}
+
Mix_AllocateChannels(8);
- updateConfig();
+
+ config::update();
// Run Mix_Quit when main returns
atexit(Mix_Quit);
@@ -253,7 +255,7 @@ int main(int argc, char *argv[]){
* Load saved settings into the game (see config/settings.xml)
*/
- readConfig();
+ config::read();
/*
* Create a window for SDL to draw to. Most parameters are the default, except for the