eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix quick destinations positioning

This commit is contained in:
Alexander Batalov 2022-08-24 13:11:46 +03:00
parent e71447a3d3
commit 89fd83012a
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/world_map.cc
View File

@ -3458,7 +3458,15 @@ int _wmWorldMapFunc(int a1)
CityInfo* city = &(gCities[cityIndex]); CityInfo* city = &(gCities[cityIndex]);
if (_wmAreaIsKnown(city->field_28)) { if (_wmAreaIsKnown(city->field_28)) {
if (_WorldMapCurrArea != cityIndex) { if (_WorldMapCurrArea != cityIndex) {
_wmPartyInitWalking(city->x, city->y); // SFALL: Fix the position of the destination marker for
// small/medium location circles.
// CE: Fix is slightly different. `_wmPartyInitWalking`
// assumes x/y are compensated for worldmap viewport
// offset (as can be seen earlier in this function).
CitySizeDescription* citySizeDescription = &(gCitySizeDescriptions[city->size]);
int destX = city->x + citySizeDescription->width / 2 - WM_VIEW_X;
int destY = city->y + citySizeDescription->height / 2 - WM_VIEW_Y;
_wmPartyInitWalking(destX, destY);
_wmGenData = 0; _wmGenData = 0;
} }
} }
@ -6127,16 +6135,21 @@ int worldmapCityMapViewSelect(int* mapIndexPtr)
} }
if (keyCode >= KEY_CTRL_F1 && keyCode <= KEY_CTRL_F7) { if (keyCode >= KEY_CTRL_F1 && keyCode <= KEY_CTRL_F7) {
int v10 = _LastTabsYOffset / 27 + keyCode - KEY_CTRL_F1; int quickDestinationIndex = _LastTabsYOffset / 27 + keyCode - KEY_CTRL_F1;
if (v10 < gQuickDestinationsLength) { if (quickDestinationIndex < gQuickDestinationsLength) {
int v11 = gQuickDestinations[v10]; int cityIndex = gQuickDestinations[quickDestinationIndex];
CityInfo* v12 = &(gCities[v11]); CityInfo* city = &(gCities[cityIndex]);
if (!_wmAreaIsKnown(v12->field_28)) { if (!_wmAreaIsKnown(city->field_28)) {
break; break;
} }
if (v11 != _WorldMapCurrArea) { if (cityIndex != _WorldMapCurrArea) {
_wmPartyInitWalking(v12->x, v12->y); // CE: Fix incorrect destination positioning. See
// `_wmWorldMapFunc` for explanation.
CitySizeDescription* citySizeDescription = &(gCitySizeDescriptions[city->size]);
int destX = city->x + citySizeDescription->width / 2 - WM_VIEW_X;
int destY = city->y + citySizeDescription->height / 2 - WM_VIEW_Y;
_wmPartyInitWalking(destX, destY);
_wmGenData = 0; _wmGenData = 0;
@ -6878,8 +6891,13 @@ int _wmTeleportToArea(int cityIndex)
gWorldmapIsTravelling = false; gWorldmapIsTravelling = false;
CityInfo* city = &(gCities[cityIndex]); CityInfo* city = &(gCities[cityIndex]);
_world_xpos = city->x;
_world_ypos = city->y; // SFALL: Fix for incorrect positioning after exiting small/medium
// locations.
// CE: See `_wmWorldMapFunc` for explanation.
CitySizeDescription* citySizeDescription = &(gCitySizeDescriptions[city->size]);
_world_xpos = city->x + citySizeDescription->width / 2 - WM_VIEW_X;
_world_ypos = city->y + citySizeDescription->height / 2 - WM_VIEW_Y;
return 0; return 0;
} }