1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER)

Browse Source 
- Fix: during dialogue, mercs did not agree often enough
- Fix: if no mercs were in any squad, Melody website did not show relations
- Dialogue has been reordered, this should make adding new ones slightly easier

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-09-27 20:19:49 +00:00
parent 58d9cf0925
commit fc861e0ba1
16 changed files with 5454 additions and 3678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/merccompare.cpp
+1 -1
View File
@@ -410,7 +410,7 @@ void RenderMercCompareAnalyze()
usPosX = LAPTOP_SCREEN_UL_X;
usPosY = MCA_START_CONTENT_Y;
if ( DropDownTemplate<DROPDOWNNR_MERCCOMPARE_SQUADSELECTION>::getInstance().HasEntries() )
if ( DropDownTemplate<DROPDOWNNR_MERCCOMPARE1>::getInstance( ).HasEntries( ) && DropDownTemplate<DROPDOWNNR_MERCCOMPARE2>::getInstance( ).HasEntries( ) )
{
gMercCompareProfile1 = (UINT8)DropDownTemplate<DROPDOWNNR_MERCCOMPARE1>::getInstance( ).GetSelectedEntryKey( );
gMercCompareProfile2 = (UINT8)DropDownTemplate<DROPDOWNNR_MERCCOMPARE2>::getInstance( ).GetSelectedEntryKey( );