matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix one merging error, and adjusted fighters' array.

Browse Source
This commit is contained in:
savask 2011-10-15 22:39:35 +07:00 committed by Simon Robertshaw
parent 573bda0950
commit a075fd5a9a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/powder.h
View File

@ -981,7 +981,7 @@ extern int gravwl_timeout;
extern float player[29]; extern float player[29];
extern float player2[29]; extern float player2[29];
extern float fighters[256][28]; extern float fighters[256][29];
extern unsigned char fighcount; extern unsigned char fighcount;
extern int gravityMode; extern int gravityMode;

2
src/powder.c
View File

@ -2890,7 +2890,7 @@ int create_parts(int x, int y, int rx, int ry, int c, int flags)
int wall = c - 100; int wall = c - 100;
if (c==SPC_WIND || c==PT_FIGH) if (c==SPC_WIND || c==PT_FIGH)
return 0; return 0;
}
if(c==SPC_PROP){ if(c==SPC_PROP){
prop_edit_ui(vid_buf, x, y); prop_edit_ui(vid_buf, x, y);
return 0; return 0;