diff --git a/Game/themes/default b/Game/themes/default new file mode 100644 index 0000000..d758df1 --- /dev/null +++ b/Game/themes/default @@ -0,0 +1,5 @@ +This is an empty file + +It needs to be here so the theme 'default' can be selected from the menu + +Custom themes should be placed as directories next to this file diff --git a/source/code/BlockGame.hpp b/source/code/BlockGame.hpp index e4aea52..da9ac47 100644 --- a/source/code/BlockGame.hpp +++ b/source/code/BlockGame.hpp @@ -1574,7 +1574,7 @@ public: } //The AI will try to clear block horisontally - inline void AI_ClearHori() { + void AI_ClearHori() { // cout << "AI: ClearHori"; int lowestLine = AIlineToClear; //AIcolorToClear @@ -1689,6 +1689,9 @@ public: if (placeToCenter>5) placeToCenter=0; } + if(unlimitedLoop>9) { + AIstatus = 0; + } //cout << ", ptc: " << placeToCenter << ", line: " << AIlineToClear << ", cy: " << cursory; if (cursory+1>AIlineToClear+2) { // cout << ", cursory>line+2"; @@ -2135,7 +2138,7 @@ public: int currentCounter = (SDL_GetTicks()-(int)gameStartedAt)/1000; if(currentCounter!=lastCounter) { - if(currentCounter>117 && currentCounter<120) + if(currentCounter>115 && currentCounter<120) Mix_PlayChannel(1,counterChunk,0); } lastCounter = currentCounter; diff --git a/source/code/main.cpp b/source/code/main.cpp index d464f42..1af4603 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp @@ -212,9 +212,9 @@ void loadTheme(string themeName) CONVERTA(bConfigure); reloadIMG(&bSelectPuzzle,themeName+"/bSelectPuzzle.png"); CONVERTA(bSelectPuzzle); - reloadIMG(&bReplay,themeName+"/bReplay.png"); + reloadIMG(&bReplay,themeName+"/bReplays.png"); CONVERTA(bReplay); - reloadIMG(&bReplay,themeName+"/bSave.png"); + reloadIMG(&bSave,themeName+"/bSave.png"); CONVERTA(bSave); reloadIMG(&bLoad,themeName+"/bLoad.png"); CONVERTA(bLoad);