diff options
| -rw-r--r-- | games.c | 18 | ||||
| -rw-r--r-- | location.h | 27 |
2 files changed, 27 insertions, 18 deletions
@@ -29,7 +29,7 @@ static void print_map_with_pops(void) us_pop+=world[i].population; } /* now sort into US and USSR cities */ - struct location_t us_cities[sizeof(world)/sizeof(struct location_t)], ussr_cities[sizeof(world)/sizeof(struct location_t)]; + struct location_t us_cities[sizeof(world)/sizeof(struct location_t)+1], ussr_cities[sizeof(world)/sizeof(struct location_t)+1]; int us_back=0, ussr_back=0; for(int i=0;i<sizeof(world)/sizeof(struct location_t);++i) { @@ -60,21 +60,29 @@ static void print_map_with_pops(void) ++ussr_back; } } + us_cities[us_back].print=true; + us_cities[us_back].print_name="Total"; + us_cities[us_back].population=us_pop; + ussr_cities[ussr_back].print=true; + ussr_cities[ussr_back].print_name="Total"; + ussr_cities[ussr_back].population=ussr_pop; + ++us_back; + ++ussr_back; print_string("\n\n"); - char buf[256]; + char buf[512]; for(int i=0;i<us_back;++i) { if(us_cities[i].print && ussr_cities[i].print) { - snprintf(buf, 255, "%s %*s", us_cities[i].name, 64-strlen(us_cities[i].name), ussr_cities[i].name); + snprintf(buf, 512, "%s: %d %*s: %d", us_cities[i].print_name, us_cities[i].population, 64-strlen(us_cities[i].print_name), ussr_cities[i].print_name, ussr_cities[i].population); } else if(us_cities[i].print && !ussr_cities[i].print) - snprintf(buf, 255, "%s", us_cities[i].name); + snprintf(buf, 512, "%s: %d", us_cities[i].print_name, us_cities[i].population); else { memset(buf, ' ', 255); buf[255]=0; - snprintf(buf+64, 255-64, "%s", ussr_cities[i].name); + snprintf(buf+64, 512-64, "%s: %d", ussr_cities[i].print_name, ussr_cities[i].population); } print_string(buf); print_string("\n"); @@ -7,23 +7,24 @@ struct location_t { int population; /* around 1980 */ enum player_t owner; bool print; + const char* print_name; }; struct location_t world[]={ /* US cities */ - {"las vegas", 5, 7, 150000, USA, true}, - {"seattle", 3, 2, 500000, USA, true}, - {"new york", 34, 5, 7000000, USA, true}, - {"new orleans", 25, 10, 500000, USA, true}, - {"washington dc", 33, 6, 650000, USA, true}, - {"winston-salem", 30, 7, 150000, USA, true}, - {"san francisco", 1, 6, 700000, USA, true}, - {"chicago", 24, 4, 3000000, USA, true}, - {"miami", 33, 11, 1000000, USA, true}, + {"las vegas", 5, 7, 150000, USA, true, "Las Vegas"}, + {"seattle", 3, 2, 500000, USA, true, "Seattle"}, + {"new york", 34, 5, 7000000, USA, true, "New York City"}, + {"new orleans", 25, 10, 500000, USA, true, "New Orleans"}, + {"washington dc", 33, 6, 650000, USA, true, "Washington, DC"}, + {"winston-salem", 30, 7, 150000, USA, true, "Winston-Salem"}, + {"san francisco", 1, 6, 700000, USA, true, "San Francisco"}, + {"chicago", 24, 4, 3000000, USA, true, "Chicago"}, + {"miami", 33, 11, 1000000, USA, true, "Miami"}, /* Soviet cities */ /* NOTE: These cities are not accurate! */ - {"murmansk", 74, 1, 500000, USSR, true}, - {"moscow", 70, 5, 8000000, USSR, true}, - {"minsk", 66, 4, 1500000, USSR, true}, - {"chelyabinsk", 64, 8, 1250000, USSR, true} + {"murmansk", 74, 1, 500000, USSR, true,"Murmansk"}, + {"moscow", 70, 5, 8000000, USSR, true, "Moscow"}, + {"minsk", 66, 4, 1500000, USSR, true, "Minsk"}, + {"chelyabinsk", 64, 8, 1250000, USSR, true, "Chelyabinsk"} }; |