diff options
| author | savask <savask@yandex.ru> | 2011-07-14 09:37:34 (GMT) |
|---|---|---|
| committer | savask <savask@yandex.ru> | 2011-07-25 05:47:38 (GMT) |
| commit | dbd3272933de7769ed1efdd0492e1a5a872ed3bd (patch) | |
| tree | 2d418bd7c50ac6952a03d45517e513759806d9d1 /includes | |
| parent | e7907f9ea3795ebb50dc77ef9b129eb2e12abc39 (diff) | |
| download | powder-dbd3272933de7769ed1efdd0492e1a5a872ed3bd.zip powder-dbd3272933de7769ed1efdd0492e1a5a872ed3bd.tar.gz | |
Generalized stick man's update functions. Got rid of some unnecessary
variables.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/defines.h | 7 | ||||
| -rw-r--r-- | includes/powder.h | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/includes/defines.h b/includes/defines.h index 0304d62..32eed4d 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -154,7 +154,6 @@ extern int sys_pause; extern int framerender; extern int mousex, mousey; -extern int death; struct sign { @@ -193,10 +192,6 @@ int GRID_MODE; int VINE_MODE; int DEBUG_MODE; int GENERATION; -int isplayer2; -int playerspawn; -int player2spawn; -int death2; int ISSPAWN1; int ISSPAWN2; extern sign signs[MAXSIGNS]; @@ -209,7 +204,7 @@ extern int do_open; extern int sys_pause; extern int sys_shortcuts; extern int legacy_enable; //Used to disable new features such as heat, will be set by commandline or save. -extern int death, death2, framerender; +extern int framerender; extern pixel *vid_buf; extern unsigned char last_major, last_minor, update_flag; diff --git a/includes/powder.h b/includes/powder.h index 1d5694f..dc5299d 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -313,6 +313,7 @@ int update_CLST(UPDATE_FUNC_ARGS); int update_MISC(UPDATE_FUNC_ARGS); int update_legacy_PYRO(UPDATE_FUNC_ARGS); int update_legacy_all(UPDATE_FUNC_ARGS); +int run_stickman(float* playerp, UPDATE_FUNC_ARGS); struct particle @@ -931,10 +932,8 @@ int wireless[CHANNELS][2]; extern int gravwl_timeout; -extern int isplayer; -extern float player[27]; - -extern float player2[27]; +extern float player[28]; +extern float player2[28]; extern int gravityMode; extern int airMode; |