git repos / blockattack-game

commit 2824f1ad

sago007 · 2016-01-09 22:34
2824f1adedcd4d57e0e03507e737e14483812436 patch · browse files
parent 08ba0318c9bb99ee028f827325dc4e9bf5fe80df 

Moved more to os.cpp

Changed files

M .gitignore before
M source/code/main.cpp before
M source/code/os.cpp before
M source/code/os.hpp before
diff --git a/.gitignore b/.gitignore index 2b5bb0c..2e20859 100644 --- a/.gitignore +++ b/.gitignore
@@ -8,3 +8,5 @@ nbproject
.*
-.travis.yml
-.gitignore
+*.patch
+Game/blockattack*
diff --git a/source/code/main.cpp b/source/code/main.cpp index b42790e..050e0d9 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp
@@ -1498,12 +1498,8 @@ void DrawEverything(int xsize, int ysize,BlockGameSdl* theGame, BlockGameSdl* th
Ticks = SDL_GetTicks();
}
- //NFont_Write(screen, 800,4,FPS);
nf_standard_blue_font.draw(screen, 800, 4, "%s", FPS);
#endif
-
- //SDL_RenderPresent(screen); Update screen is now called outside DrawEvrything, bacause the mouse needs to be painted
-
}
//The function that allows the player to choose PuzzleLevel
@@ -1782,30 +1778,7 @@ static void StartTwoPlayerVs() {
//The main function, quite big... too big
int main(int argc, char* argv[]) {
- //We first create the folder there we will save (only on UNIX systems)
- //we call the external command "mkdir"... the user might have renamed this, but we hope he hasn't
-#if defined(__unix__)
- //Compiler warns about unused result. The users envisonment should normally give the user all the information he needs
- if (system("mkdir -p ~/.gamesaves/blockattack/screenshots")) {
- cerr << "mkdir error creating ~/.gamesaves/blockattack/screenshots" << endl;
- }
- if (system("mkdir -p ~/.gamesaves/blockattack/replays")) {
- cerr << "mkdir error creating ~/.gamesaves/blockattack/replays" << endl;
- }
- if (system("mkdir -p ~/.gamesaves/blockattack/puzzles")) {
- cerr << "mkdir error creating ~/.gamesaves/blockattack/puzzles" << endl;
- }
-#elif defined(_WIN32)
- //Now for Windows NT/2k/xp/2k3 etc.
- string tempA = getMyDocumentsPath()+"\\My Games";
- CreateDirectory(tempA.c_str(),nullptr);
- tempA = getMyDocumentsPath()+"\\My Games\\blockattack";
- CreateDirectory(tempA.c_str(),nullptr);
- tempA = getMyDocumentsPath()+"\\My Games\\blockattack\\replays";
- CreateDirectory(tempA.c_str(),nullptr);
- tempA = getMyDocumentsPath()+"\\My Games\\blockattack\\screenshots";
- CreateDirectory(tempA.c_str(),nullptr);
-#endif
+ OsCreateFolders();
highPriority = false; //if true the game will take most resources, but increase framerate.
bFullscreen = false;
//Set default Config variables:
diff --git a/source/code/os.cpp b/source/code/os.cpp index 56562f0..1a7a567 100644 --- a/source/code/os.cpp +++ b/source/code/os.cpp
@@ -136,4 +136,32 @@ std::string getPuzzleSetSavePath() {
ret = "puzzle.levels.save";
#endif
return ret;
+}
+
+void OsCreateFolders() {
+ //We first create the folder there we will save (only on UNIX systems)
+ //we call the external command "mkdir"... the user might have renamed this, but we hope he hasn't
+
+#if defined(__unix__)
+ //Compiler warns about unused result. The users envisonment should normally give the user all the information he needs
+ if (system("mkdir -p ~/.gamesaves/blockattack/screenshots")) {
+ cerr << "mkdir error creating ~/.gamesaves/blockattack/screenshots" << endl;
+ }
+ if (system("mkdir -p ~/.gamesaves/blockattack/replays")) {
+ cerr << "mkdir error creating ~/.gamesaves/blockattack/replays" << endl;
+ }
+ if (system("mkdir -p ~/.gamesaves/blockattack/puzzles")) {
+ cerr << "mkdir error creating ~/.gamesaves/blockattack/puzzles" << endl;
+ }
+#elif defined(_WIN32)
+ //Now for Windows NT/2k/xp/2k3 etc.
+ string tempA = getMyDocumentsPath()+"\\My Games";
+ CreateDirectory(tempA.c_str(),nullptr);
+ tempA = getMyDocumentsPath()+"\\My Games\\blockattack";
+ CreateDirectory(tempA.c_str(),nullptr);
+ tempA = getMyDocumentsPath()+"\\My Games\\blockattack\\replays";
+ CreateDirectory(tempA.c_str(),nullptr);
+ tempA = getMyDocumentsPath()+"\\My Games\\blockattack\\screenshots";
+ CreateDirectory(tempA.c_str(),nullptr);
+#endif
}
\ No newline at end of file
diff --git a/source/code/os.hpp b/source/code/os.hpp index dfe6dab..a0579a6 100644 --- a/source/code/os.hpp +++ b/source/code/os.hpp
@@ -36,4 +36,6 @@ std::string getPathToHighscoresEndless();
std::string getPathToHighscoresTimetrial();
std::string getStageClearSavePath();
-std::string getPuzzleSetSavePath();
\ No newline at end of file
+std::string getPuzzleSetSavePath();
+
+void OsCreateFolders();
\ No newline at end of file