Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

This commit is contained in:
Simon Robertshaw
2011-07-26 17:46:15 +01:00
7 changed files with 190 additions and 629 deletions

View File

@@ -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;