Merge branch 'blockmap-links' into 'next' (41613d89) · Commits · SteelT / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

41613d89

Commit 41613d89 authored 1 year ago by sphere

Downloads
- Plain Diff

Merge branch 'blockmap-links' into 'next'

Make objects able to collide with others if they occupy multiple blockmap cells (resolves #592)

Closes #592

See merge request !2267

parents 2cfbcf7f 756e9d0d

No related branches found

No related tags found

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/lua_blockmaplib.c 79 additions, 53 deletions

src/lua_blockmaplib.c
src/lua_mobjlib.c 6 additions, 3 deletions

src/lua_mobjlib.c
src/p_enemy.c 4 additions, 12 deletions

src/p_enemy.c
src/p_local.h 1 addition, 1 deletion

src/p_local.h
src/p_map.c 157 additions, 167 deletions

src/p_map.c
src/p_maputl.c 276 additions, 40 deletions

src/p_maputl.c
src/p_maputl.h 33 additions, 0 deletions

src/p_maputl.h
src/p_mobj.c 3 additions, 4 deletions

src/p_mobj.c
src/p_mobj.h 14 additions, 2 deletions

src/p_mobj.h
src/p_polyobj.c 14 additions, 6 deletions

src/p_polyobj.c
src/p_setup.c 3 additions, 1 deletion

src/p_setup.c
src/p_user.c 4 additions, 7 deletions

src/p_user.c

with 594 additions and 296 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment