diff options
| author | Simon <simon@hardwired.org.uk> | 2010-12-19 17:29:30 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2010-12-19 17:29:30 (GMT) |
| commit | e380237cbc87ed97b16955b40807b0f2427818e9 (patch) | |
| tree | 7ca5cf634c1f6dd2034e7e9faedac2fe6d00344e /includes/defines.h | |
| parent | 24e662bc2d1f398962a59de85f993e8fad7190bc (diff) | |
| parent | ee4bb84395f2e8aaa9e9af7080f03d837b0a0344 (diff) | |
| download | powder-e380237cbc87ed97b16955b40807b0f2427818e9.zip powder-e380237cbc87ed97b16955b40807b0f2427818e9.tar.gz | |
Fix merge
Diffstat (limited to 'includes/defines.h')
| -rw-r--r-- | includes/defines.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/includes/defines.h b/includes/defines.h index 7b629c4..de04ea9 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -28,6 +28,8 @@ #define YRES 384 #define NPART XRES*YRES +#define MAX_DISTANCE sqrt(pow(XRES, 2)+pow(YRES, 2)) + #define MAXSIGNS 16 #define TAG_MAX 256 @@ -138,6 +140,12 @@ 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]; extern stamp stamps[STAMP_MAX]; extern int stamp_count; @@ -147,7 +155,7 @@ extern char itc_msg[64]; extern int do_open; extern int sys_pause; extern int legacy_enable; //Used to disable new features such as heat, will be set by commandline or save. -extern int death, framerender; +extern int death, death2, framerender; extern unsigned char last_major, last_minor, update_flag; |