resolved most of the compiler warnings/errors under gcc

also update xxhash and tinyformat

1 files changed, 3 insertions, 3 deletions

diff --git a/source/game/StarDrawable.cpp b/source/game/StarDrawable.cpp
index 90b36c5..c7311ae 100644
--- a/source/game/StarDrawable.cpp
+++ b/source/game/StarDrawable.cpp
@@ -154,7 +154,7 @@ Json Drawable::toJson() const {
   json.set("color", jsonFromColor(color));
   json.set("fullbright", fullbright);
 
-  return move(json);
+  return json;
 }
 
 void Drawable::translate(Vec2F const& translation) {
@@ -270,13 +270,13 @@ DataStream& operator<<(DataStream& ds, Drawable::PolyPart const& poly) {
 
 // I need to find out if this is for network serialization or not eventually
 DataStream& operator>>(DataStream& ds, Drawable::ImagePart& image) {
-  ds >> AssetPath::join(image.image);
+  ds >> image.image;
   ds >> image.transformation;
   return ds;
 }
 
 DataStream& operator<<(DataStream& ds, Drawable::ImagePart const& image) {
-  ds << AssetPath::join(image.image);
+  ds << image.image;
   ds << image.transformation;
   return ds;
 }