Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidying things up #1

Merged
merged 7 commits into from
Apr 21, 2014
Merged

Tidying things up #1

merged 7 commits into from
Apr 21, 2014

Conversation

RElesgoe
Copy link
Member

•Corrected language errors
•Added /j command, alias of /join
•Replaced instances of "PVPGN" with the name of your server
•/warrenty --> /warranty

•Added /j command, alias of /join
•Replaced instances of "PVPGN" with the name of your server
•/warrenty --> /warranty
@RElesgoe
Copy link
Member Author

btw I didn't test this one :(

@RElesgoe RElesgoe closed this Apr 13, 2014
@RElesgoe RElesgoe reopened this Apr 13, 2014
@HarpyWar
Copy link
Member

Thanks for the corrections, test a compilation please.
I think prefs_get_servername() ("servername" from bnetd.conf) should be in the messages instead of PVPGN_SOFTWARE, so admin can change this var. Do you?

@RElesgoe
Copy link
Member Author

I believe that PVPGN_SOFTWARE is already used in the MOTD file along with PVPGN_VERSION
The message is:
Hello [username], welcome to PvPGN Realm!(<--- I think that's another variable)
Running version [PVPGN_SOFTWARE] [PVPGN_VERSION] on [machine].
.......more stuff.....
Those two variables are hardcoded in version.h, now that you pointed out that there's a function to get the servername from bnetd.conf, there's obviously some overlapping functionality here.

@RElesgoe
Copy link
Member Author

Or actually, I'm wrong.... It'd be more correct to use prefs_get_servername()

@HarpyWar
Copy link
Member

"PvPGN Realm" is defined in BNETD_SERVERNAME as default value, and it can be changed from bnetd.conf

@RElesgoe
Copy link
Member Author

I don't think I can even test anything right now because I already have a custom pvpgn installed already and don't want to overwrite it...

@HarpyWar
Copy link
Member

You can just check a compilation with Magic Bulder http://code.google.com/p/pvpgn-magic-builder/
I can do it, but if you want to contribute another patches, you have to check it by yourself.

I will merge this commit after that and when you replace PVPGN_SOFTWARE -> prefs_get_servername(). Thanks.

xboi209 added 2 commits April 14, 2014 19:15
•Added command /?, alias of /help
•Added command /emote, alias of /me
•Fixed a few spelling mistakes
@HarpyWar
Copy link
Member

Please, fix compile errors.

@HarpyWar
Copy link
Member

Btw, Magic Builder is deprecated for code from this repository, but you can solve it simply http://forums.harpywar.com/viewtopic.php?pid=6273#p6273

@RElesgoe
Copy link
Member Author

That cleared a lot of errors that I was receiving but I the only major error that I get now is:
"cannot open include file 'afxres.h'"

@HarpyWar
Copy link
Member

It usually means that you have VC++ Express edition. There are include files missed from this edition, but Builder has these files in module\include\vsexpress_include, and they should be eautomatically included when building.
Do you use Magic Builder or manually open a solution file in VC++?

@RElesgoe
Copy link
Member Author

I used Magic Builder

@HarpyWar
Copy link
Member

If you do not receive other errors then make sure you run builder from the directory without spaces.
Try re download builder, may be you changed some important files. Remove only one CMakeLists.txt.
I just test compile on Windows 7 and VC++ 2010 and it also works.

@RElesgoe
Copy link
Member Author

I've done all of that and even checked that I have VC++ 2010 installed on Windows 7.

@RElesgoe
Copy link
Member Author

Ok this Pull Request should work now.

@HarpyWar
Copy link
Member

You forgot rename bnhelp.conf -> bnhelp.conf.in :)
CMake will rename it back to bnhelp.conf after installation.

@RElesgoe
Copy link
Member Author

Sorry, bnhelp.conf is actually the older version, I just removed it

@HarpyWar
Copy link
Member

There are still syntax errors in command.cpp when compile.

@RElesgoe
Copy link
Member Author

I thought I already committed that :/

HarpyWar added a commit that referenced this pull request Apr 21, 2014
@HarpyWar HarpyWar merged commit 8657c02 into pvpgn:master Apr 21, 2014
HarpyWar pushed a commit that referenced this pull request Jul 16, 2014
HarpyWar pushed a commit that referenced this pull request Jul 16, 2014
HarpyWar pushed a commit that referenced this pull request Oct 25, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants