diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2010-02-04 12:50:13 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2010-02-04 12:50:13 +0000 |
commit | ee074e35afa06915ffdffa4c45b4ef39703c5a00 (patch) | |
tree | 474b5c77d42e08123b60d6c86a28aff95520c297 /apps/plugins/superdom.c | |
parent | 723d5c6da6ee6c0bc028cf9a79642d05e4701731 (diff) | |
download | rockbox-ee074e35afa06915ffdffa4c45b4ef39703c5a00.tar.gz rockbox-ee074e35afa06915ffdffa4c45b4ef39703c5a00.zip |
superdom: fix bug that "Human starting factories" setting is ignored (part of FS#10964).
humanstartfarms was used where humanstartinds shuold be used.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24509 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/superdom.c')
-rw-r--r-- | apps/plugins/superdom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 4113ed7de2..2cd1d8e902 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -273,7 +273,7 @@ void init_board(void) { | |||
273 | compres.inds++; | 273 | compres.inds++; |
274 | } | 274 | } |
275 | } | 275 | } |
276 | while(humanres.farms<superdom_settings.humanstartfarms) { | 276 | while(humanres.farms < superdom_settings.humanstartfarms) { |
277 | i = rb->rand()%10 + 1; | 277 | i = rb->rand()%10 + 1; |
278 | j = rb->rand()%10 + 1; | 278 | j = rb->rand()%10 + 1; |
279 | if((board[i][j].colour == COLOUR_LIGHT)&&(board[i][j].farm == false)) { | 279 | if((board[i][j].colour == COLOUR_LIGHT)&&(board[i][j].farm == false)) { |
@@ -281,7 +281,7 @@ void init_board(void) { | |||
281 | humanres.farms++; | 281 | humanres.farms++; |
282 | } | 282 | } |
283 | } | 283 | } |
284 | while(humanres.inds<superdom_settings.humanstartfarms) { | 284 | while(humanres.inds < superdom_settings.humanstartinds) { |
285 | i = rb->rand()%10 + 1; | 285 | i = rb->rand()%10 + 1; |
286 | j = rb->rand()%10 + 1; | 286 | j = rb->rand()%10 + 1; |
287 | if((board[i][j].colour == COLOUR_LIGHT) && (board[i][j].ind == false)) { | 287 | if((board[i][j].colour == COLOUR_LIGHT) && (board[i][j].ind == false)) { |
@@ -660,7 +660,7 @@ int save_game(void) { | |||
660 | rb->write(fd, &superdom_settings.compstartfarms, sizeof(int)); | 660 | rb->write(fd, &superdom_settings.compstartfarms, sizeof(int)); |
661 | rb->write(fd, &superdom_settings.compstartinds, sizeof(int)); | 661 | rb->write(fd, &superdom_settings.compstartinds, sizeof(int)); |
662 | rb->write(fd, &superdom_settings.humanstartfarms, sizeof(int)); | 662 | rb->write(fd, &superdom_settings.humanstartfarms, sizeof(int)); |
663 | rb->write(fd, &superdom_settings.humanstartfarms, sizeof(int)); | 663 | rb->write(fd, &superdom_settings.humanstartinds, sizeof(int)); |
664 | rb->write(fd, &superdom_settings.startcash, sizeof(int)); | 664 | rb->write(fd, &superdom_settings.startcash, sizeof(int)); |
665 | rb->write(fd, &superdom_settings.startfood, sizeof(int)); | 665 | rb->write(fd, &superdom_settings.startfood, sizeof(int)); |
666 | rb->write(fd, &superdom_settings.movesperturn, sizeof(int)); | 666 | rb->write(fd, &superdom_settings.movesperturn, sizeof(int)); |
@@ -1969,7 +1969,7 @@ static int load_game(const char* file) { | |||
1969 | rb->read(fd, &superdom_settings.compstartfarms, sizeof(int)); | 1969 | rb->read(fd, &superdom_settings.compstartfarms, sizeof(int)); |
1970 | rb->read(fd, &superdom_settings.compstartinds, sizeof(int)); | 1970 | rb->read(fd, &superdom_settings.compstartinds, sizeof(int)); |
1971 | rb->read(fd, &superdom_settings.humanstartfarms, sizeof(int)); | 1971 | rb->read(fd, &superdom_settings.humanstartfarms, sizeof(int)); |
1972 | rb->read(fd, &superdom_settings.humanstartfarms, sizeof(int)); | 1972 | rb->read(fd, &superdom_settings.humanstartinds, sizeof(int)); |
1973 | rb->read(fd, &superdom_settings.startcash, sizeof(int)); | 1973 | rb->read(fd, &superdom_settings.startcash, sizeof(int)); |
1974 | rb->read(fd, &superdom_settings.startfood, sizeof(int)); | 1974 | rb->read(fd, &superdom_settings.startfood, sizeof(int)); |
1975 | rb->read(fd, &superdom_settings.movesperturn, sizeof(int)); | 1975 | rb->read(fd, &superdom_settings.movesperturn, sizeof(int)); |