Complete.Org: Mailing Lists: Archives: freeciv-dev: October 2002:
[Freeciv-Dev] Re: civ expense under anarchy (PR#806)
Home

[Freeciv-Dev] Re: civ expense under anarchy (PR#806)

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: freeciv-dev@xxxxxxxxxxx
Cc: bugs@xxxxxxxxxxxxxxxxxxx
Subject: [Freeciv-Dev] Re: civ expense under anarchy (PR#806)
From: Jason Short <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Thu, 3 Oct 2002 17:54:00 -0700 (PDT)

jdorje@xxxxxxxxxxxxxxxxxxxxx wrote:
The patch says it all...

But with a grammar error (typo).

Here's the same patch, but with the typo fixed. The patch fixes the economy dialog so that expenditures under anarchy are correctly reported (as 0).

I also provide a saved game to see the change (why not...). Join as jdorje; the civilization is already in anarch.

jason
? anarchy-game.diff.gz
? anarchy_expense-2.diff
? anarchy_expense.diff
? debian.diff
? freeciv-1.13.1-devel.tar.gz
? freeciv-patches.tgz
? jason-game.gz
? ndebug-warning.diff
? normalize_map_pos.diff
? normalize_real_map_pos.diff
? option_callback.diff
? popdown_city_report_dialog-2.diff
? popdown_city_report_dialog.diff
? rc
? server_gen_string.diff
? test.pl
? tileset_switching-3.diff
Index: client/repodlgs_common.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/repodlgs_common.c,v
retrieving revision 1.3
diff -u -r1.3 repodlgs_common.c
--- client/repodlgs_common.c    2002/07/01 21:13:30     1.3
+++ client/repodlgs_common.c    2002/10/04 00:51:07
@@ -49,8 +49,13 @@
       entries[*num_entries_used].total_cost = cost;
       entries[*num_entries_used].cost = cost / count;
       (*num_entries_used)++;
-      
-      *total_cost += cost;
+
+      /* Currently there is no building expense under anarchy.  It's
+       * not a good idea to hard-code this in the client, but what
+       * else can we do? */
+      if (game.player_ptr->government != game.government_when_anarchy) {
+       *total_cost += cost;
+      }
     }
   } impr_type_iterate_end;
 

Attachment: anarchy-game.diff.gz
Description: application/gzip


[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] Re: civ expense under anarchy (PR#806), Jason Short <=