Leahnaya/splatood
1
0
Fork 0
mirror of https://github.com/SplatooD/splatood.git synced 2026-04-24 15:27:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Players with chargers don't kill by running into people.

Browse Source
This commit is contained in:
Squideo Kojima 2015-11-22 12:07:56 -08:00
parent a84b7817ca
commit 1750acaf7a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
game.c
View File

@ -1192,12 +1192,10 @@ void game_loop(void) {
for (i = 0; i < player_all; ++i) {
for (j = i + 1; j < player_all; ++j) {
if (player_x[i] == player_x[j] && player_y[i] == player_y[j]) {
/*
* Since all players have rollers and move at the same speed, if you
* share a space you must have run into each other, so you both die.
*/
player_die(i);
player_die(j);
// If you have a roller, kill the player you collide with
// If both players have rollers, both of them die
if (player_wpn[i] == WPN_ROLLER) player_die(j);
if (player_wpn[j] == WPN_ROLLER) player_die(i);
}
if (projectile_dir[j] != DIR_NONE &&
(player_x[i] >> (TILE_SIZE_BIT+FP_BITS)) == (projectile_x[j] >> (TILE_SIZE_BIT+FP_BITS)) &&

BIN
splatood.nes
View File

Binary file not shown.