--- Log opened Fri May 30 00:00:34 2014 --- Day changed Fri May 30 2014 20140530 00:00:34< iceiceice_> i think maybe it should be 20140530 00:01:20< irker675> wesnoth: Chris Beck wesnoth:master 0af672c5b7a5 / src/play_controller.hpp: remove unnecessary virtual qualifiers http://git.io/19sf_Q 20140530 00:03:26< iceiceice_> gfgtdf: do you think that it's possilbe that a game can be saved before prestart / start? 20140530 00:04:04< iceiceice_> i'm noticing this code in playsingle_controller::play_scenario 20140530 00:04:38-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140530 00:04:38-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140530 00:06:01-!- prophile [~alynn@oftn/member/prophile] has quit [Client Quit] 20140530 00:09:58-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140530 00:13:21< gfgtdf> iceiceice_: which code ? 20140530 00:13:34< gfgtdf> iceiceice_: no i dont think its posible so save before prester / start 20140530 00:13:38< gfgtdf> but im not sure 20140530 00:14:13< iceiceice_> i think it might be nice if we made game_data.phase part of the game state 20140530 00:14:17< iceiceice_> in the sense that it is saved or not 20140530 00:14:25< iceiceice_> and use that to decide whether to fire prestart and start events 20140530 00:14:26< gfgtdf> iceiceice_: hm did you find any bugs related to that ? 20140530 00:14:43< iceiceice_> no i'm just doing what you do, reading the code and spotting things that seem funny :) 20140530 00:15:21< iceiceice_> maybe phase is only supposed to be useful for the construction of the game? idk 20140530 00:15:28< iceiceice_> it seems like it might be a good idea to serialize it 20140530 00:15:35< iceiceice_> because then when we reload we will know exactly where we left off 20140530 00:16:51< gfgtdf> iceiceice_: hm but i still think it not posible to start the events before start, since i currently see no hole in the code where the user gets control. 20140530 00:17:51< iceiceice_> when does the user get control? with init_gui? 20140530 00:17:56< gfgtdf> iceiceice_: i dont think we should put a value n teh savefile that is always teh same because just having it in teh savefiles makes people think that it is not alwas the same 20140530 00:18:07< gfgtdf> in play_slice usuall 20140530 00:18:12< iceiceice_> i mean it can sometimes be "linger" right? 20140530 00:18:23< iceiceice_> it might be useful for testing, 20140530 00:18:26< iceiceice_> if we could like 20140530 00:18:42< iceiceice_> make an artificial save file and set its phase to prestart 20140530 00:18:49< iceiceice_> and then make tests about what happens 20140530 00:19:23< iceiceice_> since its sort of too hard to make unit tests for things at that level 20140530 00:19:27< iceiceice_> *C++ unit tests 20140530 00:19:50< gfgtdf> i dont think PHASE has a vlue linger 20140530 00:20:08< gfgtdf> value 20140530 00:21:14< gfgtdf> iceiceice_: https://github.com/wesnoth/wesnoth/blob/master/src/gamestatus.hpp#L175 20140530 00:21:43< iceiceice_> i see 20140530 00:21:45< iceiceice_> its just construction phase 20140530 00:21:53< iceiceice_> ok forget it i guess 20140530 00:22:04< iceiceice_> hmm i think that play_controller:objectives is never called 20140530 00:22:47-!- prophile [~alynn@oftn/member/prophile] has quit [Ping timeout: 245 seconds] 20140530 00:22:48< iceiceice_> is it by hotkey executor only? 20140530 00:23:13< gfgtdf> maybe teh "show_objetives" hotkey ? 20140530 00:23:20< gfgtdf> ctrl+enter i think it was 20140530 00:28:28< iceiceice_> hmm do you think its worthwhile to go thorugh and unmark virtual things from play_Controller? 20140530 00:28:32< iceiceice_> maybe not 20140530 00:30:02< gfgtdf> hm maybe it shouldnt be that much work, and virtual functions kinda suggest that someone overrites them 20140530 00:30:23-!- esr [~esr@wesnoth/developer/esr] has quit [Quit: WeeChat 0.4.2] 20140530 00:31:39< iceiceice_> y it makes it easier to figure out whats going on if its only virtual when its overrided 20140530 00:31:48< iceiceice_> but the hotkey inherited stuff isnt so important right now 20140530 00:31:55< iceiceice_> i have a question, 20140530 00:32:01-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140530 00:32:03< iceiceice_> why do we actually have do_init_side and maybe_do_init_side 20140530 00:32:08< iceiceice_> why cant those just be one function 20140530 00:32:25< iceiceice_> i always thought do_init_side didnt do any checks or something 20140530 00:32:29< iceiceice_> but actually it does a ton of checks 20140530 00:32:51-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: tomreyn] 20140530 00:32:55< iceiceice_> theres only like 1 place that do_init_side is called rahter than maybe 20140530 00:33:01< iceiceice_> looks like in replay.cpp 20140530 00:33:20-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Read error: Connection reset by peer] 20140530 00:36:01-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev 20140530 00:37:08< iceiceice_> hmm ok heres one thing i think we can safely do 20140530 00:37:20< iceiceice_> maybe_do_init_side, init_side, and play_side 20140530 00:37:32< iceiceice_> always the first argument should be player_number_ - 1 20140530 00:37:32-!- esr [~esr@static-71-162-243-5.phlapa.fios.verizon.net] has joined #wesnoth-dev 20140530 00:37:32-!- esr [~esr@static-71-162-243-5.phlapa.fios.verizon.net] has quit [Changing host] 20140530 00:37:32-!- esr [~esr@wesnoth/developer/esr] has joined #wesnoth-dev 20140530 00:38:03< iceiceice_> you know what, i think i'm going to add an assertion to each of those that that is the case 20140530 00:38:06< iceiceice_> and run all the unit tests 20140530 00:38:15< iceiceice_> and play an mp game and watch the replay 20140530 00:39:06< iceiceice_> and see if it ever breaks 20140530 00:39:06< iceiceice_> and if not just commit that 20140530 00:40:01< gfgtdf> iceiceice_: the assert player_number_ -1 ? ye that sounds good. 20140530 00:40:12< gfgtdf> iceiceice_: you know when this is teh case ? :https://github.com/wesnoth/wesnoth/blob/master/src/playcampaign.cpp#L104 20140530 00:40:56< iceiceice_> no 20140530 00:42:27< iceiceice_> do you think this can become "maybe_do_init_side" without breaking anything? https://github.com/wesnoth/wesnoth/blob/master/src/replay.cpp#L827 20140530 00:44:50< gfgtdf> no becasue the recorder.init_side(); in maybe_do_init_side woudl break it 20140530 00:44:59< gfgtdf> since we alread have in on th recorder 20140530 00:45:02< gfgtdf> the* 20140530 00:45:14< gfgtdf> iceiceice_: ^ 20140530 00:45:17< iceiceice_> hmm but you just added tha tlike one commit ago 20140530 00:45:27< gfgtdf> i added what ? 20140530 00:45:35< iceiceice_> the recorder init side in maybe do init side ? 20140530 00:45:53< iceiceice_> maybe theres someway to reconcile it 20140530 00:45:58< gfgtdf> no it was alre there beofe 20140530 00:46:01< iceiceice_> hmm 20140530 00:46:11< iceiceice_> i would like to merge maybe_do_init_side and do_init_side, 20140530 00:46:20< gfgtdf> is was if (!loading_game_) recorder.init_side(); 20140530 00:46:26< iceiceice_> i think it would be simpler and i dont see any clear reason for maybe_do_init_side to exist 20140530 00:47:04< iceiceice_> how do you decide when to call one vs the other? is there a rationale? 20140530 00:47:12< iceiceice_> it seems very opaque, or like you almost always want to call "maybe" 20140530 00:48:49< gfgtdf> sure no iw you ae in iceiceice_ you you know why maybe_do_init side has a parameter is_replay ? 20140530 00:48:55< gfgtdf> i mena do we ever all it with yes ? 20140530 00:49:25< iceiceice_> idk 20140530 00:49:56< gfgtdf> iceiceice_: ah in rpelay controller fr emtly sides 20140530 00:50:15< iceiceice_> hmm 20140530 00:50:23< iceiceice_> maybe play_controller::do_init_side can just check for empty directly 20140530 00:50:29< iceiceice_> or smth 20140530 00:51:49< iceiceice_> hmm ok 20140530 00:51:58< iceiceice_> im going to factor out the side number argument to do_init_side 20140530 00:52:16< iceiceice_> it seems to never break 20140530 00:52:32< iceiceice_> i guess i can try an mp campaign also 20140530 00:55:58-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 240 seconds] 20140530 01:14:07-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev 20140530 01:22:03-!- sachith500 [~kvirc@112.134.74.87] has joined #wesnoth-dev 20140530 01:22:03-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has joined #wesnoth-dev 20140530 01:24:54< iceiceice_> hmm 20140530 01:24:56< iceiceice_> so this is a bit funny 20140530 01:24:57-!- Necrosporus [~Necrospor@unaffiliated/necrosporus] has quit [Ping timeout: 252 seconds] 20140530 01:25:15< iceiceice_> you cannot assert that the side index arg to playsingle_controller::play_side is player_number_ - 1 20140530 01:25:19< iceiceice_> beacuse of the following 20140530 01:26:03< iceiceice_> https://github.com/wesnoth/wesnoth/blob/master/src/playsingle_controller.cpp#L636 20140530 01:27:20< iceiceice_> in replay_controler the corresponding call is play_side(player_number_ -1) though 20140530 01:31:31-!- sachith500 [~kvirc@112.134.74.87] has quit [Read error: Connection reset by peer] 20140530 01:33:45-!- sachith500 [~kvirc@112.134.74.87] has joined #wesnoth-dev 20140530 01:35:13< irker675> wesnoth: Chris Beck wesnoth:master bf0fca4d83de / src/play_controller.cpp: assert that do_init_side functions are never called with bad arg http://git.io/rX0Ctg 20140530 01:35:15< irker675> wesnoth: Chris Beck wesnoth:master 1e4858fa4ace / src/ (6 files): remove unnecessary arguments http://git.io/-iP8QA 20140530 01:35:17< iceiceice_> gfgtdf: ^ 20140530 01:37:30< gfgtdf> iceiceice_: hm ye i think this is good 20140530 01:37:58< iceiceice_> i think i'm also going to do it for play_side 20140530 01:38:05< iceiceice_> but i will test that separately 20140530 01:43:06-!- groggy [~chatzilla@75-131-166-139.dhcp.spbg.sc.charter.com] has joined #wesnoth-dev 20140530 01:48:08-!- groggy [~chatzilla@75-131-166-139.dhcp.spbg.sc.charter.com] has quit [Remote host closed the connection] 20140530 01:56:33-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140530 02:04:18-!- ancestral [~ancestral@17.114.45.98] has quit [Quit: ancestral] 20140530 02:12:40< irker675> wesnoth: Chris Beck wesnoth:master 890f6f0fcebc / src/ (7 files): remove more unnecessary arguments, from play_controller::play_side http://git.io/aaz3Hg 20140530 02:12:44< iceiceice_> gfgtdf: ^ 20140530 02:26:58-!- Ivanovic_ [~ivanovic@frnk-5f74d577.pool.mediaWays.net] has joined #wesnoth-dev 20140530 02:30:21-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 276 seconds] 20140530 02:30:52-!- Ivanovic_ is now known as Ivanovic 20140530 02:33:17-!- Ivanovic [~ivanovic@frnk-5f74d577.pool.mediaWays.net] has quit [Changing host] 20140530 02:33:18-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev 20140530 02:39:02-!- spoffy [~spoffy@152.78.175.8] has quit [Ping timeout: 245 seconds] 20140530 02:41:54-!- gfgtdf [~chatzilla@e177118255.adsl.alicedsl.de] has quit [Quit: ChatZilla 0.9.90.1 [Firefox 29.0.1/20140506152807]] 20140530 02:46:48-!- travis-ci [~travis-ci@ec2-54-204-106-71.compute-1.amazonaws.com] has joined #wesnoth-dev 20140530 02:46:48< travis-ci> [travis-ci] wesnoth/wesnoth#2865 (master - 890f6f0 : Chris Beck): The build was broken. 20140530 02:46:48< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/26352482 20140530 02:46:48-!- travis-ci [~travis-ci@ec2-54-204-106-71.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140530 02:47:55-!- happygrue [~happygrue@wesnoth/developer/wintermute] has quit [Ping timeout: 240 seconds] 20140530 02:56:28-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Quit: Ik ga weg] 20140530 03:02:17< irker675> wesnoth: Chris Beck wesnoth:master 2a22efb6465e / src/game_events/action_wml.cpp: [modify_side] may now set defeat_condition attribute http://git.io/R2joRQ 20140530 03:03:56< irker675> wesnoth: Chris Beck wesnoth:1.12 28e428e72589 / src/game_events/action_wml.cpp: [modify_side] may now set defeat_condition attribute http://git.io/pg818w 20140530 03:03:58< irker675> wesnoth: Chris Beck wesnoth:1.12 49b542fd2130 / changelog: update changelog http://git.io/Srb5mQ 20140530 03:04:43< irker675> wesnoth: Chris Beck wesnoth:master ea600928ec91 / changelog: update changelog http://git.io/IVJUew 20140530 03:04:48< iceiceice_> gfgtdf: ^ 20140530 03:13:14-!- sachith500 [~kvirc@112.134.74.87] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140530 03:18:02-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140530 03:32:11-!- travis-ci [~travis-ci@ec2-54-82-224-50.compute-1.amazonaws.com] has joined #wesnoth-dev 20140530 03:32:11< travis-ci> [travis-ci] wesnoth/wesnoth#2866 (master - 2a22efb : Chris Beck): The build is still failing. 20140530 03:32:11< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/26354330 20140530 03:32:11-!- travis-ci [~travis-ci@ec2-54-82-224-50.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140530 03:45:33< irker675> wesnoth: Chris Beck wesnoth:master 19b381b560ba / src/playsingle_controller.cpp: fix gcc compilation http://git.io/QxAzAg 20140530 03:49:58-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140530 03:52:03-!- travis-ci [~travis-ci@ec2-54-82-224-50.compute-1.amazonaws.com] has joined #wesnoth-dev 20140530 03:52:03< travis-ci> [travis-ci] wesnoth/wesnoth#2868 (master - ea60092 : Chris Beck): The build is still failing. 20140530 03:52:03< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/26354413 20140530 03:52:03-!- travis-ci [~travis-ci@ec2-54-82-224-50.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140530 04:11:45-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 276 seconds] 20140530 04:13:19-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev 20140530 04:15:51-!- Gambit [~derek@wesnoth/developer/grickit] has quit [Remote host closed the connection] 20140530 04:20:49-!- travis-ci [~travis-ci@ec2-54-82-224-50.compute-1.amazonaws.com] has joined #wesnoth-dev 20140530 04:20:49< travis-ci> [travis-ci] wesnoth/wesnoth#2869 (master - 19b381b : Chris Beck): The build was fixed. 20140530 04:20:49< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/26355862 20140530 04:20:49-!- travis-ci [~travis-ci@ec2-54-82-224-50.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140530 04:21:32< shadowm> > [modify_side] may now set defeat_condition attribute 20140530 04:21:36< shadowm> What bug does this fix? 20140530 04:23:56< vultraz> The bug where [modify_side] doesn't set defeat_condition 20140530 04:24:10-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Remote host closed the connection] 20140530 04:24:47< shadowm> What bug does that fix? 20140530 04:25:45< shadowm> I mean, seriously, we could go and claim that every single missing feature is a bug... and that's not how things work. 20140530 04:30:49-!- vultraz [~chatzilla@124.109.10.167] has joined #wesnoth-dev 20140530 04:32:19-!- vultraz [~chatzilla@124.109.10.167] has quit [Changing host] 20140530 04:32:19-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20140530 04:47:19< irker675> wesnoth: Chris Beck wesnoth:master 15e81134fb2b / src/ (7 files): remove unnecessary arguments http://git.io/PUtlYQ 20140530 04:48:39< iceiceice_> shadowm: i think we are far from that 20140530 04:49:03< iceiceice_> if you think i introduced a bug, by all means review the commit 20140530 04:49:07< iceiceice_> it is like 2 lines 20140530 04:50:07< iceiceice_> reported by slowthinker on the bug tracker, that was why i took a look at it 20140530 04:50:57< shadowm> Nobody said anything about introducing bugs, we were talking about introducing featurse. 20140530 04:51:37< shadowm> I'm pretty sure I also forgot to give modify_side several other powers in the past. 20140530 04:52:14< shadowm> In any case the person who really should review that should be Ivanovic, not me. 20140530 04:52:20< iceiceice_> hmm you are right, 20140530 04:52:34< iceiceice_> i thought that everything on sidewml was supposed to be modifable unless expliclty stated not 20140530 04:52:46< iceiceice_> but apparently on http://wiki.wesnoth.org/DirectActionsWML#.5Bmodify_side.5D there is supposed to be an exhaustive list 20140530 04:52:47-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 245 seconds] 20140530 04:53:07< iceiceice_> so i guess you are right it doesnt break the docs 20140530 04:53:15< iceiceice_> i thought it did, you could argue its a feature then 20140530 04:53:45< iceiceice_> ok my bad, revert the commit if you like 20140530 04:53:48< iceiceice_> Ivanovic: ^ 20140530 04:54:48-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev 20140530 05:45:54-!- WinterD [~quassel@177.196.200.77.rev.sfr.net] has joined #wesnoth-dev 20140530 05:48:19-!- Guest63621 [~cib@p20030067CE126501267703FFFEE75B84.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140530 06:03:11-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has quit [Quit: Leaving] 20140530 06:06:55-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has quit [Ping timeout: 252 seconds] 20140530 06:07:46-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has joined #wesnoth-dev 20140530 06:33:19-!- iceiceice_ [~chris@cpe-66-108-20-80.nyc.res.rr.com] has quit [Ping timeout: 252 seconds] 20140530 06:34:39-!- iceiceice_ [~chris@pool-108-27-117-26.nycmny.east.verizon.net] has joined #wesnoth-dev 20140530 06:35:25< iceiceice_> gfgtdf: i figured out what is going on: 20140530 06:35:31-!- _8680_ [~8680@2002:4404:712c:0:a8:a7ab:401d:237d] has quit [Ping timeout: 240 seconds] 20140530 06:35:45< iceiceice_> the playing_side and loading_game various are actually being serialized, and are somehow part of the gamestate 20140530 06:35:51< iceiceice_> *variables 20140530 06:36:03< iceiceice_> they are being requested *from the gui* here: https://github.com/wesnoth/wesnoth/blob/master/src/gamestatus.cpp#L1057 20140530 06:36:19-!- _8680_ [~8680@2002:4404:712c:0:b5c9:5ab4:d537:5626] has joined #wesnoth-dev 20140530 06:37:03< iceiceice_> i think we should clean this up and make sure that the gui doesn't hold any game state info 20140530 06:47:29-!- sachith500 [~kvirc@112.135.59.107] has joined #wesnoth-dev 20140530 06:51:04-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140530 06:57:53-!- Jetrel [~Jetrel@c-75-73-180-126.hsd1.mn.comcast.net] has quit [Ping timeout: 252 seconds] 20140530 07:01:11-!- Jetrel [~Jetrel@c-75-73-180-126.hsd1.mn.comcast.net] has joined #wesnoth-dev 20140530 07:04:46-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140530 07:08:10-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140530 07:17:35< Ivanovic> iceiceice_: yes, please revert API changes 20140530 07:22:01-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140530 07:43:38-!- iceiceice_ [~chris@pool-108-27-117-26.nycmny.east.verizon.net] has quit [Ping timeout: 276 seconds] 20140530 07:47:21-!- irker675 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout] 20140530 07:58:50-!- mjs-de [~mjs-de@g228033017.adsl.alicedsl.de] has joined #wesnoth-dev 20140530 08:03:21< vultraz> Or move them to Master 20140530 08:15:58-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20140530 08:19:03-!- irker447 [~irker@fehu.ai0867.net] has joined #wesnoth-dev 20140530 08:19:03< irker447> wesnoth: Boldizsár Lipka wesnoth:master aa9c6b5feb68 / src/sdl/texture.cpp: Re-add two ctors removed by mistake. http://git.io/-60C2g 20140530 08:21:21-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140530 08:23:36< zookeeper> shadowm, random thought: do you think it'd be slow/costly if linger mode applied an IPF to the whole screen (dunno how exactly) instead of the current tiled overlay image only? 20140530 08:24:42-!- thunderstruck [~zaibotren@cpc13-sgyl31-2-0-cust696.18-2.cable.virginm.net] has joined #wesnoth-dev 20140530 08:56:17-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140530 08:56:54-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140530 09:00:50-!- Necrosporus_ is now known as Necrosporus 20140530 09:01:48< Necrosporus> zookeeper, shouldn't linger mode show remaining hitpoints? 20140530 09:02:04< Necrosporus> currently all units are fully healed before linger mode is active 20140530 09:02:20< zookeeper> it should, yes. 20140530 09:23:42-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140530 09:28:43-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140530 09:30:17-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 264 seconds] 20140530 09:52:02< aquileia> zookeeper: I read the HttT intro more carefully, and I have a minor issue... the battle was "in the hinterlands near Tath". That means Delfador rode to Weldyn, raised an army - but meets Eldred in the middle of Abez and Weldyn? 20140530 09:52:40< aquileia> He instantly assembled the troops? 20140530 09:52:43-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140530 09:53:03-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140530 09:53:42-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140530 09:53:46< aquileia> However with<\i> the khalifate... Eldred would first meet them near fort Than, which leaves Delfador time to raise them 20140530 09:54:10-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Client Quit] 20140530 09:54:23-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140530 09:54:44< aquileia> So one could argue we need<\i> such an addition to lore =P 20140530 09:54:55-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer] 20140530 09:55:06-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140530 09:55:38-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Client Quit] 20140530 09:55:52-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140530 09:56:33< aquileia> Yes, I'm not exactly serious with that... ;) 20140530 09:56:59-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 240 seconds] 20140530 09:59:49-!- Upth [~ogmar@108-85-89-233.lightspeed.frokca.sbcglobal.net] has quit [Quit: this quit message is 100% guaranteed not to contain obscenity.] 20140530 10:11:26-!- aquileia [2edf524c@gateway/web/freenode/ip.46.223.82.76] has quit [Quit: Page closed] 20140530 10:11:50< Rhonda> You got the / wrong 20140530 10:24:11-!- stikonas_ [~gentoo@wesnoth/translator/stikonas] has quit [Ping timeout: 240 seconds] 20140530 10:45:11< AI0867> iceiceice: ah, so that's why defeat_condition didn't do what I wanted it to during a unit test 20140530 10:53:27< zookeeper> aquileia, yeah, it doesn't really make sense for the battle to be near tath 20140530 10:54:41< zookeeper> but even if eldred went southwest first to get his mercenaries, why would he march all the way back to tath instead of straight to weldyn? 20140530 10:58:07-!- mjs-de [~mjs-de@g228033017.adsl.alicedsl.de] has quit [Remote host closed the connection] 20140530 11:18:29-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140530 11:19:00-!- irker447 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout] 20140530 11:19:21-!- EdB [~edb@85.69.242.6] has joined #wesnoth-dev 20140530 11:34:48-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140530 11:51:29< AI0867> http://forums.wesnoth.org/viewtopic.php?p=571075#p571075 20140530 11:51:55< AI0867> ^ stuff about attack-move and continue after fogged unit reveal 20140530 11:52:18< AI0867> aka, we're not ready for an RC yet 20140530 12:00:21-!- aquileia [2edf50c1@gateway/web/freenode/ip.46.223.80.193] has joined #wesnoth-dev 20140530 12:02:26< aquileia> Rhonda: thanks, but you could have turned them off yourself ;) 20140530 12:03:15< aquileia> zookeeper: Well, then a courier picks them up while Eldred stays around Abez 20140530 12:04:36< aquileia> and I'm off again, configuring the network settings... 20140530 12:04:46-!- aquileia [2edf50c1@gateway/web/freenode/ip.46.223.80.193] has quit [Client Quit] 20140530 12:25:50-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140530 12:37:32-!- DCW [~Thunderbi@cpc66863-finc15-2-0-cust393.4-2.cable.virginm.net] has joined #wesnoth-dev 20140530 12:37:46-!- spoffy [~spoffy@152.78.175.8] has joined #wesnoth-dev 20140530 12:45:18-!- DCW [~Thunderbi@cpc66863-finc15-2-0-cust393.4-2.cable.virginm.net] has quit [Remote host closed the connection] 20140530 12:50:30-!- kex [~kex@212.92.210.53] has joined #wesnoth-dev 20140530 13:11:42-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140530 13:22:57-!- mjs-de [~mjs-de@f048194175.adsl.alicedsl.de] has joined #wesnoth-dev 20140530 13:41:33-!- EdB [~edb@85.69.242.6] has quit [Quit: Konversation terminated!] 20140530 13:43:57-!- apoi [~andi@85-126-180-242.volume.xdsl-line.inode.at] has quit [Quit: leaving] 20140530 13:49:10-!- apoi [~andi@85-126-180-242.volume.xdsl-line.inode.at] has joined #wesnoth-dev 20140530 14:01:38-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20140530 14:02:07-!- riksteri [~riksteri@dsl-tkubrasgw3-54f96b-216.dhcp.inet.fi] has joined #wesnoth-dev 20140530 14:02:09-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140530 14:22:00-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140530 14:35:10-!- irker877 [~irker@fehu.ai0867.net] has joined #wesnoth-dev 20140530 14:35:10< irker877> wesnoth: Chris Beck wesnoth:1.12 35322537cb2e / src/game_events/action_wml.cpp: Revert "[modify_side] may now set defeat_condition attribute" http://git.io/F1ASPg 20140530 14:35:10< irker877> wesnoth: Chris Beck wesnoth:1.12 d14a0b3db5f4 / changelog: Revert "update changelog" http://git.io/L0Wrug 20140530 14:36:18-!- Sulfur [~Miranda@p5B00886C.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140530 14:37:29< Necrosporus> Why reverting? 20140530 14:38:58< AI0867> because feature freeze 20140530 14:39:59< Necrosporus> but then it's an inconsistency 20140530 14:43:13< AI0867> somewhat, but [modify_side] can't modify every [side] attribute anyway 20140530 14:48:12-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has joined #wesnoth-dev 20140530 14:50:03-!- happygrue [~happygrue@2601:6:4380:7df:4852:6807:7541:e7e4] has joined #wesnoth-dev 20140530 14:50:15-!- happygrue [~happygrue@2601:6:4380:7df:4852:6807:7541:e7e4] has quit [Changing host] 20140530 14:50:15-!- happygrue [~happygrue@wesnoth/developer/wintermute] has joined #wesnoth-dev 20140530 14:50:28< iceiceice> Necrosporus: shadowm is right, its not actually a bug that it modify_side couldn't modify it, actually my commit was what changed the docs 20140530 14:50:41< iceiceice> so in a strict sense its a feature not a bug, 20140530 14:50:54< iceiceice> even if its the change isnt likely to create bugs itself we have to draw the line somewhere 20140530 14:51:45< Necrosporus> AI0867, but it should (except leader definition part, which should not present there anyway) 20140530 14:52:11< Necrosporus> and except other units which could be modified other way 20140530 14:55:10< Necrosporus> anyway, I guess, defeat_condition is mostly for convenience, as you could always used events like side turn to check conditions 20140530 14:57:00< Necrosporus> iceiceice, was it possible to modify older variant of this tag? 20140530 14:57:14< iceiceice> you can modify it with lua 20140530 14:57:45< iceiceice> i think gfgtdf and i didnt' realize it needed to be listed in the modify_side handler 20140530 14:57:53< Necrosporus> Then it's doubtful revert 20140530 14:58:10< Necrosporus> if you could do it anyway 20140530 14:58:21< iceiceice> idk it cuts both ways 20140530 14:58:39< iceiceice> even assuming we should think of it as a bug, if ther's an easy workaround then it has reduced priority 20140530 14:59:13< iceiceice> there's a lot of sensitivity right now around WML changes because we also botched the backwards compatibility for "fight_on_without_leader" 20140530 14:59:28< iceiceice> so, its probably not worth fighting about 20140530 14:59:53< iceiceice> tbh i think this will be mostly a niche feature anyways 20140530 15:02:07< vultraz> Is it in master> 20140530 15:02:09< vultraz> ? 20140530 15:02:24< iceiceice> yes 20140530 15:02:36< iceiceice> i commited to 1.12 and master and the same time... 20140530 15:02:56< iceiceice> the gap between 1.12 and master right now, since yesterday, is like... 20140530 15:03:06< iceiceice> this stuff about trying to fix replays that weren't initialized 20140530 15:03:20< iceiceice> hmm 20140530 15:03:25< iceiceice> that was a bad explanation 20140530 15:03:39< iceiceice> the bug where, if someone dc's and then it becomes their turn and the other players save, 20140530 15:03:47< iceiceice> the replay becmes corrupted 20140530 15:05:11< AI0867> I just received an email from a chinese phone number, telling me to please check my email 20140530 15:05:30< AI0867> I'm not sure what whoever did that was thinking 20140530 15:05:54< vultraz> Uh. What 20140530 15:11:31< iceiceice> AI0867: that's pretty wierd 20140530 15:11:44< iceiceice> also, whats the thing about fogged units being revealed? 20140530 15:12:05< iceiceice> i have a bunch of unit tests that check sighted events, and the movement events with skip ally, etc. 20140530 15:12:22< iceiceice> and they seem to work fine, so i think i didnt follow the forum post 20140530 15:13:04< iceiceice> what is just when you were running it interactively or something? 20140530 15:14:11-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has joined #wesnoth-dev 20140530 15:44:03-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has quit [Quit: Leaving] 20140530 15:54:38-!- thunderstruck [~zaibotren@cpc13-sgyl31-2-0-cust696.18-2.cable.virginm.net] has quit [Ping timeout: 240 seconds] 20140530 15:56:40-!- thunderstruck [~zaibotren@cpc13-sgyl31-2-0-cust696.18-2.cable.virginm.net] has joined #wesnoth-dev 20140530 15:57:26-!- sachith500 [~kvirc@112.135.59.107] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140530 16:00:51-!- Bodhi-Baum [~Bodhi@dslb-084-063-056-249.pools.arcor-ip.net] has joined #wesnoth-dev 20140530 16:15:39-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140530 16:29:28-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140530 16:58:55-!- ancestral [~ancestral@17.114.45.98] has joined #wesnoth-dev 20140530 16:59:52< crimson_penguin> hej 20140530 17:00:30< mattsc> hi crimson_penguin 20140530 17:01:17< mattsc> Sometime before 1.13.0 comes out, I’ll have to do some more work on the OS X builds. I’ll probably have some more questions for you then. But for now I am busy with other things. 20140530 17:16:45< irker877> wesnoth: gfgtdf wesnoth:master 2999dab6e4ca / src/playcampaign.cpp: remove outdated code http://git.io/FfB5xA 20140530 17:40:17-!- Guest63621 [~cib@p20030067CE126501267703FFFEE75B84.dip0.t-ipconnect.de] has quit [Ping timeout: 252 seconds] 20140530 17:43:42-!- kex [~kex@212.92.210.53] has quit [Remote host closed the connection] 20140530 17:44:14-!- kex [~kex@212.92.210.53] has joined #wesnoth-dev 20140530 17:49:26-!- kex [~kex@212.92.210.53] has quit [Ping timeout: 276 seconds] 20140530 17:49:54-!- riksteri [~riksteri@dsl-tkubrasgw3-54f96b-216.dhcp.inet.fi] has left #wesnoth-dev [] 20140530 17:52:25-!- iceiceice_ [~chris@207-237-132-91.ny.subnet.cable.rcn.com] has joined #wesnoth-dev 20140530 18:02:03-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140530 18:03:43-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140530 18:04:25-!- noy [~Noy@wesnoth/developer/noy] has quit [Client Quit] 20140530 18:09:11-!- travis-ci [~travis-ci@ec2-54-234-25-5.compute-1.amazonaws.com] has joined #wesnoth-dev 20140530 18:09:11< travis-ci> [travis-ci] wesnoth/wesnoth#2874 (master - 2999dab : gfgtdf): The build has errored. 20140530 18:09:11< travis-ci> [travis-ci] Build details : http://travis-ci.org/wesnoth/wesnoth/builds/26403123 20140530 18:09:11-!- travis-ci [~travis-ci@ec2-54-234-25-5.compute-1.amazonaws.com] has left #wesnoth-dev [] 20140530 18:17:15< iceiceice_> hmm.. we hit travis' 50 minutes hard time limit that time :/ 20140530 18:18:53< iceiceice_> idk if its easier to speed up the build or squash some of the tests together/ 20140530 18:18:54< iceiceice_> ? 20140530 18:19:00< iceiceice_> maybe it wont happen often 20140530 18:33:15< timotei> 50 minutes???? Since when? :D 20140530 18:33:40-!- gfgtdf [~chatzilla@e177118255.adsl.alicedsl.de] has joined #wesnoth-dev 20140530 18:33:50< gfgtdf> hm i relly got the impression travis doen't like me 20140530 18:44:18< gfgtdf> iceiceice_: is http://wiki.wesnoth.org/OOS_%28Out_of_Sync%29 meant for 1.12 or only or 1.10 ? 20140530 18:44:31< iceiceice_> i wrote it about 1.10 20140530 18:44:34< iceiceice_> its probbly not true any more 20140530 18:45:08< gfgtdf> iceiceice_: do you whether its possible to make colored text in the wiki ? 20140530 18:45:46< gfgtdf> iceiceice_: especiyl in code exampled 20140530 18:45:49< gfgtdf> especialy 20140530 18:48:41-!- Sulfur [~Miranda@p5B00886C.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20140530 18:49:48< iceiceice_> i mean, the answer is yes i think because you can use html markup 20140530 18:49:59< iceiceice_> but you shouldnt do that actually? 20140530 18:50:13< iceiceice_> i think we are suppose dto use mediawiki format, officially 20140530 18:50:29< iceiceice_> idk there was an argument between shadowm and vultraz about this that afaik was not resolved, 20140530 18:50:45< iceiceice_> i think most of the docs are in mediawiki, and some of the "new player" material is now using html formatting as well 20140530 18:51:17< iceiceice_> so i think the answer is yes it is possible, but i dont know if its possible without facing the wrath of the squeaky hammer 20140530 18:51:38< gfgtdf> hm ok 20140530 18:52:19< iceiceice_> idk does anyone know what the right answer is? 20140530 18:52:42< iceiceice_> also, do you know how to do the fancy gna formatting? 20140530 18:52:51< iceiceice_> that has mysitified me 20140530 18:58:07< iceiceice_> gfgtdf: do you see a reason not to do this? https://github.com/wesnoth/wesnoth/pull/175 20140530 19:01:44< gfgtdf> iceiceice_: why do we call maybe_do_init_side with do_autosaves parameter ? 20140530 19:01:59< iceiceice_> it was being called with (save) 20140530 19:02:03< iceiceice_> which was a parameter of the function 20140530 19:02:07< gfgtdf> iceiceice_: and why? 20140530 19:02:19< iceiceice_> i dont know 20140530 19:02:37< iceiceice_> idk we talked about this commit, 20140530 19:02:50< iceiceice_> this one happened after we made init_side_done get serialized, 20140530 19:02:51-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev 20140530 19:02:54< iceiceice_> then it still didnt fix the issue 20140530 19:02:57< gfgtdf> iceiceice_: hm why do we pass syves in 77ead906927bec69d9136d349d637458f7a553f0 ? 20140530 19:03:08< gfgtdf> save* 20140530 19:03:24< iceiceice_> idk i was hoping you had thought about it when i committed it :/ but now it looks like a mistake 20140530 19:04:04< gfgtdf> iceiceice_: hm well if we delete that line like you suggested we dotn have to think about it :) 20140530 19:04:05< iceiceice_> i was not as familiar with playcontroller at that time as i am now 20140530 19:04:19< iceiceice_> y i think if it tests rihgt hen theres no reason to add it 20140530 19:04:22< iceiceice_> also i was concerned that, 20140530 19:04:33< iceiceice_> in some strange code path maybe_do_init_Side could be called before init_Side 20140530 19:04:39< iceiceice_> if we have that line there 20140530 19:04:47< iceiceice_> idk im less concerned now i couldnt figure out how it could happen 20140530 19:04:50< iceiceice_> but i think that would be a "bad thing" 20140530 19:05:49< iceiceice_> i have made and compiled a testing branch with master + 172 174 175 20140530 19:05:56< iceiceice_> i think i'm going to test it now... 20140530 19:06:09< iceiceice_> it looks like this idea to push to master and hope other poeple test is just not working out 20140530 19:06:27< iceiceice_> if my tests look good i'm going to try to figure out how to backport to 1.12, does that sound good? 20140530 19:07:02< iceiceice_> i would like to send back all of these, all though there will be minor conflicts... 20140530 19:07:02< iceiceice_> http://pastebin.com/wHuyD7wv 20140530 19:07:10< iceiceice_> if we wait too long the backlog will just get worse 20140530 19:08:50< gfgtdf> iceiceice_: you wnt to backport all 3 pr's ? 20140530 19:08:53< gfgtdf> want 20140530 19:09:13< iceiceice_> y if they dont break anything i think they are all good 20140530 19:09:50< gfgtdf> iceiceice_: hm but 172 might brak backwards compability again for scenarios that use random_start_time 20140530 19:10:02< iceiceice_> hmmm 20140530 19:10:16< iceiceice_> really? 20140530 19:10:20< iceiceice_> its not a refactor? 20140530 19:10:27< iceiceice_> oh hmm i think i get it 20140530 19:10:37< shadowm> iceiceice_: There's a "markup reminder" link somewhere when you are posting a new bug or a follow-up to an existing one. 20140530 19:11:07< iceiceice_> thanks, i will keep an eye out for it 20140530 19:11:10< gfgtdf> shadowm: on gna ? 20140530 19:11:24< gfgtdf> iceiceice_: ye the odl version called the unsynced rng teh new calls the synced rand so teh rng will be off 20140530 19:11:36< shadowm> gfgtdf, iceiceice_ : Yes. 20140530 19:11:45< iceiceice_> y ok, that should not go back then 20140530 19:11:49< gfgtdf> iceiceice_: which could cause wong leader traits for example. 20140530 19:12:24< iceiceice_> i forgot the deterministic rng advances the counter in that situation 20140530 19:12:37< shadowm> zookeeper: It'd be ridiculously slow to reapply the function every time the screen scrolls or an animation frame of any kind requires an update. 20140530 19:12:57< shadowm> We are thinking of a continously-changing image that can be around 1920x1080. 20140530 19:12:57< iceiceice_> hmm so ... 20140530 19:13:06< iceiceice_> gfgtdf: with the "old" random tod implementation, 20140530 19:13:09< iceiceice_> it is not useable with deterministic mode? 20140530 19:13:19< iceiceice_> because the random tod is not going to be synced? 20140530 19:13:35-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev 20140530 19:13:36< shadowm> zookeeper: This is why I'd like to see us use OpenGL some day. From what I gather, using shaders would be more efficient. 20140530 19:14:02< shadowm> And it'd enable us to do pretty much anything we wanted with the screen contents. 20140530 19:14:04< iceiceice_> opengl is cool :) i have actually used that one 20140530 19:14:10< iceiceice_> not in like ... 10 years thoug 20140530 19:14:12< zookeeper> shadowm, yeah... and i guess doing it per-hex just like the overlay wouldn't be a much better idea or more feasible 20140530 19:14:32< zookeeper> and yeah, if we did use OGL then that wouldn't be a problem at all 20140530 19:14:48< iceiceice_> hmm would we use like fancy z-buffer stuff then? 20140530 19:14:51< gfgtdf> iceiceice_: no with teh old method teh tod random was resolved in teh mp connect code that very early. so teh atual game knows nothign baout that teh scenario once had a random tod 20140530 19:15:03< iceiceice_> oh i see 20140530 19:15:06< gfgtdf> iceiceice_: the main problem with this fix was that it onyl worked in mp 20140530 19:15:19< gfgtdf> iceiceice_: and sp random tod replays were still wrong 20140530 19:15:25< shadowm> zookeeper: Doing it per-hex would lead to complications with functions that need to know about their neighbors (e.g. blur). 20140530 19:15:25< iceiceice_> i see 20140530 19:15:52< iceiceice_> hmm well 20140530 19:16:08< iceiceice_> if sp random tod replays are wrong and we can make it backwards compatible we could probably backport 20140530 19:16:10< iceiceice_> up to you if its worth it though 20140530 19:16:22< iceiceice_> i guess ti woudl be complicated 20140530 19:16:43< iceiceice_> ok i'm going to test my master branch anyways 20140530 19:17:08-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140530 19:17:26< shadowm> In any case, the actual performance impact would depend on the specific function(s) used. Blit is relatively cheap, for example, and blur is expensive. 20140530 19:17:44< shadowm> Blit enough images in a sequence and it starts to get slow. 20140530 19:18:22< zookeeper> shadowm, yeah, i just figured that since there's no "image for each hex", what exactly would you apply the IPF to anyway? 20140530 19:18:59< shadowm> The underlying image path function implementation allows for "applying" the "functions" to anonymous surfaces. 20140530 19:19:17< iceiceice_> gfgtdf: do you tihnk i should backport the "remove pointless arguments"? 20140530 19:19:36< iceiceice_> idk i think removing dead code is good and does not break feature freeze 20140530 19:19:42< zookeeper> shadowm, sure, but surely the engine doesn't have "one surface for each hex"? 20140530 19:19:53< iceiceice_> no one objected when i added const to unit_map::has_unit 20140530 19:20:01< iceiceice_> either 20140530 19:20:15< shadowm> zookeeper: Well, that question is where my knowledge of the display engine ends. :p 20140530 19:20:25< iceiceice_> if i dont backport that it will make it hard to cherry-pick stuff later because we will get constant conflicts 20140530 19:20:26< zookeeper> okay :P 20140530 19:20:55< shadowm> I believe it's ridiculously complicated precisely so we don't get to spend hours rendering each frame, but I don't know exactly how the hex grid is implemented. 20140530 19:25:54< iceiceice_> hmm so 20140530 19:25:55< iceiceice_> gfgtdf: 20140530 19:26:05< iceiceice_> i think that some of the gui stuff in init side is actually slightly buggy 20140530 19:26:16< iceiceice_> so there is a reported bug on the bug tracker that "when you begin an mp campaign, you get a flicker" 20140530 19:26:20< iceiceice_> in the game display 20140530 19:26:37< iceiceice_> i think its beacuse the gui is getting told all kinds of nonsense by the various init_side calls 20140530 19:26:43< iceiceice_> i also get this when i reload saves 20140530 19:26:55< iceiceice_> but i also dont knwo if its important enough to try to fix in 1.12 20140530 19:27:16< iceiceice_> i think thunderstruck reported the mp campaign flicker ting a long time ago 20140530 19:27:29< iceiceice_> i tink its only happening b/c there are so many extra sides to init so its more obvious 20140530 19:27:40< iceiceice_> but i am noticing it now even on den of onis 20140530 19:27:43< gfgtdf> ice when you reload any game in sp ? 20140530 19:28:05< iceiceice_> i only notice in mp so far 20140530 19:28:15< iceiceice_> it just occured to me it might be from the init side though 20140530 19:28:31< iceiceice_> i noticed it very often in LoW mp campaign scenario 1 for instance 20140530 19:28:43< iceiceice_> this is the first time i notice in regular m 20140530 19:28:45< iceiceice_> mp 20140530 19:34:21< iceiceice_> hmm im getting out of sync 20140530 19:34:28< iceiceice_> in reloaded games 20140530 19:34:30< thunderstruck> iceiceice_: That's right. By the way, I started to look into start of scenario save bug. 20140530 19:34:32< iceiceice_> after switching sides to AI 20140530 19:34:47< iceiceice_> i got "removing illegal command [end_turn]" 20140530 19:34:49< thunderstruck> iceiceice_: I hope to have something tomorrow. 20140530 19:35:00< iceiceice_> thunderstruck: thats great 20140530 19:43:31< iceiceice_> gfgtdf: something is wrong with "droid" right now on master 20140530 19:43:39< iceiceice_> ":droid" causes oos immedaitely in mp scenarios 20140530 19:44:03< iceiceice_> reloading is not important 20140530 19:44:12-!- Bodhi-Baum [~Bodhi@dslb-084-063-056-249.pools.arcor-ip.net] has quit [Quit: Verlassend] 20140530 19:44:14< iceiceice_> i get "illegal command recruit" "illegal command end turn" 20140530 19:45:21< gfgtdf> ye i get teh illegal end turn only 20140530 19:46:55< gfgtdf> iceiceice_: i added some text: http://wiki.wesnoth.org/OOS_%28Out_of_Sync%29#Game_becomes_out_of_sync 20140530 19:51:32< iceiceice_> gfgtdf: thanks 20140530 19:51:40< iceiceice_> also, it looks like travis was happy after rebuild 20140530 19:52:30< iceiceice_> gfgtdf: i still get :droid OOS at d808b7c 20140530 19:53:19< iceiceice_> going to try 71190a0b051b06924e727096803e9791d0717c0b 20140530 19:55:19-!- thunderstruck [~zaibotren@cpc13-sgyl31-2-0-cust696.18-2.cable.virginm.net] has quit [Quit: leaving] 20140530 19:58:48< iceiceice_> hmm that one is also bad 20140530 20:01:39< gfgtdf> iceiceice_: it it also gugged in 1.12 ? 20140530 20:01:44< iceiceice_> i dont know yet 20140530 20:01:57< iceiceice_> just bisecting master, maybe you try 1.12? 20140530 20:02:39< iceiceice_> uh oh i went to where i have no ccache , it will take a long time :( 20140530 20:02:39< gfgtdf> ice does teh server sned anythign back we we "droid" ? 20140530 20:02:51< gfgtdf> send aynthign back 20140530 20:04:29< gfgtdf> iceiceice_: i mean when Client A sends a "driod" to the server, will client A the receive a [change_controller] ? 20140530 20:04:58< iceiceice_> hmm i can check 20140530 20:08:30< gfgtdf> iceiceice_: i think it migth be a problme related to my code that shoudl handle teh sace "reasign side during wesnoth.syncronize_choice" 20140530 20:08:34< iceiceice_> gfgtdf: here's console output: http://pastebin.com/i7EHSGQ9 20140530 20:10:12< iceiceice_> hmmm 20140530 20:10:18< iceiceice_> i wonder i the flicker is caused by my code 20140530 20:10:58< iceiceice_> the server always sends [change_controller] to all sides ensuring that things work, in the "perform controller tweaks" 20140530 20:10:59< iceiceice_> https://github.com/wesnoth/wesnoth/blob/master/src/server/game.cpp#L156 20140530 20:11:09< iceiceice_> if a controller change has no effect, the client does nothing... 20140530 20:11:23< iceiceice_> but it might call do "maybe_do_init_side" anyways and cause a flicker or something 20140530 20:12:29< gfgtdf> iceiceice_: in this line: https://github.com/wesnoth/wesnoth/blob/master/src/playmp_controller.cpp#L529 we rstart the turn when we receive a chenge_controller 20140530 20:14:12< gfgtdf> iceiceice_: i 'll test a possible fix 20140530 20:16:48-!- irker877 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout] 20140530 20:17:11< iceiceice_> gfgtdf: how do you get to there from here? https://github.com/wesnoth/wesnoth/blob/master/src/playturn.cpp#L163 20140530 20:17:45-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140530 20:17:51< gfgtdf> iceiceice_: sync_network calls process_network_data 20140530 20:19:06< iceiceice_> ok is ee 20140530 20:19:17-!- ancestral [~ancestral@17.114.45.98] has quit [Quit: ancestral] 20140530 20:19:50-!- irker746 [~irker@fehu.ai0867.net] has joined #wesnoth-dev 20140530 20:19:50< irker746> wesnoth: gfgtdf wesnoth:master ee8929998763 / src/playsingle_controller.cpp: fix player_type_changed durign ai turn http://git.io/wWF85Q 20140530 20:20:04< gfgtdf> iceiceice_: ^ 20140530 20:21:03< iceiceice_> ok ran my pull rebuild all script, we'll see what happens :) 20140530 20:21:49< gfgtdf> iceiceice_: that commit shoudl also be backported 20140530 20:22:48< iceiceice_> hmm the logic is funny to me though... 20140530 20:23:08< iceiceice_> so after we play ai turn we must issue recorder.end_turn, but not for a human? 20140530 20:23:28< gfgtdf> iceiceice_: after_human turn calls recorder.end_trun i think 20140530 20:23:33< gfgtdf> after_human_turn 20140530 20:23:43< gfgtdf> which is also called in !playerty_changes 20140530 20:23:50< gfgtdf> so its the same in ai and human now 20140530 20:24:44< iceiceice_> hmm what does this stuff do, looks new: end_turn_record(); 20140530 20:24:44< iceiceice_> end_turn_record_unlock(); 20140530 20:25:00< iceiceice_> ah i see 20140530 20:25:13< Necrosporus> Can I disable hp bar and other stuff for single unit in wml? 20140530 20:25:29< gfgtdf> iceiceice_: i wander what turn_over_ does .. 20140530 20:26:39< iceiceice_> hmm 20140530 20:26:42< iceiceice_> in single controller, it 20140530 20:26:45< iceiceice_> is initialized to false, 20140530 20:26:50< iceiceice_> and only manipulated by those end turn record functions 20140530 20:27:23-!- noy [~Noy@wesnoth/developer/noy] has quit [Ping timeout: 240 seconds] 20140530 20:27:26< gfgtdf> iceiceice_: to mee it seems liek turn_over_/ end_turn_record_unlock isnt realy uses anore 20140530 20:27:29< iceiceice_> in mp there is sort of a wierd line: src/playmp_controller.cpp: turn_over_ = true; // We don't want to linger mode to add end_turn to replay 20140530 20:27:44< gfgtdf> iceiceice_: ah ok 20140530 20:27:45< iceiceice_> between play human turn and after human trun 20140530 20:27:55< iceiceice_> maybe we should just check for linger mode in that case?? 20140530 20:28:37< gfgtdf> iceiceice_: ye that seems easier 20140530 20:29:17< gfgtdf> iceiceice_: y se shoudl do that 20140530 20:29:20< gfgtdf> we should 20140530 20:35:29< iceiceice_> ok it looks fixed 20140530 20:40:26-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140530 20:45:11-!- fabi [~fabi@wesnoth/developer/fendrin] has quit [Quit: Konversation terminated!] 20140530 20:49:02< iceiceice_> hmm 20140530 20:49:09< iceiceice_> it looks like PR 175 breaks reloads :( 20140530 20:49:48< iceiceice_> so i guess that maybe do init side is now necessary 20140530 20:49:56< gfgtdf> all relaods ? 20140530 20:50:03< iceiceice_> it breaks the relaod of disconnected games 20140530 20:50:37< iceiceice_> still confirming 20140530 20:57:02< iceiceice_> y it breaks them 20140530 20:57:13< iceiceice_> i dont understand why though 20140530 20:59:05< iceiceice_> hmm we should try changing that line to "maybe_do_init_sides(false)" though 20140530 21:00:04< iceiceice_> its wierd that it is now necessary to call maybe do init sides there, i wonder when that happened :/ 20140530 21:00:18< iceiceice_> maybe it always should have been there? 20140530 21:04:10-!- gfgtdf_ [~chatzilla@e177125237.adsl.alicedsl.de] has joined #wesnoth-dev 20140530 21:07:19-!- gfgtdf [~chatzilla@e177118255.adsl.alicedsl.de] has quit [Ping timeout: 260 seconds] 20140530 21:07:20-!- gfgtdf_ is now known as gfgtdf 20140530 21:10:22-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140530 21:11:24< irker746> wesnoth: Chris Beck wesnoth:master 18a0bc3b77ab / src/playsingle_controller.cpp: fixup 77ead906927bec69d9136d349d637458f7a553f0 http://git.io/LYL1qA 20140530 21:12:43< iceiceice_> gfgtdf: ^ 20140530 21:14:21< gfgtdf> iceiceice_: i think it defaults to false you ou dont need to pass 20140530 21:14:32< iceiceice_> hmm ok 20140530 21:14:46< iceiceice_> do you think its better though? sometimes the defaults are confusing 20140530 21:15:02< gfgtdf> iceiceice_: hm idc if we pass or not 20140530 21:15:11< iceiceice_> ok 20140530 21:17:16-!- ancestral [~ancestral@17.114.45.98] has joined #wesnoth-dev 20140530 21:20:59< iceiceice_> ok im going to merge 174 20140530 21:27:08< iceiceice_> hmmm 20140530 21:27:25< iceiceice_> it looks like controller types get screwed up when you try to reload a scenario from mp campaign 20140530 21:27:45< gfgtdf> a normal savegame ? 20140530 21:28:32< gfgtdf> a replay ? 20140530 21:32:33< iceiceice_> so just fire up LoW with 3 players 20140530 21:32:39< iceiceice_> sry 20140530 21:32:42< iceiceice_> 3 clients one obs 20140530 21:32:49< iceiceice_> on turn 1, move kalenz, then save 20140530 21:32:54< iceiceice_> then reload with the same configuration 20140530 21:33:03< iceiceice_> and if p1 ends turn, then side 2 has become human controller instead of ai 20140530 21:33:17< iceiceice_> although in the savefile it appears that he has controller type ai, 20140530 21:33:26< iceiceice_> and if you reload as a multiplayer -> local cdoe path it works fine 20140530 21:33:29< iceiceice_> so i think it might be a server issue 20140530 21:37:22< gfgtdf> iceiceice_: hm when you jus reload it in the normal reload dialog ? 20140530 21:39:59-!- iceiceice_ [~chris@207-237-132-91.ny.subnet.cable.rcn.com] has quit [Ping timeout: 260 seconds] 20140530 21:40:09-!- iceiceice [~chris@207-237-132-91.ny.subnet.cable.rcn.com] has joined #wesnoth-dev 20140530 21:40:13< iceiceice> gfgtdf: y 20140530 21:40:45< gfgtdf> iceiceice: so it only happens when you reload in networked mp ? 20140530 21:40:52< iceiceice> y 20140530 21:41:35< iceiceice> the save file is good, you cna reload that and pay it separately 20140530 21:41:38< iceiceice> *play it separately 20140530 21:41:42< iceiceice> in mp local even 20140530 21:45:32< iceiceice> hmm i think its happening in mp connect engine somewhere?? 20140530 21:45:37< iceiceice> based on inspecting console debug 20140530 21:45:54< iceiceice> hmm... 20140530 21:45:56< iceiceice> no im not sur enow 20140530 21:46:31< iceiceice> no if you are running server with debugging, 20140530 21:46:41< iceiceice> it looks like it is getting really confused about the level somehow 20140530 21:46:55< iceiceice> during controller tweaks, or perhaps jus before 20140530 21:47:15< iceiceice> hmm even beofr the tweaks start its wierd though 20140530 21:49:11< iceiceice> ok i go for food, be back later 20140530 21:49:13-!- iceiceice [~chris@207-237-132-91.ny.subnet.cable.rcn.com] has quit [Quit: Leaving] 20140530 21:50:11-!- mjs-de [~mjs-de@f048194175.adsl.alicedsl.de] has quit [Remote host closed the connection] 20140530 21:52:20-!- RiftWalker [~nathan@ip24-252-126-205.no.no.cox.net] has joined #wesnoth-dev 20140530 21:54:27< RiftWalker> gfgtdf: So, could you explain to me what you were proposing earlier? having campaigns, basically, made entirely of [multiplayer] tags? 20140530 21:55:58< gfgtdf> RiftWalker: no that was no proposal i just think it it currently possible to make a campaign just with mutliplayer tags and next_scenario= but i might be wrong 20140530 21:56:16-!- trewe [~trewe@2001:8a0:d125:ab01:626c:66ff:fe92:9b7c] has joined #wesnoth-dev 20140530 21:56:23< gfgtdf> it is* 20140530 21:58:52< RiftWalker> I believe you need one campaign tag for it to recognise it. 20140530 21:59:43< gfgtdf> RiftWalker: ye it doesnt apper in teh campaigns menu just in the mutiplayer menu but it has the "multiple scenarios" functionality 20140530 21:59:48< gfgtdf> at least i think 20140530 22:00:18< RiftWalker> gfgtdf: ohh I see. interesting. 20140530 22:07:04< gfgtdf> iceiceice: do you or anyone wlese know the code where we read the carryover_sides_start ? 20140530 22:07:26-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: Traveling until May 31] 20140530 22:07:48< gfgtdf> i cannot find it .. 20140530 22:09:06-!- Yaiyan [56880f54@gateway/web/cgi-irc/kiwiirc.com/ip.86.136.15.84] has joined #wesnoth-dev 20140530 22:12:05-!- Aishiko [~Aishiko@cpe-065-191-176-226.nc.res.rr.com] has quit [Ping timeout: 265 seconds] 20140530 22:16:08-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Ping timeout: 245 seconds] 20140530 22:36:06-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20140530 22:44:30-!- Yaiyan [56880f54@gateway/web/cgi-irc/kiwiirc.com/ip.86.136.15.84] has quit [Quit: http://www.kiwiirc.com/ - A hand crafted IRC client] 20140530 22:46:52-!- WinterD_ [~quassel@177.196.200.77.rev.sfr.net] has joined #wesnoth-dev 20140530 22:48:44-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: bbl] 20140530 22:49:03-!- WinterD [~quassel@177.196.200.77.rev.sfr.net] has quit [Ping timeout: 245 seconds] 20140530 22:53:54-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy] 20140530 23:16:49-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has joined #wesnoth-dev 20140530 23:33:00< irker746> wesnoth: Chris Beck wesnoth:master 38211c1036ba / src/play_controller.cpp: fixup end of scenario saves http://git.io/PlpLHQ 20140530 23:33:02< irker746> wesnoth: Chris Beck wesnoth:master 1a7d358e39ec / src/play_controller.cpp: Merge pull request #174 from cbeck88/fixup_end_of_scenario_saves http://git.io/Bey1UA 20140530 23:37:33-!- RiftWalker [~nathan@ip24-252-126-205.no.no.cox.net] has quit [Ping timeout: 258 seconds] 20140530 23:37:54< iceiceice> gfgtdf: i think we might read it in playcampaign.cpp? 20140530 23:39:14-!- RiftWalker [~nathan@ip24-252-126-205.no.no.cox.net] has joined #wesnoth-dev 20140530 23:39:32< gfgtdf> iceiceice: ye we do, i was confused beceause there is some dead code: https://github.com/wesnoth/wesnoth/blob/master/src/gamestatus.cpp#L596 because use_player_cfg() is always false 20140530 23:39:50< gfgtdf> iceiceice: i still didint understand teh code that handles carryover 20140530 23:40:07< iceiceice> i thought i did but apparently i dont :p 20140530 23:40:17< iceiceice> i made that carryover_wml feature a while ago 20140530 23:40:35< iceiceice> that tries to mimic play_campaign init side and other places, so you can have some wml that gets merged into the next level 20140530 23:40:39< iceiceice> specified as an argument of [endlevel] 20140530 23:40:48< iceiceice> but it doesnt work in networekd and idk why 20140530 23:40:56< iceiceice> i only learned fairly recently 20140530 23:45:01< iceiceice> hmm 20140530 23:45:09< iceiceice> do you think we should just start to backport stuff to 1.12 now? 20140530 23:45:22< iceiceice> or wait until we have fixed more stuff on master 20140530 23:48:47< iceiceice> gfgtdf: its really ridiculous to me that "gamestate" requires a point to the gui to write its config for saving... 20140530 23:48:53< iceiceice> *pointer to 20140530 23:50:38-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 240 seconds] 20140530 23:50:51< gfgtdf> iceiceice: ye that doesnt look good 20140530 23:51:07< gfgtdf> iceiceice: i nerly found out wheter teh carryover sides are handled 20140530 23:54:34-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev 20140530 23:55:23-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 240 seconds] 20140530 23:56:06< gfgtdf> iceiceice: idk what happend but i just dot defeated in my scenario in an unknown way :s 20140530 23:57:16< iceiceice> :/ 20140530 23:57:16< gfgtdf> iceiceice: but cannot reproduce it 20140530 23:57:29< iceiceice> hmm... 20140530 23:57:49< gfgtdf> iceiceice: it happends when i clicked on a unit that i used to test https://gna.org/bugs/?22064 20140530 23:59:17< iceiceice> idk i think im just going to keep trying to remove dead code and simplify 20140530 23:59:34< iceiceice> i really want to push my refactor to master 20140530 23:59:42< iceiceice> that encapsulates many of those game state objects 20140530 23:59:54< iceiceice> and slowly build more and more bubbles until it is all organized and makes sense... --- Log closed Sat May 31 00:00:15 2014