Fixed saving unlocked tracks and levels

Author: ohol-vitaliy

src/MenuManager.cpp

@@ -21,7 +21,7 @@ class IGameMenuElement;
 
 class MenuManager : public IMenuManager {
 private:
-    std::vector<int8_t> field_278;
+    std::vector<int8_t> savedData;
     Micro* micro;
     RecordManager* recordManager;
     Command* commandOk;
@@ -82,11 +82,11 @@ class MenuManager : public IMenuManager {
     int field_338;
     int field_339;
     std::string field_340;
-    char* field_341;
-    char field_342[4];
-    char defaultInputString[4] = "AAA";
+    char* playerName;
+    char availableTracks[4];
+    char defaultName[4] = "AAA";
     int8_t availableLeagues = 0;
-    int8_t field_344 = 0;
+    int8_t availableLevels = 0;
     std::vector<int> field_345 = { 0, 0, 0 };
     std::vector<std::vector<std::string>> levelNames;
     std::vector<std::string> leagueNames = std::vector<std::string>(3);
@@ -123,8 +123,8 @@ class MenuManager : public IMenuManager {
     void fillCanvasWithImage(Graphics* graphics);
     void processNonFireKeyCode(int keyCode);
     std::vector<int8_t> method_216(int var1, int8_t var2);
-    int8_t method_217(int var1, int8_t var2);
-    void copyThreeBytesFromArr(int var1, char* var2);
+    int8_t getSettingOrDefault(int var1, int8_t var2);
+    // void copyThreeBytesFromArr(int var1, char* var2);
     std::string timeToString(int64_t time);
     void setValue(int pos, int8_t value);
     void exit();

src/MenuManager.h

@@ -40,7 +40,6 @@ void RecordManager::method_8(int var1, int var2)
         }
 
         loadRecordInfo(var4);
-        recordEnum->destroy();
     }
 }
 
@@ -161,13 +160,17 @@ void RecordManager::writeRecordInfo()
         try {
             packedRecordInfoRecordId = recordStore->addRecord(packedRecordInfo, 0, 96);
         } catch (RecordStoreNotOpenException& var1) {
+            return;
         } catch (RecordStoreException& var2) {
+            return;
         }
     } else {
         try {
             recordStore->setRecord(packedRecordInfoRecordId, packedRecordInfo, 0, 96);
         } catch (RecordStoreNotOpenException& var3) {
+            return;
         } catch (RecordStoreException& var4) {
+            return;
         }
     }
 }
@@ -220,6 +223,7 @@ void RecordManager::deleteRecordStores()
                 // RecordStore *var10000 = recordStore;
                 RecordStore::deleteRecordStore(names[i]);
             } catch (RecordStoreException& var3) {
+                return;
             }
         }
     }
@@ -232,6 +236,7 @@ void RecordManager::closeRecordStore()
             recordStore->closeRecordStore();
             return;
         } catch (RecordStoreException& var1) {
+            return;
         }
     }
 }

src/RecordManager.cpp

@@ -28,20 +28,20 @@ CanvasImpl::CanvasImpl(Canvas* canvas)
         0,
         SDL_WINDOWPOS_UNDEFINED,
         SDL_WINDOWPOS_UNDEFINED,
-        width, height,
+        defaultWidth, defaultHeight,
         SDL_WINDOW_SHOWN);
 
     if (!window) {
         throw std::runtime_error(SDL_GetError());
     }
 
-    renderer = SDL_CreateRenderer(
-        window, -1, SDL_RENDERER_ACCELERATED);
+    renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
 
     if (!renderer) {
         throw std::runtime_error(SDL_GetError());
     }
 
+    SDL_GetRendererOutputSize(renderer, &windowWidth, &windowHeight);
     SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
     SDL_RenderClear(renderer);
 }
@@ -62,12 +62,20 @@ void CanvasImpl::repaint()
 
 int CanvasImpl::getWidth()
 {
-    return width;
+    if (windowWidth < 0) {
+        return defaultWidth;
+    }
+
+    return windowWidth;
 }
 
 int CanvasImpl::getHeight()
 {
-    return height;
+    if (windowHeight < 0) {
+        return defaultHeight;
+    }
+
+    return windowHeight;
 }
 
 SDL_Renderer* CanvasImpl::getRenderer()

src/lcdui/CanvasImpl.cpp

@@ -10,14 +10,17 @@ class Canvas;
 
 class CanvasImpl {
 private:
+    const int defaultWidth = 640;
+    const int defaultHeight = 480;
+
+    int windowWidth = -1;
+    int windowHeight = -1;
+
     Canvas* canvas;
 
     SDL_Window* window;
     SDL_Renderer* renderer;
 
-    const int width = 640;
-    const int height = 480;
-
     static int convertKeyCharToKeyCode(SDL_Keycode keyCode);
 
 public:

src/lcdui/CanvasImpl.h

@@ -36,6 +36,7 @@ void RecordEnumerationImpl::setRecord(int index, std::vector<int8_t> bytes)
     if (static_cast<int>(data.size()) <= index) {
         throw RecordStoreException();
     }
+
     data[index] = bytes;
 }
 
@@ -49,6 +50,7 @@ int RecordEnumerationImpl::nextRecordId()
     if (currentPos >= static_cast<int>(data.size())) {
         throw RecordStoreException();
     }
+
     return currentPos;
 }
 
@@ -65,6 +67,7 @@ void RecordEnumerationImpl::serialize(FileStream* outStream)
 
     for (auto i = data.cbegin(); i != data.cend(); i++) {
         outStream->writeVariable(&(temp = i->size()));
+
         for (auto j = i->cbegin(); j != i->cend(); j++) {
             int8_t buffer;
             outStream->writeVariable(&(buffer = *j));
@@ -82,6 +85,7 @@ void RecordEnumerationImpl::deserialize(FileStream* inStream)
     for (size_t i = 0; i < data.size(); ++i) {
         inStream->readVariable(&temp);
         data[i].resize(temp);
+
         for (size_t j = 0; j < data[i].size(); ++j) {
             inStream->readVariable(&data[i][j]);
         }

src/rms/RecordEnumerationImpl.cpp

@@ -40,10 +40,11 @@ void RecordStore::closeRecordStore()
 
 int RecordStore::addRecord(std::vector<int8_t> arr, int offset, int numBytes)
 {
-    log("addRecord()");
+    log("addRecord(" + std::to_string(arr.size()) + "," + std::to_string(offset) + "," + std::to_string(numBytes) + ")");
     assert(static_cast<int>(arr.size()) == numBytes);
     assert(offset == 0);
     int id = records->addRecord(arr);
+    log("record id = " + std::to_string(id));
     save();
     return id;
 }
@@ -72,6 +73,8 @@ RecordEnumerationImpl* RecordStore::load(std::filesystem::path filePath)
 
 RecordStore* RecordStore::openRecordStore(std::string name, bool createIfNecessary)
 {
+    log("openRecordStore(" + name + ", " + std::to_string(createIfNecessary) + ")");
+
     if (opened.find(name) == opened.end()) {
         opened[name] = createRecordStore(name, createIfNecessary);
     }
@@ -95,6 +98,7 @@ std::unique_ptr<RecordStore> RecordStore::createRecordStore(std::string name, bo
         rs->save();
         return rs;
     } else {
+        log("can't create record, file is missing");
         throw RecordStoreException();
     }
 }