aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/main.cpp b/main.cpp
index e5aba88..e6ff2eb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,7 +3,8 @@
The main game loop contains all of the global variables the game uses, and it runs the main game loop, the render loop, and the logic loop that control all of the entities.
*/
-#include <cstdio> // fopen
+#include <fstream>
+#include <istream>
#include <thread>
#include <common.h>
@@ -123,7 +124,7 @@ Mix_Chunk *crickets;
* referenced in src/entities.cpp for getting random names.
*/
-FILE *names;
+std::istream *names;
/*
* loops is used for texture animation. It is believed to be passed to entity
@@ -387,7 +388,10 @@ int main(/*int argc, char *argv[]*/){
*
*/
- names = fopen("assets/names_en-us", "r+");
+ static std::filebuf fb;
+ fb.open("assets/names_en-us",std::ios::in);
+ names = new std::istream(&fb);
+
crickets=Mix_LoadWAV("assets/sounds/crickets.wav");
//Mix_Volume(2,25);
@@ -427,7 +431,7 @@ int main(/*int argc, char *argv[]*/){
Mix_HaltMusic();
- fclose(names);
+ fb.close();
SDL_GL_DeleteContext(mainGLContext);
SDL_DestroyWindow(window);