-
Notifications
You must be signed in to change notification settings - Fork 824
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7ad72d2
commit 5f428d9
Showing
5 changed files
with
37 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,32 @@ | ||
// You might be wondering why this isn't client level. If focus is null, we don't want you to move. | ||
// Only way to do that is to tie the behavior into the focus's keyLoop(). | ||
/atom/movable/keyLoop(client/user) | ||
if(user?.keys_held["Ctrl"]) | ||
// Clients don't go null randomly. They do go null unexpectedly though, when they're poked in particular ways | ||
// keyLoop is called by a for loop over mobs. We're guarenteed that all the mobs have clients at the START | ||
// But the move of one mob might poke the client of another, so we do this | ||
if(!user) | ||
return FALSE | ||
if(user.keys_held["Ctrl"]) | ||
return | ||
var/movement_dir = NONE | ||
for(var/_key in user.keys_held) | ||
movement_dir = movement_dir | user.movement_keys[_key] | ||
if(user?.next_move_dir_add) | ||
movement_dir |= user.next_move_dir_add | ||
if(user?.next_move_dir_sub) | ||
var/movement_dir = user.intended_direction | user.next_move_dir_add | ||
// If we're not movin anywhere, we aren't movin anywhere | ||
// Safe because nothing adds to movement_dir after this moment | ||
if(!movement_dir) | ||
// No input == our removal would have done nothing | ||
// So we can safely forget about it | ||
user.next_move_dir_sub = NONE | ||
return FALSE | ||
if(user.next_move_dir_sub) | ||
movement_dir &= ~user.next_move_dir_sub | ||
// Sanity checks in case you hold left and right and up to make sure you only go up | ||
if((movement_dir & NORTH) && (movement_dir & SOUTH)) | ||
movement_dir &= ~(NORTH|SOUTH) | ||
if((movement_dir & EAST) && (movement_dir & WEST)) | ||
movement_dir &= ~(EAST|WEST) | ||
user?.Move(get_step(src, movement_dir), movement_dir) | ||
user.Move(get_step(src, movement_dir), movement_dir) | ||
|
||
/client/proc/calculate_move_dir() | ||
var/movement_dir = NONE | ||
for(var/_key in keys_held) | ||
movement_dir |= movement_keys[_key] | ||
intended_direction = movement_dir |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters