Windows build ready. Program icon, however, exceeds string length on MSVC.
This commit is contained in:
+34
-2
@@ -199,7 +199,7 @@ static loaded_bitmap DEBUGLoadBMP(thread_context *Thread, debug_read_file_result
|
||||
bit_scan_result GreenShift = FindLeastSignificantSetBit(GreenMask);
|
||||
bit_scan_result BlueShift = FindLeastSignificantSetBit(BlueMask);
|
||||
bit_scan_result AlphaShift = FindLeastSignificantSetBit(AlphaMask);
|
||||
|
||||
|
||||
ASSERT(RedShift.Found);
|
||||
ASSERT(GreenShift.Found);
|
||||
ASSERT(BlueShift.Found);
|
||||
@@ -457,7 +457,39 @@ void UpdateAndRender(thread_context *Thread, game_memory *Memory, game_input *In
|
||||
PlayerRight.Offset.X += 0.5f*PlayerWidth;
|
||||
PlayerRight = RecannonicalizePosition(TileMap, PlayerRight);
|
||||
|
||||
if(IsTileMapPointEmpty(TileMap, NewPlayerP) && IsTileMapPointEmpty(TileMap, PlayerLeft) && IsTileMapPointEmpty(TileMap, PlayerRight)) {
|
||||
B32 Collided = FALSE;
|
||||
tile_map_position ColP;
|
||||
memset(&ColP, 0, sizeof(ColP));
|
||||
if(!IsTileMapPointEmpty(TileMap, NewPlayerP)) {
|
||||
ColP = NewPlayerP;
|
||||
Collided = TRUE;
|
||||
}
|
||||
if(!IsTileMapPointEmpty(TileMap, PlayerLeft)) {
|
||||
ColP = PlayerLeft;
|
||||
Collided = TRUE;
|
||||
}
|
||||
if(!IsTileMapPointEmpty(TileMap, PlayerRight)) {
|
||||
ColP = PlayerRight;
|
||||
Collided = TRUE;
|
||||
}
|
||||
|
||||
if(Collided) {
|
||||
v2 r = { 0, 0 };
|
||||
if(ColP.AbsTileX < GameState->PlayerP.AbsTileX) {
|
||||
r = (v2){ 1, 0 };
|
||||
}
|
||||
if(ColP.AbsTileX > GameState->PlayerP.AbsTileX) {
|
||||
r = (v2){ -1, 0 };
|
||||
}
|
||||
if(ColP.AbsTileY < GameState->PlayerP.AbsTileY) {
|
||||
r = (v2){ 0, 1 };
|
||||
}
|
||||
if(ColP.AbsTileY > GameState->PlayerP.AbsTileY) {
|
||||
r = (v2){ 0, -1 };
|
||||
}
|
||||
|
||||
GameState->dPlayerP = V2Subtract(GameState->dPlayerP, V2Multiply(1*InnerProduct(GameState->dPlayerP, r), r));
|
||||
} else {
|
||||
if(!AreOnSameTile(&GameState->PlayerP, &NewPlayerP)) {
|
||||
U32 NewTileValue = GetTileValueByPos(TileMap, NewPlayerP);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user