pull request #1272 - unify moverock()

Pull request from argrath:  change a couple of places in moverock()
to use moverock_done() and return early rather than use break to fall
to the end.

Closes #1272

src/hack.c

@@ -546,16 +546,17 @@ moverock(void)
                        Sokoban rules because on next step you could go
                        past it without pushing it to plug a pit or hole */
                     sokoban_guilt();
-                    break;
                 }
-                break;
+                moverock_done(sx, sy);
+                return 0;
             }
 
             if (could_move_onto_boulder(sx, sy)) {
                 pline(
                    "However, you can squeeze yourself into a small opening.");
                 sokoban_guilt();
-                break;
+                moverock_done(sx, sy);
+                return 0;
             } else {
                 moverock_done(sx, sy);
                 return -1;