summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVittorio Romeo <vittorio.romeo@outlook.com>2013-03-11 20:34:51 +0100
committerVittorio Romeo <vittorio.romeo@outlook.com>2013-03-11 20:34:51 +0100
commit2e6101a78ee7a9924de3a7dd241924aaf77e600c (patch)
treee308924140b2ca25880d500d2b342e94fde0020d
parent50467c37f80b104ec9a2b4b6750a795728a30446 (diff)
1.821.82
-rw-r--r--Online/Online.cpp6
-rw-r--r--README.md8
-rw-r--r--Utils/Utils.cpp7
-rw-r--r--Utils/Utils.h1
-rw-r--r--_RELEASE/_DOCUMENTATION/README.html12
5 files changed, 27 insertions, 7 deletions
diff --git a/Online/Online.cpp b/Online/Online.cpp
index f0e0bc8a..f7a1ae0b 100644
--- a/Online/Online.cpp
+++ b/Online/Online.cpp
@@ -230,20 +230,20 @@ namespace hg
}
string get181Validator(const string& mPackPath, const string& mLevelId, const string& mJsonRootPath, const string& mLuaScriptPath, float mDifficultyMultiplier)
{
- string luaScriptContents{getFileContents(mLuaScriptPath)};
+ string luaScriptContents{get181FileContents(mLuaScriptPath)};
unordered_set<string> luaScriptNames;
recursiveFillIncludedLuaFileNames(luaScriptNames, mPackPath, luaScriptContents);
string result{""};
result.append(getUrlEncoded(mLevelId));
- result.append(getMD5Hash(getFileContents(mJsonRootPath) + HG_SERVER_KEY));
+ result.append(getMD5Hash(get181FileContents(mJsonRootPath) + HG_SERVER_KEY));
result.append(getMD5Hash(luaScriptContents + HG_SERVER_KEY));
for(auto& luaScriptName : luaScriptNames)
{
string path{mPackPath + "/Scripts/" + luaScriptName};
- string contents{getFileContents(path)};
+ string contents{get181FileContents(path)};
string hash{getMD5Hash(contents + HG_SERVER_KEY)};
string compressedHash{""};
diff --git a/README.md b/README.md
index 781f6fb5..9d3b65be 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# [Open Hexagon](http://www.facebook.com/OpenHexagon) - version 1.81 #
+# [Open Hexagon](http://www.facebook.com/OpenHexagon) - version 1.82 #
## [by Vittorio Romeo](http://vittorioromeo.info) ##
A free, open source clone of **[Super Hexagon](https://itunes.apple.com/us/app/super-hexagon/id549027629?mt=8)** (by Terry Cavanagh) </br>
@@ -96,6 +96,12 @@ Please refer to the files in the **documentation** folder.
## Changelog ##
+Version 1.82
+
+* Added: volume and flash effect option in **F3** menu
+* Fixed/changed: server stability and security improvements
+* Changed: improved menu **leaderboards**
+
Version 1.81
* Added: screenshots in the menu (press F12)
diff --git a/Utils/Utils.cpp b/Utils/Utils.cpp
index 838478dc..b7629e0f 100644
--- a/Utils/Utils.cpp
+++ b/Utils/Utils.cpp
@@ -58,7 +58,12 @@ namespace hg
}
fclose(fptr);
- log(toStr(content.size())+" - "+mFilePath,"LoadFileSize");
+ return content;
+ }
+ string get181FileContents(const string& mFilePath)
+ {
+ std::ifstream ifs(mFilePath);
+ std::string content{(istreambuf_iterator<char>(ifs)), (istreambuf_iterator<char>())};
return content;
}
Json::Value getJsonFileRoot(const string& mFilePath)
diff --git a/Utils/Utils.h b/Utils/Utils.h
index e8b07200..3a797626 100644
--- a/Utils/Utils.h
+++ b/Utils/Utils.h
@@ -31,6 +31,7 @@ namespace hg
sf::Color getColorDarkened(sf::Color, float);
sf::Color getColorFromJsonArray(Json::Value mArray);
+ std::string get181FileContents(const std::string& mFilePath);
std::string getFileContents(const std::string& mFilePath);
Json::Value getJsonFileRoot(const std::string& mFilePath);
Json::Value getJsonFromString(const std::string& mString);
diff --git a/_RELEASE/_DOCUMENTATION/README.html b/_RELEASE/_DOCUMENTATION/README.html
index b58ebae4..a9fb8c68 100644
--- a/_RELEASE/_DOCUMENTATION/README.html
+++ b/_RELEASE/_DOCUMENTATION/README.html
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<title>README.markdown</title>
+<title>README.md</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<style type="text/css">
body{
@@ -266,7 +266,7 @@ button::-moz-focus-inner {
</style>
</head>
<body>
-<h1><a href="http://www.facebook.com/OpenHexagon">Open Hexagon</a> - version 1.81</h1>
+<h1><a href="http://www.facebook.com/OpenHexagon">Open Hexagon</a> - version 1.82</h1>
<h2><a href="http://vittorioromeo.info">by Vittorio Romeo</a></h2>
@@ -364,6 +364,14 @@ Avoid the walls! Press <strong>R</strong> to restart.</br> Press <strong>ESC</st
<h2>Changelog</h2>
+<p>Version 1.82</p>
+
+<ul>
+<li>Added: volume and flash effect option in <strong>F3</strong> menu</li>
+<li>Fixed/changed: server stability and security improvements</li>
+<li>Changed: improved menu <strong>leaderboards</strong></li>
+</ul>
+
<p>Version 1.81</p>
<ul>