* Totaly rework typebox system

now work as user expect

* Adding posobolity to set length to win
* Totaly reworked system of cheching win

* Some small issues for better UX

Author: kolyaka32

src/baseGUI.cpp

@@ -252,23 +252,27 @@ void typeBox::writeString(char* str, bool freeData){
     }
 
     // Moving part after caret at end
-    for(Uint8 i = length; i > caret; --i){
+    for(Sint8 i = length; i >= caret; --i){
         buffer[i + clipboardSize] = buffer[i];
     }
 
     // Coping main clipboard text
-    strcpy_s(buffer + caret, clipboardSize, str);
+    for(Uint8 i=0; i < clipboardSize; ++i){
+        buffer[caret + i] = str[i];
+    }
+
+    length += clipboardSize;
+    caret += clipboardSize;
+
+    updateTexture();
 
     if(freeData){
         SDL_free(str);
     }
 };
 
-void typeBox::enterAction(SDL_TextEditingEvent code){
-
-}
-
-/*void typeBox::press(SDL_Keycode code){
+void typeBox::press(SDL_Keycode code){
+    static SDL_Keycode preCode;
     switch (code)
     {
     case SDLK_BACKSPACE:
@@ -280,6 +284,16 @@ void typeBox::enterAction(SDL_TextEditingEvent code){
             length--;
         }
         break;
+
+    case SDLK_DELETE:
+        // Coping after caret
+        if(caret < length){
+            for(Uint8 t = caret + 1; t <= length; t++){
+                buffer[t] = buffer[t+1];
+            }
+            length--;
+        }
+        break;
 
     case SDLK_LEFT:
         if(caret > 0){
@@ -288,43 +302,38 @@ void typeBox::enterAction(SDL_TextEditingEvent code){
         break;
 
     case SDLK_RIGHT:
-        if(caret < length-1){
+        if(caret+1 < length){
             swapChar(buffer + caret++, buffer + caret + 1);
         }
         break;
 
+    // Control-v mode
     case SDLK_PASTE:
         // Inserting text from clipboard
         writeString(SDL_GetClipboardText(), true);
         break;
-    
-    default:
-        // Checking if normal letter
-        if(code > 27 && code < 200){
-            // Checking, if letter can be placed
-            if(length < bufferSize){
-                // Copying all letters after caret
-                for(Uint8 t = ++length; t > caret; --t){
-                    buffer[t] = buffer[t-1];
-                }
-                // Setting new letter
-                buffer[caret++] = code;
-            }
+        
+    case SDLK_v:
+        if(preCode == SDLK_LCTRL){
+            writeString(SDL_GetClipboardText(), true);
         }
-    }
+        break;
 
+    case SDLK_LCTRL:
+        if(preCode == SDLK_v){
+            writeString(SDL_GetClipboardText(), true);
+        }
+        break;
+    };
     updateTexture();
+    preCode = code;
 };
-//*/
 
 void typeBox::select(){
-    /*buffer[length] = '|';
+    buffer[length] = '|';
     caret = length++;
     buffer[length] = '\0';
-    updateTexture();*/
-
-    // Setting rect for typing text
-    SDL_SetTextInputRect(&backRect);
+    updateTexture();
 
     // Starting using keyboard
     SDL_StartTextInput();
@@ -334,11 +343,17 @@ void typeBox::removeSelect(){
     // Stoping entering any letters
     SDL_StopTextInput();
 
-    /*for(Uint8 t = caret; t <= length; t++){
+    for(Uint8 t = caret; t <= length; t++){
         buffer[t] = buffer[t+1];
     }
     length--;
-    updateTexture();*/
+    updateTexture();
+};
+
+void typeBox::updateCaret(){
+    static char b[] = {' '};
+    swapChar(buffer + caret, b);
+    updateTexture();
 };
 
 bool typeBox::in(int x, int y){

src/baseGUI.hpp

@@ -124,9 +124,10 @@ namespace GUI{
         typeBox(Uint8 size, float posX, float posY, const char* startText = "", ALIGNMENT_types newAligment = MIDLE_text, SDL_Color newColor = BLACK);
         ~typeBox();
         void blit();
-        //void enterText(SDL_TextInputEvent code);
         void writeString(char* str, bool freeData);
-        void enterAction(SDL_TextEditingEvent code);
+        void press(SDL_Keycode code);
+        void updateCaret();
+        
         void select();
         void removeSelect();
         bool in(int mouseX, int mouseY);

src/entity.cpp

@@ -5,7 +5,7 @@
 #include "dataLoader.hpp"
 
 
-Field::Field(/* args */)
+Field::Field()
 {
     data = (Uint8*)malloc(sizeof(Uint8) * fieldWidth * fieldWidth);
     reset();
@@ -157,7 +157,7 @@ void Field::AImove(){
     //
     data[maxPos] = CELL_ENEMY;
 
-    //Checking for win
+    // Checking for win
     switch (checkWin(maxPos % fieldWidth, maxPos / fieldWidth))
     {
     case CELL_MY:
@@ -173,47 +173,69 @@ void Field::AImove(){
     }
 }
 
+// New checkWin function 
 // Return 0, if none win, 1, if win player, 2 if win bot(2 player)
-int Field::checkWin(coord X, coord Y){
-    Uint8 state = data[Y * fieldWidth];
-    for(coord x = 1; x < fieldWidth; ++x){
-        state &= data[Y * fieldWidth + x];
-    }
-    if(state){
-        return state;
-    }
+Uint8 Field::checkWin(const coord X, const coord Y){
+    // Flag, which save type for control win
+    Uint8 state;
+    // Finding first starting point for X
+    for(Uint8 startX = MAX(0, X - winWidth + 1); startX <= MIN(X, fieldWidth - winWidth); ++startX){
+        // Checking all line
+        state = CELL_MY | CELL_ENEMY;
 
-    state = data[X];
-    for(coord y = 1; y < fieldWidth; ++y){
-        state &= data[y * fieldWidth + X];
+        for(coord x = startX; (x < startX + winWidth) && state; ++x){
+            state &= data[Y * fieldWidth + x];
+        }
+
+        if(state){
+            return state;
+        }
     }
-    if(state){
-        return state;
+
+    // Finding same first starting point for Y
+    for(Uint8 startY = MAX(0, Y - winWidth + 1); startY <= MIN(Y, fieldWidth - winWidth); ++startY){
+        // Checking all collumn
+        state = CELL_MY | CELL_ENEMY;
+
+        for(coord y = startY; (y < startY + winWidth) && state; ++y){
+            state &= data[y * fieldWidth + X];
+        }
+
+        if(state){
+            return state;
+        }
     }
 
-    // Checking diagonal
-    if(X == Y){
-        state = data[0];
-        for(coord t = 1; t < fieldWidth; ++t){
-            state &= data[(fieldWidth + 1) * t];
+    // Checking primal diagonal
+    for(Uint8 startT = MAX(X - Y, 0); startT <= MIN(fieldWidth - winWidth, fieldWidth + X - Y - winWidth); ++startT){
+        state = CELL_MY | CELL_ENEMY;
+
+        for(Uint8 t = startT; (t < winWidth + startT) && state; ++t){
+            state &= data[t + (Y + t - X) * fieldWidth];
         }
         if(state){
             return state;
         }
     }
-    else if(fieldWidth - 1 == X + Y){
-        state = data[fieldWidth - 1];
-        for(coord t = fieldWidth; t > 1; --t){
-            state &= data[(fieldWidth - 1) * t];
+
+    // Checking second diagonal
+    for(Sint8 startT = MIN(X + Y, fieldWidth); startT+1 > MIN(winWidth, winWidth - X - Y); --startT){
+        state = CELL_MY | CELL_ENEMY;
+
+        for(Sint8 t = startT; (t > startT - winWidth); --t){
+            state &= data[X + Y + t * (fieldWidth-1)];
         }
         if(state){
             return state;
         }
     }
+
+    // Checking, is field full
     bool c = true;
     for(coord t=0; t < fieldWidth * fieldWidth; ++t){
-        if(!data[t]){
+        if(data[t] == CELL_EMPTY){
             c = false;
+            break;
         }
     }
     if(c){

src/entity.hpp

@@ -13,19 +13,19 @@ enum cellTypes{
 class Field
 {
 private:
-    Uint8 *data;  // type of cell in grid from cellTypes
-    Sint8 recSolve(Uint8 round);
+    Uint8 *data;  // Grid of cells type from cellTypes
+    Sint8 recSolve(Uint8 round);  // Function for solve game in singleplayer recursivly
 public:
-    Field(/* args */);
+    Field();
     ~Field();
     void reset();
 
-    void clickSingle(Uint8 x, Uint8 y);  // Clicking in singleplayer mode
-    void clickTwo(Uint8 x, Uint8 y);     // Clicking in two-player mode
-    void clickMulti(Uint8 x, Uint8 y, TCPsocket sendPlace);   // Clicking inmultiplayer mode
+    void clickSingle(Uint8 x, Uint8 y);                       // Clicking in singleplayer mode
+    void clickTwo(Uint8 x, Uint8 y);                          // Clicking in two-player mode
+    void clickMulti(Uint8 x, Uint8 y, TCPsocket sendPlace);   // Clicking in multiplayer mode
 
     void AImove();
-    int checkWin(Uint8 X, Uint8 Y);
+    Uint8 checkWin(const Uint8 X, const Uint8 Y);
 
     void blit();
 };