Menu
▾
▴
Re: [Rails-devel] FW: Fwd: 1830 RSM Fix included
|
From: <Dr....@t-...> - 2012-02-01 07:18:14
|
Hi Stefan & Erik, i dont see the fixes in 1.6.x just in master ? Is that correct and intended ? Regards, Martin Von: Stefan Frey <ste...@we...> An: rai...@li... Betreff: Re: [Rails-devel] FW: Fwd: 1830 RSM Fix included Datum: Wed, 01 Feb 2012 08:08:14 +0100 Erik: the patch works perfectly: However you the commit you used to fix it is tainted by your merge: If you check a26c986 it changes 15 files and contains many changes which where actually from Frederick. My guess it that is somehow related to the fact that you merge your changes instead of using rebase to add them at the end of the repository? Have you set the git config branch.autosetuprebase=always? This was recommended by Brett Lentz and avoids the frequent merges you have used recently. For current case I will recreate a commit which only contains your fix for the 1.6.x branch. Stefan On 01/31/2012 10:25 PM, Erik Vos wrote: > I just have pushed a different fix: two statements had to be swapped. > > Martin, your fix would only allow selling 20%, but in fact the president can also sell only 10% if he wants. > > Erik. > > From: Dr....@t-... [mailto:Dr....@t-...] > Sent: Tuesday, January 31, 2012 9:15 PM > To: Development list for Rails: an 18xx game; Erik Vos; Stefan Frey > Subject: Re: [Rails-devel] Fwd: 1830 RSM Fix included > > Hi Stefan&Erik, > i believe the following small fix solves that problem, > Please run your usual test scenarios :) And maybe we should add that save file as a test ! > Regards, > Martin > diff --git a/rails/game/StockRound.java b/rails/game/StockRound.java > index 037d2cc..25d05ce 100644 > --- a/rails/game/StockRound.java > +++ b/rails/game/StockRound.java > @@ -464,7 +464,7 @@ > */ > // Take care for max. 4 share units per share > compName = company.getName(); > - int[] shareCountPerUnit = playerPortfolio.getCertificateTypeCountsPerCompany(compName, false); > + int[] shareCountPerUnit = playerPortfolio.getCertificateTypeCountsPerCompany(compName, true);//Martin: we need to make sure we find the president only share to sell in the next step! > // Check the price. If a cert was sold before this turn, the original price is still valid. > price = getCurrentSellPrice(company); > > Von: Stefan Frey > An: Erik Vos > Cc: an 18xx game > Betreff: [Rails-devel] Fwd: 1830 RSM > Datum: Tue, 31 Jan 2012 16:15:26 +0100 > Erik: > I forward you a report of a potentially critical bug: It does not allow > selling the director of the NYNH given that the operating director owns > the president share only and 2 other players have 20% each and Pool > having 30% only. > > This bug can be reproduced back to 1.5.3, unfortunately the save file is > not fully loadable under 1.5.2. > > I suspect this is related to the changes for 1835 at that time, I have > to admit that I cannot fully understand the code used to create the > actions for selling, so you might be in a better position to find this bug. > > Thanks, > Stefan > > > -------- Original Message -------- > Subject: Fwd: 1830 RSM > Date: Tue, 31 Jan 2012 09:30:48 -0500 > From: Bob Probst > To: stefan.frey > > Stefan, a friend of mine found this issue. I haven't confirmed it yet > but he's pretty thorough. > > I'm sure you can contact him directly if you have any questions > > > ---------- Forwarded message ---------- > From: "Ing. Antonio Baracca" > Date: Tue, 31 Jan 2012 14:53:37 +0100 > Subject: Fwd: 1830 RSM > To: Bob Probst > Cc: Palmiro Matteini > > Hi Bob, > we have found a major bug on the 1830 module. > The current player cannot sell 10% of NYNH from his president > certificate (remaining so with only 10% of NYNH and shifting the > presidency of the corporation). > I attach a saved file of the current 1830 game with the bug point. > I have seen you are currently in contact with programmers. > Can you please report to them this bug? > Thank you in advance. > Regards > Antonio > > > > Inizio messaggio inoltrato: > >> Da: "Palmiro Matteini" >> Data: 31 gennaio 2012 14.23.26 GMT+01.00 >> A: "Ing. Antonio Baracca" >> Oggetto: Re: 1830 RSM >> >> Eccolo. >> Ciao. >> >> Palmiro Matteini >> pma...@om... >> ----- Original Message ----- >> From: Ing. Antonio Baracca >> To: Palmiro Matteini >> Sent: Tuesday, January 31, 2012 11:46 AM >> Subject: Re: 1830 RSM >> >> Mandami la salvata che ci guardo >> >> >> Antonio Baracca >> ant...@ti... >> >> Il giorno 31/gen/2012, alle ore 09:28, "Palmiro Matteini" ha scritto: >> >>> Ciao Antonio. >>> Nella partita che stiamo facendo con Rail in ASGS, è successa una cosa strana. >>> Glauco ha venduto azioni della NYNH tenendosi solo il certificato della presidenza del 20%. >>> Al giro successivo c'erano altri giocatori che avevano il 20% e nel bank pool c'era il 30%. >>> Il programma stranamente non gli ha permesso di vendere il certificato della presidenza. >>> C'è un buco nel programma ? >>> Ciao. >>> >>> Palmiro Matteini >>> pma...@om... > > Antonio Baracca > ant...@gm... > > > > ------------------------------------------------------------------------------ > Keep Your Developer Skills Current with LearnDevNow! > The most comprehensive online learning library for Microsoft developers > is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, > Metro Style Apps, more. Free future releases when you subscribe now! > http://p.sf.net/sfu/learndevnow-d2d > _______________________________________________ > Rails-devel mailing list > Rai...@li... > https://lists.sourceforge.net/lists/listinfo/rails-devel ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Rails-devel mailing list Rai...@li... https://lists.sourceforge.net/lists/listinfo/rails-devel |
