From a0013c34c3ba8559d67d286c78978b054414ec26 Mon Sep 17 00:00:00 2001
From: PoloNX <geyrecharlie@gmail.com>
Date: Sat, 4 Jun 2022 17:52:47 +0200
Subject: [PATCH] commit for the release
---
icon.jpg | Bin 0 -> 5753 bytes
include/Cursor.hpp | 2 +-
source/cursor.cpp | 8 ++++++--
source/main.cpp | 17 ++++++++++++-----
source/menu.cpp | 2 +-
source/reboot.cpp | 9 ++++++---
6 files changed, 26 insertions(+), 12 deletions(-)
create mode 100644 icon.jpg
diff --git a/icon.jpg b/icon.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2a774d3eac3a7969ace32f300d13a08de7652ad9
GIT binary patch
literal 5753
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
OC2F|x5PV|yxcDCqa+uNp
literal 0
HcmV?d00001
diff --git a/include/Cursor.hpp b/include/Cursor.hpp
index 0e991fb..68b4da2 100644
--- a/include/Cursor.hpp
+++ b/include/Cursor.hpp
@@ -25,7 +25,7 @@ public:
void printCursor(RenderWindow render);
- bool checkInputCursor(int value);
+ int checkInputCursor(int value);
int getPosX(){
return posX;
diff --git a/source/cursor.cpp b/source/cursor.cpp
index 68cdb9d..af078ad 100644
--- a/source/cursor.cpp
+++ b/source/cursor.cpp
@@ -25,7 +25,7 @@ void Cursor::moveCursorX(bool right)
}
}
-bool Cursor::checkInputCursor(int value)
+int Cursor::checkInputCursor(int value)
{
std::cout << "dans check input\n";
@@ -79,7 +79,11 @@ bool Cursor::checkInputCursor(int value)
}
else if (line == 1 and column == 1){
- return true;
+ return 1;
+ }
+
+ else if (line == 1 and column == 0){
+ return 2;
}
}
diff --git a/source/main.cpp b/source/main.cpp
index 0c44450..e5df892 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -24,6 +24,7 @@ int main(int argc, char *argv[])
SDL_Event event;
int inputValue = -1;
+ int inputcheck = 0;
bool isOpen = true;
@@ -37,10 +38,15 @@ int main(int argc, char *argv[])
{
case SDL_JOYBUTTONDOWN:
inputValue = event.jbutton.button;
- if(cursor.checkInputCursor(inputValue))
+ inputcheck = cursor.checkInputCursor(inputValue);
+ if(inputcheck == 1)
{
menu.printAbout();
}
+ else if(inputcheck == 2)
+ {
+ isOpen = false;
+ }
default:
inputValue = -1;
@@ -56,14 +62,15 @@ int main(int argc, char *argv[])
cursor.printCursor(window);
-
-
-
window.display();
SDL_Delay(1000 / window.getRefreshRate());
}
+ SDL_Quit();
+ IMG_Quit();
+ TTF_Quit();
+ return 0;
}
void init()
@@ -83,7 +90,7 @@ void init()
if (!(TTF_Init()))
{
- std::cout << "HEY... IMG_Init HAS FAILED. SDL_ERROR: " << TTF_GetError() << std::endl;
+ std::cout << "HEY... TTF_Init HAS FAILED. SDL_ERROR: " << TTF_GetError() << std::endl;
}
std::cout << "after ttf\n";
diff --git a/source/menu.cpp b/source/menu.cpp
index c937577..5962522 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -70,7 +70,7 @@ void Menu::printMenu()
vEntityCursor.push_back(Entity (Vector2f(rectTemplate.x, rectTemplate.y), tHekate, 258, 258, 0, 0));
vEntityCursor.push_back(Entity (Vector2f(rectTemplate.x + rectTemplate.w + 14, rectTemplate.y), tAMS, 258, 258, 0, 0));
vEntityCursor.push_back(Entity (Vector2f(rectTemplate.x + (rectTemplate.w + 14) * 2, rectTemplate.y), tLockpick, 258, 258, 0, 0));
- vEntityCursor.push_back(Entity (Vector2f(rectTemplate.x + (rectTemplate.w + 14) * 3, rectTemplate.y), tLakka, 258, 258, 0, 0));
+ //vEntityCursor.push_back(Entity (Vector2f(rectTemplate.x + (rectTemplate.w + 14) * 3, rectTemplate.y), tLakka, 258, 258, 0, 0));
/*CIRCLE BEHIND SMALL ICONS*/
window.drawCircleBehindIcons();
diff --git a/source/reboot.cpp b/source/reboot.cpp
index dd94088..eb3c92a 100644
--- a/source/reboot.cpp
+++ b/source/reboot.cpp
@@ -72,9 +72,8 @@ std::string whichPayload(int payload)
return "payload/lockpick.bin";
}
- else if (payload == 3) //LAKKA
- {
- return "payload/lakka.rom";
+ else if (payload > 2){
+ return "null";
}
}
@@ -82,6 +81,10 @@ void Reboot::rebootNow(int payload) //0 = hekate, 1 = ams, 2 = lockpick, 3 = lak
{
Result rc = splInitialize();
+ if (whichPayload(payload) == "null"){
+ return;
+ }
+
FILE *f = fopen(whichPayload(payload).c_str(), "rb");
std::cout << "test\n";
--
GitLab