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

Instance mode #3

Merged
merged 22 commits into from
Dec 21, 2011
Merged

Instance mode #3

merged 22 commits into from
Dec 21, 2011

Conversation

kbialowas
Copy link
Contributor

I implemented something requested here:

http://www.eternal-lands.com/forum/index.php?showtopic=56252

however there are more answers in feature request thread than in my thread (http://www.eternal-lands.com/forum/index.php?showtopic=56274) so no idea if it should/can be included in this form.

@raduprv
Copy link
Owner

raduprv commented Dec 19, 2011

Hi

Post it in the programming forum too pls.

On 12/19/2011 4:28, Karol wrote:

I implemented something requested here:

http://www.eternal-lands.com/forum/index.php?showtopic=56252

however there are more answers in feature request thread than in my thread (http://www.eternal-lands.com/forum/index.php?showtopic=56274) so no idea if it should/can be included in this form.

You can merge this Pull Request by running:

git pull https://github.com/kbialowas/Eternal-Lands instance_mode

Or you can view, comment on it, or merge it online at:

#3

-- Commit Summary --

  • instance mode implementation
  • popup menu, option save and some displaying fixes
  • instance mode implementation
  • popup menu, option save and some displaying fixes
  • Merge branch 'instance_mode' of git@github.com:kbialowas/Eternal-Lands into instance_mode
  • instance mode implementation
  • Merge branch 'instance_mode' of github.com:kbialowas/Eternal-Lands into instance_mode
  • displaying mana bar as an option also in "non-instance" mode
  • config version changed
  • added banners customization

-- File Changes --

M actors.c (251)
M elconfig.c (23)
M gamewin.c (13)
M init.c (6)
M init.h (3)
M interface.c (15)
M interface.h (14)
M translate.c (6)
M translate.h (3)

-- Patch Links --

https://github.com/raduprv/Eternal-Lands/pull/3.patch
https://github.com/raduprv/Eternal-Lands/pull/3.diff


Reply to this email directly or view it on GitHub:
#3

@kbialowas
Copy link
Contributor Author

Made new thread in the programming forum: http://www.eternal-lands.com/forum/index.php?showtopic=56372

@pjbroad
Copy link
Collaborator

pjbroad commented Dec 19, 2011

There's a minor bug with the banner context menu, the disable option should be 11 not 10 due to the separation bar.
Also, the banner background for NPCs is now a row too big.

It would be much better if we could avoid a el.cfg version change, How about combining the banner values into a single word and using bit positions. Just like the misc options word. The then unused words can me kept for future additions.

Perhaps the instance tab should not be the last in the row, I think Roja wanted trouble shooting there. How about moving the tab to be next to the hud tab?

@kbialowas
Copy link
Contributor Author

Fixed (I hope so ;)) issues pointed by pjbroad. Still not sure about el.cfg version thingie. I modified only options in init.h/init.c. Is that enough or should I look somewhere else to modify also settings i added only to elconfig.c (they're saved automagically and I have no idea where/how)?

@pjbroad
Copy link
Collaborator

pjbroad commented Dec 19, 2011

To keep compatibility with the old el.cfg you have to keep the order and number of bytes the same. It's a binary file :( So you need to add a couple of unused ints to the init.h file in the correct place:

diff --git a/init.h b/init.h
index eb6901f..0cbddb5 100644
--- a/init.h
+++ b/init.h
@@ -121,6 +121,9 @@ typedef struct
int banner_settings;
/*! @} */

+ int unsed_01;

  •   int unsed_02;
    
  •   /*!
       \* \name quest log window position
       */
    

The elconfig.c options are saved in the el.ini file which is a text file and there's no issue with compatibility. Like you said, it all automatically done.

Also, it appears that in non-instance mode, the banner background size is set the same for all actors so too big for some.

@pjbroad
Copy link
Collaborator

pjbroad commented Dec 19, 2011

One more thing, you have removed the code that ensured there was a banner context menu region to click on even if all the banner options are disabled. I suggest you restore that bit of code.

@kbialowas
Copy link
Contributor Author

Ok, I moved instance banners options to the HUD tab, as Roja suggested on forum. Going to fix other issues ;).

@@ -800,6 +800,7 @@ struct xml_struct
ttab_camera[15],
ttab_troubleshoot[15],
ttab_font[10],
ttab_instance[15],
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't need this now:)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed ;)

@kbialowas
Copy link
Contributor Author

OK looks like i fixed background width in non instance mode, also fixed context menu issue when our banner is not visible. There is one more issue with background - when you turn on mana bar/number and turn off names. Working on it now.

@kbialowas
Copy link
Contributor Author

OK I hope everything is fine now ;).

@pjbroad
Copy link
Collaborator

pjbroad commented Dec 19, 2011

Great work:)

@ghost ghost assigned pjbroad Dec 20, 2011
pjbroad added a commit that referenced this pull request Dec 21, 2011
@pjbroad pjbroad merged commit 8351403 into raduprv:master Dec 21, 2011
pjbroad referenced this pull request in pjbroad/other-life Feb 27, 2013
Merge latest EL changes
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.

None yet

3 participants