Merge branch 'master' into windows

4 files changed, 12 insertions, 8 deletions

diff --git a/client/src/client/client.h b/client/src/client/client.h
index f4769d4..3a888fb 100644
--- a/client/src/client/client.h
+++ b/client/src/client/client.h
@@ -4,6 +4,7 @@
 
 #include "../util/io.h"
 #include "../util/events.h"
+#include "../injection/mapper.h"
 #include "packet.h"
 
 namespace tcp {
@@ -35,6 +36,7 @@ class client {
 
  public:
   int state;
+  mmap::data mapper_data;
 
   std::string session_id;
   event<packet_t&> receive_event;
diff --git a/client/src/client/packet.h b/client/src/client/packet.h
index e197bf0..fccd1a5 100644
--- a/client/src/client/packet.h
+++ b/client/src/client/packet.h
@@ -18,10 +18,7 @@ enum packet_id {
   process_list,
   ban,
   game_select,
-  image_req,
-  image_resp,
-  import_req,
-  import_resp
+  image
 };
 
 struct packet_t {
diff --git a/client/src/injection/mapper.h b/client/src/injection/mapper.h
index ef06a9b..27541c4 100644
--- a/client/src/injection/mapper.h
+++ b/client/src/injection/mapper.h
@@ -2,9 +2,10 @@
 
 
 namespace mmap {
-	struct header {
+	struct data {
 		size_t image_size;
 		uint32_t entry;
 		uint32_t base;
+		std::string imports;
 	};
 };
\ No newline at end of file
diff --git a/client/src/main.cpp b/client/src/main.cpp
index 4a47e01..f67ecf1 100644
--- a/client/src/main.cpp
+++ b/client/src/main.cpp
@@ -2,7 +2,6 @@
 #include "util/io.h"
 #include "client/client.h"
 #include "shellcode/shellcode.h"
-#include "injection/mapper.h"
 
 int main(int argc, char* argv[]) {
   io::init();
@@ -75,12 +74,17 @@ int main(int argc, char* argv[]) {
       if (res == tcp::login_result::login_success) {
         client.state = tcp::client_state::logged_in;
 
-        
-
         io::logger->info("logged in.");
       }
     }
 
+    if (id == tcp::packet_id::game_select) {
+      /*auto pe = nlohmann::json::parse(message);
+
+
+      client.read_stream(client.mapper_data.imports);*/
+    }
+
     if (id == tcp::packet_id::ban) {
       io::logger->error(
           "your computer is blacklisted, please contact a developer.");