Mercurial > mm7

diff Party.h @ 355:bbf8efb5bfee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 21 Feb 2013 09:25:50 +0600
parents 672b83584b0f
children edd2d8b7e3c4
line wrap: on
line diff
--- a/Party.h	Thu Feb 21 09:25:36 2013 +0600
+++ b/Party.h	Thu Feb 21 09:25:50 2013 +0600
@@ -280,7 +280,7 @@
   char field_15FF2[130];
   char pHireling1Name[100];
   char pHireling2Name[100];
-  int field_1613C;
+  int armageddon_timer;
   int field_16140;
   int pTurnBasedPlayerRecoveryTimes[4];
   char field_16154[212];