From cd1cf5c28c928e5cb5b2c41069a8eca215246c0f Mon Sep 17 00:00:00 2001 From: blondie7575 Date: Mon, 9 Oct 2017 14:53:24 -0700 Subject: [PATCH] Fixed terrain destruction causing ghost players --- gamemanager.s | 4 +++- gscats.2mg | Bin 819264 -> 819264 bytes player.s | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gamemanager.s b/gamemanager.s index 6130db4..7d8c3d4 100644 --- a/gamemanager.s +++ b/gamemanager.s @@ -54,6 +54,7 @@ gameplayLoop: stz terrainDirty ; Render players + jsr unrenderPlayers jsr renderPlayers gameplayLoopKbd: @@ -150,6 +151,8 @@ endGame: ; ; Handles updating the state of the terrain in response to scrolling ; +; A = New map scroll position +; scrollMap: jsr unclipTerrain jsr unrenderPlayers @@ -167,7 +170,6 @@ scrollMap: lda #1 sta terrainDirty - rts diff --git a/gscats.2mg b/gscats.2mg index fe287e5a27ed43dae8cfa25d605484f43d248cba..41b3dcbc7d777e6f3663f09c55b5a1927f721236 100644 GIT binary patch delta 3389 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 diff --git a/player.s b/player.s index 32b64e1..225c577 100644 --- a/player.s +++ b/player.s @@ -200,8 +200,10 @@ playerIntersectRect: ; ; renderPlayers: + SAVE_AXY RENDER_GAMEOBJECT playerData,0 RENDER_GAMEOBJECT playerData+PD_SIZE,0 + RESTORE_AXY rts @@ -210,8 +212,10 @@ renderPlayers: ; ; unrenderPlayers: + SAVE_AXY UNRENDER_GAMEOBJECT playerData UNRENDER_GAMEOBJECT playerData+PD_SIZE + RESTORE_AXY rts