diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-07-26 16:46:15 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-07-26 16:46:15 (GMT) |
| commit | 899969cc8a3453040ea2f5578942ae2375a79f59 (patch) | |
| tree | 1a50a013f80ab9c5da9b8e89bb207f1cbdbdae2e /includes | |
| parent | 7338545ab43b1871cea0f91a15746e534d7a9e9b (diff) | |
| parent | dbd3272933de7769ed1efdd0492e1a5a872ed3bd (diff) | |
| download | powder-899969cc8a3453040ea2f5578942ae2375a79f59.zip powder-899969cc8a3453040ea2f5578942ae2375a79f59.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
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 f0a6d15..8651cd2 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 @@ -932,10 +933,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; |