From dd414f6a8ce9a7c02969b71fa5b83b45a22d6ac4 Mon Sep 17 00:00:00 2001
From: panda2134 <ljypanda@live.com>
Date: Tue, 11 May 2021 21:57:21 +0800
Subject: [PATCH] fix: new version of box2d

---
 statements/gitHeadLocal.gin | 16 ++++++++--------
 world.cpp                   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/statements/gitHeadLocal.gin b/statements/gitHeadLocal.gin
index 76e728b..3037fd5 100644
--- a/statements/gitHeadLocal.gin
+++ b/statements/gitHeadLocal.gin
@@ -1,17 +1,17 @@
 \usepackage[%
-        shash={d8fb24e},
-        lhash={d8fb24e6ebd78944eaad8b253a7a4649dc9e09d1},
+        shash={07bcc6a},
+        lhash={07bcc6a6dcf13386e361af1651358678db10fe0a},
         authname={panda2134},
         authemail={ljypanda@live.com},
         authsdate={2021-05-11},
-        authidate={2021-05-11 21:40:05 +0800},
-        authudate={1620740405},
+        authidate={2021-05-11 21:52:42 +0800},
+        authudate={1620741162},
         commname={panda2134},
         commemail={ljypanda@live.com},
         commsdate={2021-05-11},
-        commidate={2021-05-11 21:40:05 +0800},
-        commudate={1620740405},
+        commidate={2021-05-11 21:52:42 +0800},
+        commudate={1620741162},
         refnames={ (HEAD -> master)},
-        firsttagdescribe={278ae407-2-gd8fb24e},
-        reltag={d8fb24e}
+        firsttagdescribe={278ae407-3-g07bcc6a},
+        reltag={07bcc6a}
     ]{gitexinfo}
\ No newline at end of file
diff --git a/world.cpp b/world.cpp
index 67ce2ee..3c4eca7 100644
--- a/world.cpp
+++ b/world.cpp
@@ -185,7 +185,7 @@ World::World() {
                            static_cast<float>(players[i]->position().y));
       b2players[i] = b2world->CreateBody(&bodyDef);
       b2players[i]->GetUserData() = 
-        reinterpret_cast<uintptr_t>(new b2bodydata{players[i], b2players[i]});
+        reinterpret_cast<void *>(new b2bodydata{players[i], b2players[i]});
       b2CircleShape dynamicBox;
       dynamicBox.m_radius = static_cast<float>(PLAYER_RADIUS);
       b2FixtureDef fixtureDef;
@@ -351,7 +351,7 @@ void thuai::World::addEgg(int index) {
                        static_cast<float>(eggs[index]->position().y));
   b2eggs[index] = b2world->CreateBody(&bodyDef);
   b2eggs[index]->GetUserData() =
-    reinterpret_cast<uintptr_t>(new b2bodydata(eggs[index], b2eggs[index]));
+    reinterpret_cast<void *>(new b2bodydata(eggs[index], b2eggs[index]));
   b2CircleShape dynamicBox;
   dynamicBox.m_radius = static_cast<float>(EGG_RADIUS);
   b2FixtureDef fixtureDef;