Skip to content

Commit

Permalink
Doom|Fixed: Flying enemies get stuck on one another
Browse files Browse the repository at this point in the history
mf2_passmobj had been erroneously applied to all monsters in the game.
While this is the ideal in a "modern|3D playsim", the original game
logic is incapable of supporting such behavior.
  • Loading branch information
danij-deng committed Feb 19, 2012
1 parent 5400039 commit 8f95755
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 45 deletions.
8 changes: 4 additions & 4 deletions doomsday/plugins/jdoom/defs/chex/objects.ded
Expand Up @@ -29,7 +29,7 @@ Thing {
Height = 56;
Mass = 100;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -57,7 +57,7 @@ Thing {
Height = 56;
Mass = 100;
Flags = solid | shootable |countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -85,7 +85,7 @@ Thing {
Height = 100;
Mass = 1000;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -114,7 +114,7 @@ Thing {
Mass = 50;
Damage = 3;
Flags = solid | shootable | float | nogravity;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

State {
Expand Down
36 changes: 18 additions & 18 deletions doomsday/plugins/jdoom/defs/objects.ded
Expand Up @@ -55,7 +55,7 @@ Thing {
Height = 56;
Mass = 100;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -83,7 +83,7 @@ Thing {
Height = 56;
Mass = 100;
Flags = solid | shootable |countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -111,7 +111,7 @@ Thing {
Height = 56;
Mass = 500;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -164,7 +164,7 @@ Thing {
Height = 56;
Mass = 500;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -244,7 +244,7 @@ Thing {
Height = 64;
Mass = 1000;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -299,7 +299,7 @@ Thing {
Height = 56;
Mass = 100;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -327,7 +327,7 @@ Thing {
Height = 56;
Mass = 100;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -355,7 +355,7 @@ Thing {
Height = 56;
Mass = 400;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -383,7 +383,7 @@ Thing {
Height = 56;
Mass = 400;
Flags = solid | shootable | shadow | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -411,7 +411,7 @@ Thing {
Height = 56;
Mass = 400;
Flags = solid | shootable | float | nogravity | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -439,7 +439,7 @@ Thing {
Height = 64;
Mass = 1000;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -494,7 +494,7 @@ Thing {
Height = 64;
Mass = 1000;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -523,7 +523,7 @@ Thing {
Mass = 50;
Damage = 3;
Flags = solid | shootable | float | nogravity;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -551,7 +551,7 @@ Thing {
Height = 100;
Mass = 1000;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp | boss;
Flags2 = telestomp | boss;
}

Thing {
Expand Down Expand Up @@ -579,7 +579,7 @@ Thing {
Height = 64;
Mass = 600;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down Expand Up @@ -607,7 +607,7 @@ Thing {
Height = 110;
Mass = 1000;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp | boss;
Flags2 = telestomp | boss;
}

Thing {
Expand Down Expand Up @@ -635,7 +635,7 @@ Thing {
Height = 56;
Mass = 400;
Flags = solid | shootable | float | nogravity | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand All @@ -662,7 +662,7 @@ Thing {
Height = 56;
Mass = 100;
Flags = solid | shootable | countkill;
Flags2 = passmobj | telestomp;
Flags2 = telestomp;
}

Thing {
Expand Down

0 comments on commit 8f95755

Please sign in to comment.