afegida persistencia i fuck yamal

2026-04-04 13:00:02 +02:00
parent 08ba88ec05
commit 6a09d7219d
9 changed files with 15021 additions and 98 deletions
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1,80 +1,67 @@
-#include "core/jgame.hpp"
-#include "core/jdraw8.hpp"
-#include "core/jail_audio.hpp"
-#include "core/jfile.hpp"
-#include "game/info.hpp"
-#include "game/modulegame.hpp"
-#include "game/modulesequence.hpp"
-#include <ctime>
-#include <string>
-
-/*
-#ifndef WIN32
-#include <libgen.h>
-#endif
-*/
-
-int main( int argc, char* args[] ) {
-
-	//file_setresourcefilename("data.jrf");
-/*#ifdef WIN32
-	JF_SetResourceFile("data.jrf");
-#else
-	char res_file[255] = "";
-	strcpy(res_file, dirname(args[0]));
-#ifdef __APPLE__
-    strcat(res_file, "/../Resources/data.jrf");
-#else
-    strcat(res_file, "/data.jrf");
-#endif
-	printf("ARXIU DE RECURSOS: %s\n", res_file);
-	JF_SetResourceFile(res_file);
-#endif
-*/
-	srand( unsigned(time(NULL)) );
-
-	JG_Init();
-	JD8_Init("Aventures En Egipte");
-	JA_Init(48000, SDL_AUDIO_S16, 2);
-
-	info::num_habitacio = 1;
-	info::num_piramide = 255;
-	info::diners = 0;
-	info::diamants = 0;
-	info::vida = 5;
-	info::momies = 0;
-	info::nou_personatge = false;
-	info::pepe_activat = false;
-
-	FILE* ini = fopen("trick.ini", "rb");
-	if (ini != NULL) {
-		info::nou_personatge = true;
-		fclose(ini);
-	}
-
-	int gameState = 1;
-
-	while (gameState != -1) {
-		switch (gameState) {
-			case 0:
-				ModuleGame* moduleGame;
-				moduleGame = new ModuleGame();
-				gameState = moduleGame->Go();
-				delete moduleGame;
-				break;
-			case 1:
-				ModuleSequence* moduleSequence;
-				moduleSequence = new ModuleSequence();
-				gameState = moduleSequence->Go();
-				delete moduleSequence;
-				break;
-		}
-	}
-
-	JA_Quit();
-	JD8_Quit();
-	JG_Finalize();
-
-	return 0;
-}
-
+#include "core/jgame.hpp"
+#include "core/jdraw8.hpp"
+#include "core/jail_audio.hpp"
+#include "core/jfile.hpp"
+#include "game/defines.hpp"
+#include "game/info.hpp"
+#include "game/modulegame.hpp"
+#include "game/modulesequence.hpp"
+#include "game/options.hpp"
+#include <ctime>
+#include <string>
+
+int main( int argc, char* args[] ) {
+
+	srand( unsigned(time(NULL)) );
+
+	// Crea la carpeta de configuració i carrega les opcions
+	file_setconfigfolder("jailgames/aee");
+	Options::setConfigFile(std::string(file_getconfigfolder()) + "config.yaml");
+	Options::loadFromFile();
+
+	JG_Init();
+	JD8_Init(Texts::WINDOW_TITLE);
+	JA_Init(48000, SDL_AUDIO_S16, 2);
+
+	info::num_habitacio = Options::game.habitacio_inicial;
+	info::num_piramide = Options::game.piramide_inicial;
+	info::diners = 0;
+	info::diamants = 0;
+	info::vida = Options::game.vides;
+	info::momies = 0;
+	info::nou_personatge = false;
+	info::pepe_activat = false;
+
+	FILE* ini = fopen("trick.ini", "rb");
+	if (ini != NULL) {
+		info::nou_personatge = true;
+		fclose(ini);
+	}
+
+	int gameState = 1;
+
+	while (gameState != -1) {
+		switch (gameState) {
+			case 0:
+				ModuleGame* moduleGame;
+				moduleGame = new ModuleGame();
+				gameState = moduleGame->Go();
+				delete moduleGame;
+				break;
+			case 1:
+				ModuleSequence* moduleSequence;
+				moduleSequence = new ModuleSequence();
+				gameState = moduleSequence->Go();
+				delete moduleSequence;
+				break;
+		}
+	}
+
+	Options::saveToFile();
+
+	JA_Quit();
+	JD8_Quit();
+	JG_Finalize();
+
+	return 0;
+}