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

Revert "Merge branch 'Isometric-Dev' into master"

Browse Source 
This reverts commit ae0648fccc, reversing
changes made to d7243e8265.
This commit is contained in:
Justin Marshall
2020-08-06 15:50:30 -07:00
parent ae0648fccc
commit 6685b5d51a
433 changed files with 8487 additions and 172344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/scroll.cpp
+26 -57
View File
@@ -105,67 +105,36 @@ void ScrollClass::AI(KeyNumType &input, int x, int y)
bool noscroll = false;
if (!noscroll) {
int screen_width = SeenBuff.Get_Width();
int screen_height = SeenBuff.Get_Height();
bool at_screen_edge = false;
if (!Debug_Map || !Debug_LockScroll) {
at_screen_edge = (y == 0 || x == 0 || x >= screen_width - 1 || y >= screen_height - 1);
}
bool at_screen_edge = (y == 0 || x == 0 || x >= SeenBuff.Get_Width()-1 || y >= SeenBuff.Get_Height()-1);
/*
** Verify that the mouse is over a scroll region.
*/
if (at_screen_edge) {
if (Inertia || at_screen_edge) {
if (at_screen_edge) {
player_scrolled = true;
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;
// }
//}
//
//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;
/*
** Adjust the mouse coordinates to emphasize the
** cardinal directions over the diagonals.
*/
int altx = x;
if (altx < 50 * RESFACTOR) altx -= ((50 * RESFACTOR)-altx);
altx = max(altx, 0);
if (altx > ((320-50) * RESFACTOR)) altx += altx-((320-50) * RESFACTOR);
altx = min(altx, (320 * RESFACTOR));
if (altx > (50 * RESFACTOR) && altx < ((320-50) * RESFACTOR)) {
altx += (((320/2) * RESFACTOR)-altx)/2;
}
int alty = y;
if (alty < (50 * RESFACTOR)) alty -= (50 * RESFACTOR)-alty;
alty = max(alty, 0);
if (alty > (150 * RESFACTOR)) alty += alty-(150 * RESFACTOR);
alty = min(alty, 200 * RESFACTOR);
direction = (DirType)Desired_Facing256((320/2) * RESFACTOR, (200/2) * RESFACTOR, altx, alty);
}
int control = Dir_Facing(direction);
@@ -199,9 +168,9 @@ void ScrollClass::AI(KeyNumType &input, int x, int y)
/*
** Increase the scroll rate if the mouse button is held down.
*/
// if (Keyboard->Down(KN_LMOUSE)) {
// rate = Bound(rate-3, 0, 4);
// }
// if (Keyboard->Down(KN_LMOUSE)) {
// rate = Bound(rate-3, 0, 4);
// }
if (Keyboard->Down(KN_RMOUSE)) {
rate = Bound(rate+1, 4, (int)(sizeof(_rate)/sizeof(_rate[0]))-1);
}
@@ -211,7 +180,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));
int distance = _rate[rate]/2;