From fcd2d5342cb62eff8e9853c47d735abf8a7162a0 Mon Sep 17 00:00:00 2001 From: Cameron Reikes Date: Wed, 14 Dec 2022 14:27:53 -0800 Subject: [PATCH] Fix BAD HORRIBLE Queue type bug. Fuck! --- Flight.vcxproj | 1 + buildsettings.h | 5 +++-- flight.rdbg | Bin 2425 -> 2480 bytes gamestate.c | 2 +- types.h | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Flight.vcxproj b/Flight.vcxproj index 9aff11a..26ad283 100644 --- a/Flight.vcxproj +++ b/Flight.vcxproj @@ -71,6 +71,7 @@ v143 true Unicode + true diff --git a/buildsettings.h b/buildsettings.h index de6bef1..0af037c 100644 --- a/buildsettings.h +++ b/buildsettings.h @@ -14,11 +14,12 @@ #define ASSERT_DO_POPUP_AND_CRASH // #define SERVER_ADDRESS "207.246.80.160" -// #define PROFILING +#define PROFILING // #define DEBUG_RENDERING // #define DEBUG_WORLD #define UNLOCK_ALL -#define TIME_BETWEEN_WORLD_SAVE 1000000.0f +// #define TIME_BETWEEN_WORLD_SAVE 1000000.0f +#define TIME_BETWEEN_WORLD_SAVE 1.0f // #define INFINITE_RESOURCES #define DEBUG_TOOLS #define CHIPMUNK_INTEGRITY_CHECK diff --git a/flight.rdbg b/flight.rdbg index 993985d75c14f22c166597b6646517f99c43755e..a7738f477179133c1e1e028b5be80d1df10bad6e 100644 GIT binary patch delta 263 zcmew^BRC_mAXP6J%mFH3XLOk?$l}D7pHiupYy&jRV6r+hKcg1d*mq1EjGi!)Sb|GZ z3nuF^`7&yNB-wHkGxPM4Co3?TPyWxy3M3U7%~=ZcGQck4PDxEFO;0IGEC(yGnfO_k zF%aTFd-lT8)Y4SFjLBxKnT%4K7qHG^l;L7vU?@s0*0n1JIgc5_15wGPMVqbIB^eo| YCO_n8pM0K!6U^$GT)-hdIh&IY0KM@_?f?J) delta 223 zcmdlW{8MN`A*1Hxhm5L|^;y{&1A#2-$sbtkC$D8;XS4wF3?>V(u(PC9=w(bSRGaL; z!p&$773G46zFAWfQ(_!P0Y;GOLhmc9Vh28b254YS#B)BC8-6I*E1PRE@X0G zbOA}SIOV5QPQJ(JJ^2BnGkZp2L8@M|8(3FABL|}wNEd5hX=+jB#0Bva3k@fmv1T%g uZ(hJUi*a)pyCfr{_~b&4YA!|w1_nkBAR#`Pk#iCsh|31VZaJCh86^P98A1C1 diff --git a/gamestate.c b/gamestate.c index 79a7a7e..d5609f5 100644 --- a/gamestate.c +++ b/gamestate.c @@ -296,7 +296,7 @@ typedef struct QueryResult } QueryResult; static THREADLOCAL char query_result_data[128 * sizeof(QueryResult)] = {0}; // the data starts off NULL, on the first call sets it to result data -static THREADLOCAL Queue query_result = {.data_length = 128 * sizeof(QueryResult), .element_size = sizeof(cpShape *)}; +static THREADLOCAL Queue query_result = {.data_length = 128 * sizeof(QueryResult), .element_size = sizeof(QueryResult)}; static void shape_query_callback(cpShape *shape, cpContactPointSet *points, void *data) { diff --git a/types.h b/types.h index 78a791d..6a63cf1 100644 --- a/types.h +++ b/types.h @@ -39,7 +39,7 @@ #define ORB_HEAT_FORCE_MULTIPLIER 5.0 #define ORB_DRAG_CONSTANT 1.0 #define ORB_FROZEN_DRAG_CONSTANT 10.0 -#define ORB_HEAT_MAX_DETECTION_DIST 500.0 +#define ORB_HEAT_MAX_DETECTION_DIST 100.0 #define ORB_HEAL_RATE 0.2 #define ORB_MAX_FORCE 200.0