diff --git a/Flight.vcxproj b/Flight.vcxproj index 57317b9..068e088 100644 --- a/Flight.vcxproj +++ b/Flight.vcxproj @@ -140,7 +140,7 @@ Level3 true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions);DEBUG_RENDERING;SERVER_ADDRESS="127.0.0.1" + _DEBUG;_CONSOLE;%(PreprocessorDefinitions);DEBUG_RENDERING true $(ProjectDir)\thirdparty\enet\include;$(ProjectDir)\thirdparty\Chipmunk2D\include\chipmunk;$(ProjectDir)\thirdparty;$(ProjectDir)\thirdparty\Chipmunk2D\include;$(ProjectDir)\thirdparty\minilzo;$(ProjectDir)\thirdparty\opus\include true diff --git a/Flight.vcxproj.user b/Flight.vcxproj.user index 8894de1..b0274e8 100644 --- a/Flight.vcxproj.user +++ b/Flight.vcxproj.user @@ -4,7 +4,8 @@ false - --serve + + WindowsLocalDebugger diff --git a/flight.rdbg b/flight.rdbg index 4453720..b1ab8e6 100644 Binary files a/flight.rdbg and b/flight.rdbg differ diff --git a/gamestate.c b/gamestate.c index c8bcc00..083bac6 100644 --- a/gamestate.c +++ b/gamestate.c @@ -380,14 +380,19 @@ V2 player_vel(GameState *gs, Entity *player) { assert(player->is_player); Entity *potential_seat = get_entity(gs, player->currently_inside_of_box); - if (potential_seat != NULL) + if (potential_seat != NULL && !potential_seat->is_box) { - return cp_to_v2(cpBodyGetVelocity(get_entity(gs, potential_seat->shape_parent_entity)->body)); + Log("Weird ass motherfucking bug where the seat inside of is an explosion or some shit\n"); + assert(potential_seat->is_box); } else { - return cp_to_v2(cpBodyGetVelocity(player->body)); + if (potential_seat != NULL) + { + return cp_to_v2(cpBodyGetVelocity(get_entity(gs, potential_seat->shape_parent_entity)->body)); + } } + return cp_to_v2(cpBodyGetVelocity(player->body)); } void grid_create(GameState *gs, Entity *e) diff --git a/release_all.bat b/release_all.bat index e722354..5d93e67 100644 --- a/release_all.bat +++ b/release_all.bat @@ -1,4 +1,3 @@ -call vcvars git push call build_release.bat call update_server.bat