neale
/
tanks
mirror of https://github.com/dirtbags/tanks.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix segfault when argc -1 > MAX_TANKS 

forftanks now reads up to MAX_TANKS valid tank directories in the order
provided on the command line. The 'order' index LUT has been re-purposed to
randomise the order they are placed on the game board.
This commit is contained in:
Adam Thomas 2011-06-30 14:20:38 +10:00
parent 1f3ea57b37
commit 4478c14434
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
forftanks.c
View File

@ -501,24 +501,12 @@ main(int argc, char *argv[])
fprintf(stdout, "// SEED=%d\n", seed);
}
/* Shuffle the order we read things in */
for (i = 0; i < MAX_TANKS; i += 1) {
order[i] = i;
}
for (i = 0; i < argc - 1; i += 1) {
int j = rand() % (argc - 1);
int n = order[j];
order[j] = order[i];
order[i] = n;
}
/* Every argument is a tank directory */
for (i = 0; i < argc - 1; i += 1) {
for (i = 1; ntanks < MAX_TANKS && i < argc; i += 1) {
if (ft_read_tank(&myftanks[ntanks],
&mytanks[ntanks],
lenv,
argv[order[i] + 1])) {
argv[i])) {
ntanks += 1;
}
}
@ -542,17 +530,29 @@ main(int argc, char *argv[])
game.size[1] = y * SPACING;
}
/* Shuffle the order we place things on the game board */
for (i = 0; i < ntanks; i += 1) {
order[i] = i;
}
for (i = 0; i < ntanks; i += 1) {
int j = rand() % ntanks;
int n = order[j];
order[j] = order[i];
order[i] = n;
}
/* Position tanks */
{
int x = SPACING/2;
int y = SPACING/2;
for (i = 0; i < ntanks; i += 1) {
mytanks[i].position[0] = (float)x;
mytanks[i].position[1] = (float)y;
mytanks[i].angle = deg2rad(rand() % 360);
mytanks[i].turret.current = deg2rad(rand() % 360);
mytanks[i].turret.desired = mytanks[i].turret.current;
mytanks[order[i]].position[0] = (float)x;
mytanks[order[i]].position[1] = (float)y;
mytanks[order[i]].angle = deg2rad(rand() % 360);
mytanks[order[i]].turret.current = deg2rad(rand() % 360);
mytanks[order[i]].turret.desired = mytanks[order[i]].turret.current;
x += SPACING;
if (x > game.size[0]) {