Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rewrote Remove explored flags for power sight #1650

Merged
merged 6 commits into from Jul 31, 2022
Merged

rewrote Remove explored flags for power sight #1650

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fad28f0
inital
PieterVdc Jul 15, 2022
15fb847
needs bugfix
PieterVdc Jul 16, 2022
58ece5d
Merge branch 'master' into remove_explored_flags_for_power_sight
PieterVdc Jul 30, 2022
34439b3
cleanup
PieterVdc Jul 30, 2022
0fc6e17
cleanup
PieterVdc Jul 30, 2022
f654983
fix
PieterVdc Jul 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 35 additions & 4 deletions src/power_process.c
View file
Open in desktop
Expand Up @@ -53,8 +53,6 @@ extern "C" {
DLLIMPORT unsigned char _DK_backup_explored[26][26];
#define backup_explored _DK_backup_explored
/******************************************************************************/
DLLIMPORT void _DK_remove_explored_flags_for_power_sight(struct PlayerInfo *player);
/******************************************************************************/
#ifdef __cplusplus
}
#endif
Expand Down Expand Up @@ -633,7 +631,40 @@ void update_explored_flags_for_power_sight(struct PlayerInfo *player)

void remove_explored_flags_for_power_sight(struct PlayerInfo *player)
{
SYNCDBG(9,"Starting");
_DK_remove_explored_flags_for_power_sight(player);
SYNCDBG(9, "Starting");
int data;
unsigned char backup_flags;
struct Dungeon *dungeon = get_players_dungeon(player);

if (dungeon->sight_casted_thing_idx)
{
struct Thing *sightng = thing_get(dungeon->sight_casted_thing_idx);
MapSubtlCoord start_stl_y = sightng->mappos.y.stl.num - MAX_SOE_RADIUS;
MapSubtlCoord start_stl_x = sightng->mappos.x.stl.num - MAX_SOE_RADIUS;

MapSubtlDelta shift_y = 0;
do
{
MapSubtlDelta shift_x = 0;
do
{
if (dungeon->soe_explored_flags[shift_y][shift_x])
{
struct Map* mapblk = get_map_block_at((start_stl_x + shift_x ),(start_stl_y + shift_y ));

data = mapblk->data & (~(1 << player->id_number << 28) | 0xFFFFFFF);
mapblk->data = data;
backup_flags = backup_explored[shift_y][shift_x];
mapblk->data = data | (((1 << player->id_number) & (backup_flags << player->id_number)) << 28);
if ((backup_flags & 2) != 0)
mapblk->flags |= SlbAtFlg_TaggedValuable;
if ((backup_flags & 4) != 0)
mapblk->flags |= SlbAtFlg_Unexplored;
}
++shift_x;
} while (shift_x < (2 * MAX_SOE_RADIUS));
++shift_y;
} while (shift_y < (2 * MAX_SOE_RADIUS));
}
}
/******************************************************************************/