devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

superdom: fix bug that "Human starting factories" setting is ignored (part of FS#10964).

Browse source 
humanstartfarms was used where humanstartinds shuold be used.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24509 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-02-04 12:50:13 +00:00
parent 723d5c6da6
commit ee074e35af
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/plugins/superdom.c
View file

@ -273,7 +273,7 @@ void init_board(void) {
compres.inds++; compres.inds++;
} }
} }
while(humanres.farms<superdom_settings.humanstartfarms) { while(humanres.farms < superdom_settings.humanstartfarms) {
i = rb->rand()%10 + 1; i = rb->rand()%10 + 1;
j = rb->rand()%10 + 1; j = rb->rand()%10 + 1;
if((board[i][j].colour == COLOUR_LIGHT)&&(board[i][j].farm == false)) { if((board[i][j].colour == COLOUR_LIGHT)&&(board[i][j].farm == false)) {
@ -281,7 +281,7 @@ void init_board(void) {
humanres.farms++; humanres.farms++;
} }
} }
while(humanres.inds<superdom_settings.humanstartfarms) { while(humanres.inds < superdom_settings.humanstartinds) {
i = rb->rand()%10 + 1; i = rb->rand()%10 + 1;
j = rb->rand()%10 + 1; j = rb->rand()%10 + 1;
if((board[i][j].colour == COLOUR_LIGHT) && (board[i][j].ind == false)) { if((board[i][j].colour == COLOUR_LIGHT) && (board[i][j].ind == false)) {
@ -660,7 +660,7 @@ int save_game(void) {
rb->write(fd, &superdom_settings.compstartfarms, sizeof(int)); rb->write(fd, &superdom_settings.compstartfarms, sizeof(int));
rb->write(fd, &superdom_settings.compstartinds, sizeof(int)); rb->write(fd, &superdom_settings.compstartinds, sizeof(int));
rb->write(fd, &superdom_settings.humanstartfarms, sizeof(int)); rb->write(fd, &superdom_settings.humanstartfarms, sizeof(int));
rb->write(fd, &superdom_settings.humanstartfarms, sizeof(int)); rb->write(fd, &superdom_settings.humanstartinds, sizeof(int));
rb->write(fd, &superdom_settings.startcash, sizeof(int)); rb->write(fd, &superdom_settings.startcash, sizeof(int));
rb->write(fd, &superdom_settings.startfood, sizeof(int)); rb->write(fd, &superdom_settings.startfood, sizeof(int));
rb->write(fd, &superdom_settings.movesperturn, sizeof(int)); rb->write(fd, &superdom_settings.movesperturn, sizeof(int));
@ -1969,7 +1969,7 @@ static int load_game(const char* file) {
rb->read(fd, &superdom_settings.compstartfarms, sizeof(int)); rb->read(fd, &superdom_settings.compstartfarms, sizeof(int));
rb->read(fd, &superdom_settings.compstartinds, sizeof(int)); rb->read(fd, &superdom_settings.compstartinds, sizeof(int));
rb->read(fd, &superdom_settings.humanstartfarms, sizeof(int)); rb->read(fd, &superdom_settings.humanstartfarms, sizeof(int));
rb->read(fd, &superdom_settings.humanstartfarms, sizeof(int)); rb->read(fd, &superdom_settings.humanstartinds, sizeof(int));
rb->read(fd, &superdom_settings.startcash, sizeof(int)); rb->read(fd, &superdom_settings.startcash, sizeof(int));
rb->read(fd, &superdom_settings.startfood, sizeof(int)); rb->read(fd, &superdom_settings.startfood, sizeof(int));
rb->read(fd, &superdom_settings.movesperturn, sizeof(int)); rb->read(fd, &superdom_settings.movesperturn, sizeof(int));