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

Listing a standing embargo in the diplomacy manager #214

Merged
merged 7 commits into from
Dec 1, 2019

Conversation

LynxAbraxas
Copy link
Contributor

So far the embargo icon was only shown when at war but not when only an embargo was enacted.

https://unix.stackexchange.com/a/12813
cat -s ./ctp2_code/ui/interface/diplomacywindow.cpp > ./ctp2_code/ui/interface/diplomacywindow.cpp_
mv ./ctp2_code/ui/interface/diplomacywindow.cpp_ ./ctp2_code/ui/interface/diplomacywindow.cpp
cat -s ctp2_code/ui/interface/intelligencewindow.cpp > ctp2_code/ui/interface/intelligencewindow.cpp_
mv ctp2_code/ui/interface/intelligencewindow.cpp_ ctp2_code/ui/interface/intelligencewindow.cpp
@LynxAbraxas LynxAbraxas force-pushed the dbgEmbargo branch 10 times, most recently from 1224332 to 195b23f Compare November 17, 2019 20:52
@LynxAbraxas
Copy link
Contributor Author

Enacted embargos to other civs now shown:
ss_2019-11-28_19:30:37

@LynxAbraxas
Copy link
Contributor Author

Tested for a while and seems to work as expeced.
@MartinGuehmann ready for merge?

@LynxAbraxas LynxAbraxas changed the title WIP: Listing a standing embargo in the diplomacy manager Listing a standing embargo in the diplomacy manager Nov 28, 2019
@LynxAbraxas
Copy link
Contributor Author

For the reference: #201 (comment)

@LynxAbraxas
Copy link
Contributor Author

@MartinGuehmann ready for merge?

@MartinGuehmann
Copy link
Collaborator

Tested for a while and seems to work as expeced.
@MartinGuehmann ready for merge?

If it works then let's merge.

@MartinGuehmann MartinGuehmann merged commit 23218fd into civctp2:master Dec 1, 2019
@LynxAbraxas LynxAbraxas deleted the dbgEmbargo branch December 1, 2019 16:19
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

2 participants