Jump to content

Hexle

Members
  • Posts

    8
  • Joined

  • Last visited

    Never
  • Donations

    0.00 GBP 

Hexle's Achievements

Newbie

Newbie (1/3)

0

Reputation

  1. @Skirnir Thanks for your answer. I'm on Windows, after this messages i have added manually the 3 lines for ahbot in the configure.ac and delete all for this file in my patch file. So all was ok. Greetings
  2. @cyberium Hello with the actual mangos core i get this when i use the new ahbot $ git apply ../newahbot.patch ../newahbot.patch:1708: trailing whitespace. ../newahbot.patch:1711: trailing whitespace. error: patch failed: configure.ac:308 error: configure.ac: patch does not apply Something has changed . Greetings
  3. Thanks, now it will apply without any errors. Greetings
  4. @cyberium I prefer a seperate config file too. For me it's better to work with it as a database. But with the actual mangos revision and new_ahbot i get the following errors when i will apply the patch And it's the same when i get the repositories clone new and with ahbot and the branch from xeross $ git apply ../newahbot.patch ../newahbot.patch:166: trailing whitespace. for (uint32 i=0;i<MAX_ITEM_CLASS;++i) ../newahbot.patch:209: trailing whitespace. for (uint32 i=0;i<MAX_ITEM_CLASS;++i) ../newahbot.patch:238: trailing whitespace. if ((config.ItemInfos[j].ItemClassInfos.GetMissItems() > addedI tem[j]) && ItemPool[j].size() >0) ../newahbot.patch:269: trailing whitespace. if (MissItems > ItemsPerCycleBoost) ../newahbot.patch:444: trailing whitespace. { error: patch failed: src/game/AuctionHouseMgr.h:84 error: src/game/AuctionHouseMgr.h: patch does not apply Greetings
  5. For me now, all is ok. I have yesterday ahbot merged to the actual mangos source and compiled. Thanks to UncleNuke and DaViper for her tips. So i have learned a little more Hexle
  6. @UnkleNuke Yes you are right. I have to learn more about git. My next step is to do rtfm and have a look in the 2 sections you have write. For me are the hints from you and DaViper at the moment enough, but when i will not understand something i ask again Hexle
  7. thank you for your reply. No ihave done it in the git bash. I will check when i'm at home.
  8. @DaViper I have the same problem like earthwalker. So i have seen your post and use the command 'git pull git://github.com/xeross/mangos.git ahbot' in my mangos folder. But i get following messages $ git pull git://github.com/xeross/mangos.git ahbot remote: Counting objects: 172, done. remote: Compressing objects: 100% (74/74), done. emote: Total 102 (delta 84), reused 41 (delta 28)Receiving objects Receiving objects: 79% (81/102) Receiving objects: 100% (102/102), 46.75 KiB, done. Resolving deltas: 100% (84/84), completed with 27 local objects. From git://github.com/xeross/mangos * branch ahbot -> FETCH_HEAD Auto-merging src/game/AuctionHouseMgr.cpp Auto-merging src/game/Chat.cpp Auto-merging src/game/Chat.h Auto-merging src/game/Level3.cpp Auto-merging src/game/Mail.cpp Auto-merging src/game/Makefile.am Auto-merging src/game/Player.h Auto-merging src/game/World.cpp Auto-merging src/game/World.h CONFLICT (content): Merge conflict in src/game/World.h Auto-merging src/mangosd/mangosd.conf.dist.in Auto-merging win/VC100/game.vcxproj Auto-merging win/VC80/game.vcproj Auto-merging win/VC90/game.vcproj Automatic merge failed; fix conflicts and then commit the result. What's my failure? Hexle
×
×
  • Create New...

Important Information

We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue. Privacy Policy Terms of Use