Global hall of fame

FeLib/CMakeLists.txt

@@ -16,6 +16,15 @@ else()
   message(STATUS "Using SDL1")
 endif()
 
+# libcurl, for sending/fetching high-scores to/from a global high-score server.
+find_package(CURL)
+if(CURL_FOUND)
+  message(STATUS "Using libcurl ${CURL_VERSION_STRING}")
+  target_compile_definitions(FeLib PUBLIC USE_HIGHSCORE_SERVER)
+else()
+  message(WARNING "libcurl not found, global high-score submissions will be disabled")
+endif()
+
 if(MSVC)
   # Not very pretty solution. This finds SDL2.dll from SDL2.lib path, so that it can be installed where ivan.exe will end up.
   message("SDL2_LIBRARY ${SDL2_LIBRARY}")
@@ -51,5 +60,6 @@ if(NOT PNG_FOUND)
 endif()
 
 target_include_directories(FeLib PUBLIC Include)
-target_include_directories(FeLib SYSTEM PUBLIC ${SDL2_INCLUDE_DIR} PRIVATE ${PNG_INCLUDE_DIRS})
-target_link_libraries(FeLib ${SDL2_LIBRARY} ${PNG_LIBRARIES})
+target_include_directories(FeLib SYSTEM PUBLIC ${SDL2_INCLUDE_DIR}
+  PRIVATE ${PNG_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS})
+target_link_libraries(FeLib ${SDL2_LIBRARY} ${PNG_LIBRARIES} ${CURL_LIBRARIES})

FeLib/Include/config.h

@@ -33,6 +33,7 @@ class configsystem
   static void Show(void (*)() = 0, void (*)(felist&) = 0, truth = false);
   static void AddOption(configoption*);
   static void NormalStringDisplayer(const stringoption*, festring&);
+  static void SecretStringDisplayer(const stringoption*, festring&);
   static void NormalNumberDisplayer(const numberoption*, festring&);
   static void NormalTruthDisplayer(const truthoption*, festring&);
   static void NormalCycleDisplayer(const cycleoption*, festring&);
@@ -41,6 +42,7 @@ class configsystem
   static truth NormalTruthChangeInterface(truthoption*);
   static truth NormalCycleChangeInterface(cycleoption*);
   static void NormalStringChanger(stringoption*, cfestring&);
+  static void SecretStringChanger(stringoption*, cfestring&);
   static void NormalNumberChanger(numberoption*, long);
   static void NormalTruthChanger(truthoption*, truth);
   static void NormalCycleChanger(cycleoption*, long);

FeLib/Include/feio.h

@@ -27,7 +27,7 @@ class iosystem
   static festring ContinueMenu(col16, col16, cfestring&);
   static int StringQuestion(festring&, cfestring&, v2, col16,
                             festring::sizetype, festring::sizetype,
-                            truth, truth, stringkeyhandler = 0);
+                            truth, truth, stringkeyhandler = 0, truth = false);
   static long NumberQuestion(cfestring&, v2, col16,
                              truth, truth = false);
   static long ScrollBarQuestion(cfestring&, v2, long, long, long,

FeLib/Include/felibdef.h

@@ -214,6 +214,7 @@ inline int GetMinColor24(col24 Color)
 #define LIST_WAS_EMPTY 0xFFFF
 #define ESCAPED 0xFFFE
 #define NOTHING_SELECTED 0xFFFD
+#define UNSELECTABLE_SELECT 0xFFFC
 
 #define NO_LIMIT 0xFFFF
 

FeLib/Include/hscore.h

@@ -28,12 +28,18 @@
 
 class festring;
 
+enum highscoreview
+{
+  LOCAL,
+  GLOBAL
+};
+
 class highscore
 {
  public:
   highscore(cfestring& = HIGH_SCORE_FILENAME);
-  truth Add(long, cfestring&);
-  void Draw() const;
+  truth Add(long, cfestring&, cfestring&, cfestring&, cfestring&);
+  void Draw(cfestring&);
   void Save(cfestring& = HIGH_SCORE_FILENAME) const;
   void Load(cfestring& = HIGH_SCORE_FILENAME);
   truth LastAddFailed() const;
@@ -47,13 +53,22 @@ class highscore
   void Clear();
   truth CheckVersion() const;
  private:
-  truth Add(long, cfestring&, time_t, long);
+  truth Add(long, cfestring&, time_t, long, cfestring&, cfestring&, cfestring&);
+  void ToggleBetweenLocalAndGlobalView() { View = static_cast<highscoreview>(!View); }
   std::vector<festring> Entry;
   std::vector<long> Score;
   std::vector<time_t> Time;
   std::vector<long> RandomID;
+  std::vector<festring> GlobalEntry;
+  std::vector<long> GlobalScore;
+  std::vector<time_t> GlobalTime;
   int LastAdd;
   ushort Version;
+  static highscoreview View;
 };
 
+festring FetchAuthToken(cfestring& HighScoreServerURL,
+                        cfestring& HighScoreServerUsername,
+                        cfestring& HighScoreServerPassword);
+
 #endif

FeLib/Source/config.cpp

@@ -181,6 +181,13 @@ void configsystem::NormalStringDisplayer(const stringoption* O,
     Entry << '-';
 }
 
+void configsystem::SecretStringDisplayer(const stringoption* O,
+                                         festring& Entry)
+{
+  if(O->Value.IsEmpty())
+    Entry << "not set";
+}
+
 void configsystem::NormalNumberDisplayer(const numberoption* O,
                                          festring& Entry)
 {

FeLib/Source/feio.cpp

@@ -286,7 +286,8 @@ int iosystem::StringQuestion(festring& Input,
                              festring::sizetype MinLetters,
                              festring::sizetype MaxLetters,
                              truth Fade, truth AllowExit,
-                             stringkeyhandler StringKeyHandler)
+                             stringkeyhandler StringKeyHandler,
+                             truth SecretInput)
 {
   v2 V(RES.X, 10); ///???????????
   bitmap BackUp(V, 0);
@@ -303,7 +304,8 @@ int iosystem::StringQuestion(festring& Input,
     bitmap Buffer(RES, 0);
     Buffer.ActivateFastFlag();
     FONT->Printf(&Buffer, Pos, Color, "%s", Topic.CStr());
-    FONT->Printf(&Buffer, v2(Pos.X, Pos.Y + 10), Color, "%s", Input.CStr());
+    FONT->Printf(&Buffer, v2(Pos.X, Pos.Y + 10), Color, "%s",
+                 SecretInput ? festring(Input.GetSize(), '*').CStr() : Input.CStr());
     Buffer.FadeToScreen();
   }
   else
@@ -317,8 +319,8 @@ int iosystem::StringQuestion(festring& Input,
   {
     B.Bitmap = DOUBLE_BUFFER;
     BackUp.NormalBlit(B);
-    FONT->Printf(DOUBLE_BUFFER, v2(Pos.X, Pos.Y + 10),
-                 Color, "%s", Input.CStr());
+    FONT->Printf(DOUBLE_BUFFER, v2(Pos.X, Pos.Y + 10), Color, "%s",
+                 SecretInput ? festring(Input.GetSize(), '*').CStr() : Input.CStr());
     FONT->Printf(DOUBLE_BUFFER, v2(Pos.X, Pos.Y + 11),
                  Color, "%*c", CursorPos + 1, '_');
 

FeLib/Source/felist.cpp

@@ -252,10 +252,17 @@ uint felist::Draw()
       continue;
     }
 
-    if(Flags & SELECTABLE && Pressed == KEY_ENTER)
+    if(Pressed == KEY_ENTER)
     {
-      Return = Selected;
+      if(Flags & SELECTABLE)
+        Return = Selected;
+#ifdef USE_HIGHSCORE_SERVER
+      else
+        // Used by the hall of fame to toggle between local and global scores.
+        Return = UNSELECTABLE_SELECT;
+
       break;
+#endif
     }
 
     if(Pressed == KEY_ESC)