Asking to re-introduce 1.6 lobby as an optional choice

General feedback and discussion of the game.

Moderator: Forum Moderators

User avatar
Iris
Site Administrator
Posts: 6800
Joined: November 14th, 2006, 5:54 pm
Location: Chile
Contact:

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by Iris »

And assuming you already have that patch program:

patch -p1 < path/to/diff/file.diff
(Must be run at the root of the distribution, i.e. the directory that contains the data/ and src/ directories and the changelogs.)
Author of the unofficial UtBS sequels Invasion from the Unknown and After the Storm.
User avatar
thespaceinvader
Retired Art Director
Posts: 8414
Joined: August 25th, 2007, 10:12 am
Location: Oxford, UK
Contact:

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by thespaceinvader »

Just to confirm, since I think this may be part of the question: this patch is linux-only, right? No mac or windows options?
http://thespaceinvader.co.uk | http://thespaceinvader.deviantart.com
Back to work. Current projects: Catching up on commits. Picking Meridia back up. Sprite animations, many and varied.
silene
Posts: 1109
Joined: August 28th, 2004, 10:02 pm

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by silene »

thespaceinvader wrote:this patch is linux-only, right? No mac or windows options?
It's a patch to the sources, so it doesn't have anything to do with Linux. Anyone willing to spend a bit of time compiling Wesnoth can use it. Instructions on how to compile Wesnoth for Windows, MacOSX, Linux, etc, can be found on the wiki.
User avatar
thespaceinvader
Retired Art Director
Posts: 8414
Joined: August 25th, 2007, 10:12 am
Location: Oxford, UK
Contact:

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by thespaceinvader »

Mmm, misphrase. Nothing available to patch existing windows and mac installs - it requires compiling.
http://thespaceinvader.co.uk | http://thespaceinvader.deviantart.com
Back to work. Current projects: Catching up on commits. Picking Meridia back up. Sprite animations, many and varied.
silene
Posts: 1109
Joined: August 28th, 2004, 10:02 pm

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by silene »

thespaceinvader wrote:Mmm, misphrase. Nothing available to patch existing windows and mac installs - it requires compiling.
Even on Linux, there is nothing to patch existing installs and it requires recompiling too. I'm not sure why you are making a difference between the systems there.
User avatar
thespaceinvader
Retired Art Director
Posts: 8414
Joined: August 25th, 2007, 10:12 am
Location: Oxford, UK
Contact:

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by thespaceinvader »

Maybe I'm mistaken, but my impression is that there's a distinct difference in the proportion of users who are able to compile for themselves on linux as opposed to mac and particularly windows.

It's not really important, tbh.
http://thespaceinvader.co.uk | http://thespaceinvader.deviantart.com
Back to work. Current projects: Catching up on commits. Picking Meridia back up. Sprite animations, many and varied.
Sangel
Moderator Emeritus
Posts: 2232
Joined: March 26th, 2004, 10:58 pm
Location: New York, New York

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by Sangel »

The majority of Wesnoth users are not savvy enough to compile their own copy of Wesnoth, unfortunately. That said, this patch is highly useful for those who are.
"Pure logic is the ruin of the spirit." - Antoine de Saint-Exupéry
User avatar
ancestral
Inactive Developer
Posts: 1108
Joined: August 1st, 2006, 5:29 am
Location: Motion City

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by ancestral »

What version of 1.7 introduced the new lobby?
And what version of 1.7 is the last known to be compatible with 1.8 multiplayer games?
Wesnoth BestiaryPREVIEW IT HERE )
Unit tree and stat browser
CanvasPREVIEW IT HERE )
Exp. map viewer
Blarumyrran
Art Contributor
Posts: 1700
Joined: December 7th, 2006, 8:08 pm

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by Blarumyrran »

@ancestral, the 1.8 server will simply not let you join with non-rc 1.7.x versions (I think?); maybe they are compatible, I don't know that, but it doesn't matter.
michaelmax
Posts: 3
Joined: October 1st, 2008, 9:48 pm

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by michaelmax »

Don't forget; the whole point of open source is that you have the possibility to do it yourself. It's about a 15-minute work (I tested it), longer if your computer is slower than my laptop:

* grab the 1.8 source repository,
* revert revisions 40127, 40126, 40125, 40120, 40111, 40110, 39491,
* compile and install.

You then get a Wesnoth executable whose lobby is the 1.6 one yet which works just fine on the 1.8 server (it's the one I'm using).

In fact, I may just as well attach the corresponding patch, just in case I messed when copying the commit numbers.

Thx silene, you were really kind :D :D (even if I'm not able to compile wesnoth on windows, Nobun will explain me :mrgreen: :mrgreen: )
Thx to Noy for the fast answers and the disponibility too :wink:
chains
Posts: 76
Joined: January 9th, 2007, 5:02 am
Location: Portland OR
Contact:

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by chains »

I uninstalled my SVN installed wesnoth using scons -c install. Then I ran gunzip old-lobby.patch.gz. Then I ran patch -p1 < old-lobby.patch.
It seems there was a problem. I'm trying to install Wesnoth again to see what happens, but that's gunna be all night before it finishes on my old clunker.

Any thoughts?

Here was my output:

patching file changelog
Hunk #1 succeeded at 328 (offset 1 line).
patching file players_changelog
patching file src/CMakeLists.txt
Hunk #1 succeeded at 401 (offset 55 lines).
patching file src/Makefile.am
patching file src/SConscript
patching file src/lobby_preferences.cpp
patching file src/lobby_preferences.hpp
patching file src/multiplayer.cpp
Hunk #2 FAILED at 538.
1 out of 2 hunks FAILED -- saving rejects to file src/multiplayer.cpp.rej
patching file src/multiplayer_lobby.cpp
patching file src/multiplayer_lobby.hpp
patching file src/multiplayer_ui.cpp
patching file src/multiplayer_ui.hpp
patching file src/widgets/textbox.cpp
patching file src/widgets/textbox.hpp
silene
Posts: 1109
Joined: August 28th, 2004, 10:02 pm

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by silene »

chains wrote:Any thoughts?
Which revision/branch is your SVN repository at? My patch is against the 1.8 release. Applying it to 1.8.1 or 1.9 will fail with the error you obtained. Either solve the conflict by hand (open multiplayer.cpp, search for ==== and look around, the fix should be obvious) or revert commit 42017 before applying the patch. (For 1.8.1, it's 42018.)
chains
Posts: 76
Joined: January 9th, 2007, 5:02 am
Location: Portland OR
Contact:

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by chains »

Ok, I broke out my geek translator for that one *Lol*

My version of wesnoth is 1.8.0+svn (42038M)

I followed the compile directions provided for Ubuntu and checked out wesnoth svn branch 1.8.

From what your saying, I need to re-download wesnoth and ask for a different version? Do you have the SVN command I would type to accomplish this checkout? Or is there another command I can type to revert from 42038 to 42018?

How do I specify that I want version 42017 instead of 42038?
silene
Posts: 1109
Joined: August 28th, 2004, 10:02 pm

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by silene »

chains wrote:Or is there another command I can type to revert from 42038 to 42018?
How do I specify that I want version 42017 instead of 42038?
No, you don't want to go to version 42017, you want to avoid changes that were introduced by 42017; that is, you want everything before 42017 and everything after 42018. I haven't used subversion for several years, so I may be a bit rusty, but I think the following commands will work for you (assuming your repository is still on the 1.8 branch).

Code: Select all

svn merge -c -42018
patch -p1 < old-lobby.patch
chains
Posts: 76
Joined: January 9th, 2007, 5:02 am
Location: Portland OR
Contact:

Re: Asking to re-introduce 1.6 lobby as an optional choice

Post by chains »

svn merge -c -42018
svn: Merge source required

I've only used SVN for basic check out and commit.
Post Reply