Revert "Merge branch 'development' into GPLoop-amanXSimon-CGPA"

This reverts commit 68d05b3, reversing changes made to 6ea5d5a.
MSU-CSE491 · Nov 28, 2023 · 39f33cb · 39f33cb
1 parent 68d05b3
commit 39f33cb
Show file tree

Hide file tree

Showing 31 changed files with 176 additions and 2,766 deletions.
diff --git a/assets/Ground_tiles/dirt.png b/assets/Ground_tiles/dirt.png
diff --git a/assets/walls/gray_wall.png b/assets/walls/gray_wall.png
diff --git a/blogposts/Kanagaraj/Blog_Final.html b/blogposts/Kanagaraj/Blog_Final.html
diff --git a/blogposts/Kanagaraj/DRAFT.html b/blogposts/Kanagaraj/DRAFT.html
diff --git a/blogposts/Kanagaraj/images/image1.png b/blogposts/Kanagaraj/images/image1.png
diff --git a/blogposts/Kanagaraj/images/image2.png b/blogposts/Kanagaraj/images/image2.png
diff --git a/blogposts/Kanagaraj/images/image3.png b/blogposts/Kanagaraj/images/image3.png
diff --git a/blogposts/Kanagaraj/images/image4.png b/blogposts/Kanagaraj/images/image4.png
diff --git a/blogposts/Kanagaraj/images/image5.png b/blogposts/Kanagaraj/images/image5.png
diff --git a/blogposts/Kanagaraj/images/image6.png b/blogposts/Kanagaraj/images/image6.png
diff --git a/blogposts/Kanagaraj/images/image7.png b/blogposts/Kanagaraj/images/image7.png
diff --git a/blogposts/Kanagaraj/images/image8.png b/blogposts/Kanagaraj/images/image8.png
diff --git a/blogposts/Kanagaraj/images/image9.png b/blogposts/Kanagaraj/images/image9.png
diff --git a/source/Interfaces/Button.cpp b/source/Interfaces/Button.cpp
@@ -6,9 +6,11 @@
 #include "Button.hpp"
 
 /// Constructor
-i_2D::Button::Button(const std::string &t, sf::Vector2f size, sf::Color bgColor,
-                     sf::Color textColor, const sf::Font &font) {
-    text = std::make_unique<sf::Text>(font);
+i_2D::Button::Button(std::string t, sf::Vector2f size, sf::Color bgColor, sf::Color textColor) {
+    if(!mfont.loadFromFile("../../assets/font/ArialNarrow7.ttf")){
+        std::cout << "Error loading font file" << std::endl;
+    }
+    text = std::make_unique<sf::Text>(mfont);
 
     text->setString(t);
     text->setFillColor(textColor);
@@ -20,8 +22,11 @@ i_2D::Button::Button(const std::string &t, sf::Vector2f size, sf::Color bgColor,
 /**
  * @brief set the font of the button
  */
-void i_2D::Button::setMFont(const sf::Font &font) {
-    text = std::make_unique<sf::Text>(font);
+void i_2D::Button::setMFont() {
+    if(!mfont.loadFromFile("../../assets/font/ArialNarrow7.ttf")){
+        std::cout << "Error loading font file" << std::endl;
+    }
+    text = std::make_unique<sf::Text>(mfont);
 }
 
 /**

diff --git a/source/Interfaces/Button.hpp b/source/Interfaces/Button.hpp
@@ -1,7 +1,8 @@
 /**
- * @author : Team - 3
- * @date: 11/02/2023
- * Button class creates a SF::Rectangle and SF::Text on top
+ * @file Button.h
+ * @author
+ *
+ *
  */
 
 #ifndef CSE_491_BUTTON_HPP
@@ -15,30 +16,30 @@ namespace i_2D {
     class Button {
     private:
         sf::RectangleShape button;
+        sf::Font mfont;
         std::unique_ptr<sf::Text> text;
 
 
     public:
-        Button(const std::string &t, sf::Vector2f size, sf::Color bgColor,
-               sf::Color textColor, const sf::Font &font);
+        Button(std::string t, sf::Vector2f size, sf::Color bgColor, sf::Color textColor);
 
         /**
          * @brief set the string of the button
          *
          * @param s label of the button
          */
-        void setString(const std::string &s){
+        void setString(std::string s){
             text->setString(s);
         }
 
-        void setMFont(const sf::Font &font);
+        void setMFont();
 
         /**
          * @brief set the font of the button
          *
          * @param font
          */
-        void setFont(const sf::Font &font) {
+        void setFont(sf::Font &font) {
             text->setFont(font);
         }
 

diff --git a/source/Interfaces/Inventory.cpp b/source/Interfaces/Inventory.cpp
diff --git a/source/Interfaces/Inventory.hpp b/source/Interfaces/Inventory.hpp