Merge pull request #2 from kolyaka32/Other-libraries-test

Repair archive work, black screen after system

Author: kolyaka32

.gitignore

@@ -14,8 +14,12 @@ i686-w64-mingw32/
 x86_64-w64-mingw32/
 
 # New include libraries
+bin/
+cmake/
+debug/
 lib/
 include/
+share/
 
 # Prerequisites
 *.d
@@ -50,7 +54,7 @@ include/
 *.out
 *.app
 
-# Archieves
+# Archives
 *.7z
 *.zip
 

CMakeLists.txt

@@ -40,8 +40,24 @@ add_executable( base
     src/set.rc
 )
 # Setting static dlls
+
 set(CMAKE_CXX_STANDARD_LIBRARIES "-static-libgcc -static-libstdc++ -lwsock32 -lws2_32 -mwindows ${CMAKE_CSS_STANDARD_LIBRARIES}")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive")
+#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive")
+set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+
+# Static?
+#set(STATIC_LIB lib_static)
+#set(SHARE_LIB lib_share)
+
+#set(STATIC_OTHER_LIB lib_otherstatic)
+#set(SHARE_OTHER_LIB lib_othershare)
+
+#set_target_properties(base PROPERTIES LINK_SEARCH_START_STATIC 1)
+#set_target_properties(base PROPERTIES LINK_SEARCH_END_STATIC 1)
+#set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+
+#add_library(${STATIC_LIB} STATIC ${STATIC_LIB}.cpp)
+#add_library(${SHARE_LIB} SHARED ${SHARE_LIB}.cpp)
 
 # Including external libraries
 set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -53,20 +69,14 @@ find_package(SDL2_image REQUIRED)
 find_package(SDL2_ttf REQUIRED)
 find_package(SDL2_mixer REQUIRED)
 # Including libzip
-set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/cmake")
-find_package(libzip REQUIRED)
+set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/share")
+find_package(libzip CONFIG REQUIRED)
 
 # Including external included directories
-target_include_directories( base
-    PUBLIC ${SDL2_INCLUDE_DIRS}
-    PUBLIC ${SDL2_image_INCLUDE_DIRS}
-    PUBLIC ${SDL2_ttf_config_path}
-    PUBLIC ${SDL2_mixer_config_path}
-    PUBLIC &{libzip_INCLUDE_DIRS}
-)
+include_directories(${SDL2_INCLUDE_DIRS})
 
 # Including linked libraries
-target_link_libraries(base PUBLIC ${SDL2_LIBRARIES} SDL2_image::SDL2_image mingw32)
-target_link_libraries(base PUBLIC ${SDL2_LIBRARIES} SDL2_ttf::SDL2_ttf mingw32)
-target_link_libraries(base PUBLIC ${SDL2_LIBRARIES} SDL2_mixer::SDL2_mixer mingw32)
-target_link_libraries(base PUBLIC ${libzip_LIBRARIES} libzip::zip)
+target_link_libraries(base PRIVATE ${SDL2_LIBRARIES} SDL2_image::SDL2_image mingw32)
+target_link_libraries(base PRIVATE SDL2_ttf::SDL2_ttf mingw32)
+target_link_libraries(base PRIVATE SDL2_mixer::SDL2_mixer mingw32)
+target_link_libraries(base PRIVATE libzip::zip)

build/img/none.png

@@ -1,7 +1,7 @@
-language = english
-music = 64
-effects = 64
-maxScore = 0
+language = russian
+music = 105
+effects = 71
+maxScore = 40
 FPS = 60
 width = 16
 height = 20

build/out.bmp

@@ -5,7 +5,7 @@
 #include "baseHud.hpp"
 
 // Function of creating font
-TTF_Font* createFont(int size){
+static TTF_Font* createFont(int size){
     SDL_RWops* fontData = SDL_RWFromMem(fontMemory, fontSize);
     return TTF_OpenFontRW(fontData, 1, size);
 };
@@ -50,6 +50,7 @@ void dinamicText::draw(std::string text, const ALIGNMENT_types alignment, SDL_Co
     SDL_RenderCopy(app.renderer, Texture, NULL, &Rect);
 };
 
+
 // Slider class
 Slider::Slider(int y, IMG_names lineImage, IMG_names buttonImage){
     textureLine = Textures[lineImage];
@@ -76,6 +77,7 @@ int Slider::getX(){
     return destLine.x;
 };
 
+
 // Button class
 Button::Button(int x, int y, IMG_names textureIndex){
     texture = Textures[textureIndex];

build/settings.ini

@@ -12,7 +12,7 @@ enum ALIGNMENT_types{
 };
 
 // Function of creating font with need height
-TTF_Font* createFont(int size);
+static TTF_Font* createFont(int size);
 
 // Static text on screen with drawing functions
 class staticText
@@ -23,7 +23,7 @@ class staticText
     SDL_Texture *Texture = NULL;
     SDL_Rect Rect;
 public:
-    void set(std::string text, int size, int x, int y, ALIGNMENT_types alignment = MIDLE_text, SDL_Color color = BLACK);
+    void set(std::string text, int size, int x, int y, ALIGNMENT_types alignment = MIDLE_text, SDL_Color color = WHITE);
     void draw();
     void clear();
 };

src/baseHud.cpp

@@ -8,34 +8,34 @@
 #include "dataLoader.hpp"
 
 // Arcieve local structs
-zip_t* archieve;  // Archieve with all data
+static zip_t* archive;  // Archive with all data
 
 // Counters of loaded files
 static Uint8 loadedImages;
 static Uint8 loadedAnimations;
 static Uint8 loadedMusics;
 static Uint8 loadedSounds;
 
-// Function of open archieve and setting base password
-zip_t* openArchieve(std::string archieveName){
-    // Open archieve with need name
-    archieve = zip_open(archieveName.std::string::c_str(), ZIP_RDONLY, NULL);
+// Function of open archive and setting base password
+zip_t* openarchive(std::string archiveName){
+    // Open archive with need name
+    archive = zip_open(archiveName.std::string::c_str(), ZIP_RDONLY, NULL);
 
     #if PASSWORD
-    zip_set_default_password(archieve, PASSWORD);
+    zip_set_default_password(archive, PASSWORD);
     #endif
 
-    // Returning archieve for checking correction
-    return archieve;
+    // Returning archive for checking correction
+    return archive;
 };
 
-// Function of getting data of archieve file
-static inline SDL_RWops* dataFromArchieve(const char* name){
+// Function of getting data of archive file
+static inline SDL_RWops* dataFromarchive(const char* name){
     // Openning need file
-    zip_file_t* file = zip_fopen_encrypted(archieve, name, 0, PASSWORD);
+    zip_file_t* file = zip_fopen_encrypted(archive, name, 0, PASSWORD);
 
     zip_stat_t st;
-	zip_stat(archieve, name, 0, &st);  // Getting data of current file
+	zip_stat(archive, name, 0, &st);  // Getting data of current file
     // Checking correction of file
     if(st.size == 0){  
         return NULL;
@@ -56,7 +56,7 @@ static inline SDL_RWops* dataFromArchieve(const char* name){
 // Function of loading game icone
 static unsigned loadIcone(const char* name){
     // Getting icone data
-    SDL_RWops* tempRW = dataFromArchieve(name);
+    SDL_RWops* tempRW = dataFromarchive(name);
 
     // Setting window icone
     SDL_Surface* iconeImage = IMG_LoadICO_RW(tempRW);
@@ -72,7 +72,7 @@ static unsigned loadIcone(const char* name){
 // Functions of loading selected image file
 static void loadPicture(const char* name, IMG_names number){
     // Getting selected picture data
-    SDL_RWops* tempRW = dataFromArchieve(name);
+    SDL_RWops* tempRW = dataFromarchive(name);
     // Creating texture from data
     Textures[number] = SDL_CreateTextureFromSurface(app.renderer, IMG_LoadPNG_RW(tempRW));
     SDL_RWclose(tempRW);
@@ -86,7 +86,7 @@ static void loadPicture(const char* name, IMG_names number){
 // Function of loading selected GIF animation
 static void loadAnimation(const char* name, ANI_names number){
     // Getting selected animation data
-    SDL_RWops* tempRW = dataFromArchieve(name);
+    SDL_RWops* tempRW = dataFromarchive(name);
     // Creating animation from data
     Animations[number] = IMG_LoadAnimation_RW(tempRW, 0);
     SDL_RWclose(tempRW);
@@ -100,7 +100,7 @@ static void loadAnimation(const char* name, ANI_names number){
 // Function of loading selected music file
 static void loadMusic(const char* name, MUS_names number){
     // Getting selected music track data
-    SDL_RWops* tempRW = dataFromArchieve(name);
+    SDL_RWops* tempRW = dataFromarchive(name);
     // Creating music track from data
     Musics[number] = Mix_LoadMUSType_RW(tempRW, MUS_MP3, 0);
     //Animations[number] = IMG_LoadAnimation_RW(tempRW, 1);
@@ -115,7 +115,7 @@ static void loadMusic(const char* name, MUS_names number){
 // Function of loading selected sound
 static void loadSound(const char* name, SND_names number){
     // Getting selected sound data
-    SDL_RWops* tempRW = dataFromArchieve(name);
+    SDL_RWops* tempRW = dataFromarchive(name);
     // Creating sound from data
     Sounds[number] = Mix_LoadWAV_RW(tempRW, 0);
     //Animations[number] = IMG_LoadAnimation_RW(tempRW, 1);
@@ -130,10 +130,10 @@ static void loadSound(const char* name, SND_names number){
 // Function of loading font
 static unsigned loadFont(const char* name){
     // Openning font file
-    zip_file_t* file = zip_fopen_encrypted(archieve, name, 0, PASSWORD);
+    zip_file_t* file = zip_fopen_encrypted(archive, name, 0, PASSWORD);
 
     zip_stat_t st;
-	zip_stat(archieve, name, 0, &st);  // Getting data from file
+	zip_stat(archive, name, 0, &st);  // Getting data from file
     // Checking correction of file
     if(st.size == 0){  
         return 0;
@@ -165,7 +165,6 @@ static unsigned loadAllImages(){
     // Game background
     loadPicture("img/kletka_svet.png", IMG_BACK_LIGHT);
     loadPicture("img/kletka_tyma.png", IMG_BACK_DARK);
-    loadPicture("img/none.png", IMG_BACK);
     // Game sprites
     // Eatable objects
     loadPicture("img/Apple.png", IMG_APPLE);
@@ -215,13 +214,13 @@ static unsigned loadAllSounds(){
 };
 
 void loadData(std::string fileName){
-    // Opening archieve
-    if(openArchieve(fileName) == NULL){
+    // Opening archive
+    if(openarchive(fileName) == NULL){
         printf("Can't load arcieve");
         exit(ERR_FIL_OPN);
     }  
 
-    // Loading data from archieve
+    // Loading data from archive
     if(loadIcone("img/Game.ico") != ICO_count){
         printf("Can't load game icone");
         exit(ERR_FIL_ICO);
@@ -247,7 +246,8 @@ void loadData(std::string fileName){
         exit(ERR_FIL_FNT);
     }
 
-    zip_close(archieve);  // Closing archieve
+    // Closing archive
+    zip_close(archive);
 }
 
 // Function of clearing all temporary data, loaded from arcieve

src/baseHud.hpp

@@ -10,8 +10,8 @@ void loadData(std::string fileName);
 // Function of clearing all temporary data, loaded from arcieve
 void unloadData();
 
-// Archieve values
-#define PASSWORD NULL  // Archieve password
+// Archive values
+#define PASSWORD NULL  // Archive password
 
 // Used numerated numbers
 #define ICO_count 1  // Number of icones for better count
@@ -31,7 +31,6 @@ enum IMG_names{
     // Game background
     IMG_BACK_LIGHT,
     IMG_BACK_DARK,
-    IMG_BACK,
     // Game sprites
     IMG_APPLE,
     IMG_POTATO,

src/dataLoader.cpp

@@ -1,8 +1,5 @@
 #pragma once
 
-// Extra modifications for game
-//#define MEME_MOD true  // Activate meme include mode
-
 // System numbers
 #define WINDOWNAME "Snake on SDL"
 #define GAME_WIDTH gridX * CELL_SIDE
@@ -21,7 +18,7 @@
 // Base game colors
 #define BLACK {0, 0, 0, 255}
 #define WHITE {255, 255, 255, 255}
-#define BACKGROUND_COLOR {0, 255, 0, 255}
+#define BACKGROUND_COLOR 0, 150, 0, 255
 
 // Names of directions and they numbers
 enum direction{

src/dataLoader.hpp

@@ -24,7 +24,7 @@ int Entity::getPos(){
 };
 
 
-// Head class
+// Head (player) class
 void Head::reset(){
     init(gridX/2, gridY/2 + START_WIDTH, IMG_HEAD_STRAIGHT);
     vec = UP; 
@@ -65,18 +65,20 @@ int Head::move(){
     // Detecting exiting grid
     if(x < 0 || x >= gridX || y < 0 || y >= gridY){
         game_over = true;
+        loosing = true;
         return -1;
     }
     // Detecting collision with snake
     int coord = y*gridX+x;
     for(int i=0; i < length; ++i){
         if(i != position && coord == TileArray[i].getPos()){
             game_over = true;
+            loosing = true;
             return -2;
         }
     }
     // Detecting collision with apple
-    if(y*gridX + x == Apple.getPos()){
+    if(getPos() == Apple.getPos()){
         Apple.FindLocation();  // Getting new location of apple
         length++;
         score += ADD_SCORE;
@@ -103,16 +105,7 @@ int Head::move(){
 
 void Head::blit(){
     SDL_QueryTexture(texture, NULL, NULL, &dest.w, &dest.h);
-    // 
-    if(vec == newVec){
-        SDL_RenderCopyEx( app.renderer, Textures[IMG_HEAD_STRAIGHT], NULL, &dest, vec*90, NULL, SDL_FLIP_NONE );
-    }
-    else if(newVec - vec  == -1 || newVec - vec == 3){
-        SDL_RenderCopyEx( app.renderer, Textures[IMG_HEAD_LEFT], NULL, &dest, 270 + vec*90, NULL, SDL_FLIP_NONE );
-    }
-    else if(newVec - vec == 1 || newVec - vec == -3){
-        SDL_RenderCopyEx( app.renderer, Textures[IMG_HEAD_RIGHT], NULL, &dest, 90 + vec*90, NULL, SDL_FLIP_NONE );
-    }
+    SDL_RenderCopyEx( app.renderer, Textures[IMG_HEAD_LEFT + (5 + newVec - vec) % 4], NULL, &dest,  newVec*90, NULL, SDL_FLIP_NONE );
 };
 
 

src/define.hpp

@@ -6,4 +6,3 @@
 #include "SDL_image.h"
 #include "SDL_mixer.h"
 #include "SDL_ttf.h"
-

src/entity.cpp

@@ -1,6 +1,5 @@
 #include "stdio.h"
 #include "include.hpp"
-#include "define.hpp"
 #include "structs.hpp"
 
 #include "init.hpp"
@@ -50,17 +49,19 @@ void createVideo(){
     }
 }
 
+// Function of deleting window and renders
 void deleteVideo(){
+    Mix_CloseAudio();                   // Closing audio library
 	SDL_DestroyRenderer(app.renderer);  // Destroying renderer
-	SDL_DestroyWindow(app.window);  // Destrying window
-    Mix_CloseAudio();
+	SDL_DestroyWindow(app.window);      // Destrying window
 }
 
+// Function of closing all outside libraries and files
 void exitLibraries(){
     // Closing all outside libraries
     Mix_CloseAudio();  // Closing audio player
-    Mix_Quit();  // Closing mixer player
-	TTF_Quit();  // Closing font library
-    IMG_Quit();  // Closing image library
-    SDL_Quit();  // Closing main sdl library
+    Mix_Quit();        // Closing mixer player
+	TTF_Quit();        // Closing font library
+    IMG_Quit();        // Closing image library
+    SDL_Quit();        // Closing main sdl library
 }