diff options
| author | Edvin Jakobsson <[email protected]> | 2026-09-08 19:35:24 +0200 |
|---|---|---|
| committer | Edvin Jakobsson <[email protected]> | 2026-09-08 19:35:24 +0200 |
| commit | b99dcbcb96f3be68cbe9a2cc071e9832514fc9da (patch) | |
| tree | ee1a97540c9e9245f298c9fcfe1963a4f05abe0e /nships.c | |
| parent | aa814ab5a6ba81cc84a84595e400f3c90e6aacbb (diff) | |
Fixed some artifact
Diffstat (limited to 'nships.c')
| -rw-r--r-- | nships.c | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -187,13 +187,10 @@ struct ship setPlace(WINDOW * w, int len) } else { s.dir = 0; -<<<<<<< HEAD if(s.p.x + s.len > ww - 5) s.p.x = s.p.x - (s.p.x + s.len - ww) - 2; -======= if(s.p.x + s.len > ww - s.len) s.p.x = s.p.x - (s.p.x + s.len - ww) - (s.len + 1); ->>>>>>> origin/main } break; case 10: |