hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed display scrolling in map view not working correct.

Browse Source
This commit is contained in:
Justin Marshall
2020-07-18 18:26:54 -07:00
parent 8353b2c1dd
commit 8a2bf274c9
3 changed files with 104 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/scroll.cpp
+43 -18
View File
@@ -123,24 +123,49 @@ void ScrollClass::AI(KeyNumType &input, int x, int y)
player_scrolled = true;
int half_screen_width = screen_width / 2;
int half_screen_height = screen_height / 2;
/*
** Adjust the mouse coordinates to emphasize the
** cardinal directions over the diagonals.
*/
int altx = x;
int alty = y;
if (alty == 0 || alty >= screen_height - 1){
if (altx != (half_screen_width)) {
float offset_x = (half_screen_width - altx) * .7;
altx = altx + offset_x;
}
//int half_screen_width = screen_width / 2;
//int half_screen_height = screen_height / 2;
//
///*
//** Adjust the mouse coordinates to emphasize the
//** cardinal directions over the diagonals.
//*/
//int altx = x;
//int alty = y;
//
//if (alty == 0 || alty >= screen_height - 1){
// if (altx != (half_screen_width)) {
// float offset_x = (half_screen_width - altx) * .7;
// altx = altx + offset_x;
// }
//}
//
//direction = (DirType)Desired_Facing256((half_screen_width), (half_screen_height), altx, alty);
if(x == 0 && y == 0) {
direction = DIR_NW;
}
else if (x >= screen_width - 1 && y == 0) {
direction = DIR_NE;
}
else if (x == 0 && y >= screen_height - 1) {
direction = DIR_SW;
}
else if (x >= screen_width - 1 && y >= screen_height - 1) {
direction = DIR_SE;
}
else if(x == 0)
{
direction = DIR_W;
}
else if(y == 0) {
direction = DIR_N;
}
else if(y >= screen_height - 1) {
direction = DIR_S;
}
else if(x >= screen_width - 1) {
direction = DIR_E;
}
direction = (DirType)Desired_Facing256((half_screen_width), (half_screen_height), altx, alty);
}
int control = Dir_Facing(direction);
@@ -186,7 +211,7 @@ void ScrollClass::AI(KeyNumType &input, int x, int y)
** one of the 8 facings, then adjust the direction value
** accordingly.
*/
direction = Facing_Dir(Dir_Facing(direction)) - (1<<5);
//direction = Facing_Dir(Dir_Facing(direction)) - (1<<5);
int distance = _rate[rate]/2;