bugFreeciv - Bugs: bug #20693, Civil war not possible when...

 
 
Show feedback again

bug #20693: Civil war not possible when there's 125 normal players and a barbarian

Submitted by:  Marko Lindqvist <cazfi>
Submitted on:  Sun 31 Mar 2013 10:47:37 PM UTC  
 
Category: generalSeverity: 3 - Normal
Priority: 5 - NormalStatus: Fixed
Assigned to: Marko Lindqvist <cazfi>Open/Closed: Closed
Release: Operating System: None
Planned Release: 2.3.5, 2.4.0-beta2, 2.5.0

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

(Jump to the original submission Jump to the original submission)

Sun 07 Apr 2013 11:18:24 PM UTC, SVN revision 22691:

Never consider barbarians to count towards 'maxplayers' limit.
Some parts of the code expected them to be included, other parts
expected them not to be included. Now all parts expect them not
to be included.

See bug #20693

(Browse SVN revision 22691)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 07 Apr 2013 11:18:19 PM UTC, SVN revision 22690:

Never consider barbarians to count towards 'maxplayers' limit.
Some parts of the code expected them to be included, other parts
expected them not to be included. Now all parts expect them not
to be included.

See bug #20693

(Browse SVN revision 22690)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 07 Apr 2013 11:18:13 PM UTC, SVN revision 22689:

Never consider barbarians to count towards 'maxplayers' limit.
Some parts of the code expected them to be included, other parts
expected them not to be included. Now all parts expect them not
to be included.

See bug #20693

(Browse SVN revision 22689)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 04 Apr 2013 07:21:56 PM UTC, comment #5:

Some parts of the code break if barbarians are not included in 'maxplayers', some parts break if they are included.

Attached patch makes barbarians never to count toward 'maxplayers'. Among the artifacts this fixes is that value of 'maxplayers' setting won't be automatically increased to value higher than its maximum value (max: MAX_NUM_PLAYERS, was containing at max: MAX_NUM_PLAYERS + MAX_NUM_BARBARIANS)

(file #17677)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 04 Apr 2013 06:39:11 PM UTC, comment #4:

This is bigger issue than the fixed part. Now that the test allows civil war to proceed with higher current player count, assert fails later and maxplayers setting can (automatically) go over its maximum value (that human can set)...

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 04 Apr 2013 03:13:45 PM UTC, SVN revision 22666:

Do not count existing barbarians to normal player count when checking
if there's free slots for new player to create from civil war.

See bug #20693

(Browse SVN revision 22666)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 04 Apr 2013 03:13:41 PM UTC, SVN revision 22665:

Do not count existing barbarians to normal player count when checking
if there's free slots for new player to create from civil war.

See bug #20693

(Browse SVN revision 22665)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 04 Apr 2013 03:13:35 PM UTC, SVN revision 22664:

Do not count existing barbarians to normal player count when checking
if there's free slots for new player to create from civil war.

See bug #20693

(Browse SVN revision 22664)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 31 Mar 2013 10:47:37 PM UTC, original submission:

When checking if civil war would hit hardcoded max players limit, barbarian players are included in the count despite there being reserved space for barbarian nations on top of the max normal players count.

Fix attached.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.

 

(Note: upload size limit is set to 1024 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

Attached Files
file #17677:  BarbNoMaxPlayer.patch added by cazfi (4kB - text/x-diff)
file #17633:  CivilBarbarians.patch added by cazfi (521B - text/x-diff)

 

Depends on the following items: None found

Items that depend on this one

Digest:
   bug dependencies.

 

Carbon-Copy List
  • -unavailable- added by jtn (Updated the item)
  • -unavailable- added by cazfi (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 12 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Sun 07 Apr 2013 11:18:38 PM UTCcazfiStatusReady For Test=>Fixed
      Open/ClosedOpen=>Closed
    Sat 06 Apr 2013 06:07:04 PM UTCjtnPlanned Release2.3.5, 2.4.0, 2.5.0=>2.3.5, 2.4.0-beta2, 2.5.0
    Thu 04 Apr 2013 07:21:56 PM UTCcazfiAttached File-=>Added BarbNoMaxPlayer.patch, #17677
      StatusIn Progress=>Ready For Test
    Thu 04 Apr 2013 06:39:11 PM UTCcazfiStatusFixed=>In Progress
      Open/ClosedClosed=>Open
    Thu 04 Apr 2013 03:13:58 PM UTCcazfiStatusReady For Test=>Fixed
      Assigned toNone=>cazfi
      Open/ClosedOpen=>Closed
    Mon 01 Apr 2013 09:02:28 PM UTCcazfiDependencies-=>bugs #19474 is dependent
    Sun 31 Mar 2013 10:47:37 PM UTCcazfiAttached File-=>Added CivilBarbarians.patch, #17633
    Show feedback again

    Back to the top


    Powered by Savane 3.1-cleanup