Merge branch 'gsb' of https://github.com/Goldensunboy/WL4Editor into gsb

wario-land · Dec 6, 2018 · eb54c44 · eb54c44
2 parents 2e014ad + 810a820
commit eb54c44
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Dialog/DoorConfigDialog.cpp b/Dialog/DoorConfigDialog.cpp
@@ -123,7 +123,7 @@ DoorConfigDialog::~DoorConfigDialog()
 void DoorConfigDialog::UpdateCurrentDoorData()
 {
     CurrentRoom->GetDoor(DoorID)->SetDoorType(static_cast<LevelComponents::DoorType>(ui->ComboBox_DoorType->currentIndex() + 1));
-    CurrentRoom->GetDoor(DoorID)->SetDelta((unsigned char) ui->SpinBox_WarioX->value(), (unsigned char) ui->SpinBox_WarioY->value());
+    CurrentRoom->GetDoor(DoorID)->SetDelta((signed char) ui->SpinBox_WarioX->value(), (signed char) ui->SpinBox_WarioY->value());
     CurrentRoom->GetDoor(DoorID)->SetDoorPlace(
         (unsigned char) ui->SpinBox_DoorX->value(),
         (unsigned char) (ui->SpinBox_DoorX->value() + ui->SpinBox_DoorWidth->value() - 1),
@@ -497,7 +497,7 @@ void DoorConfigDialog::on_SpinBox_WarioX_valueChanged(int arg1)
 {
     (void) arg1;
     if(!IsInitialized) return;
-    tmpCurrentRoom->GetDoor(DoorID)->SetDelta((unsigned char) ui->SpinBox_WarioX->value(), (unsigned char) ui->SpinBox_WarioY->value());
+    tmpCurrentRoom->GetDoor(DoorID)->SetDelta((signed char) ui->SpinBox_WarioX->value(), (signed char) ui->SpinBox_WarioY->value());
 }
 
 /// <summary>
@@ -510,7 +510,7 @@ void DoorConfigDialog::on_SpinBox_WarioY_valueChanged(int arg1)
 {
     (void) arg1;
     if(!IsInitialized) return;
-    tmpCurrentRoom->GetDoor(DoorID)->SetDelta((unsigned char) ui->SpinBox_WarioX->value(), (unsigned char) ui->SpinBox_WarioY->value());
+    tmpCurrentRoom->GetDoor(DoorID)->SetDelta((signed char) ui->SpinBox_WarioX->value(), (signed char) ui->SpinBox_WarioY->value());
 }
 
 /// <summary>

diff --git a/LevelComponents/Door.h b/LevelComponents/Door.h
@@ -27,8 +27,8 @@ namespace LevelComponents
         unsigned char y1;
         unsigned char y2;
         unsigned char LinkerDestination;
-        unsigned char HorizontalDelta;
-        unsigned char VerticalDelta;
+        signed char HorizontalDelta;
+        signed char VerticalDelta;
         unsigned char EntitySetID;
         unsigned short BGM_ID;
     };
@@ -75,7 +75,7 @@ namespace LevelComponents
         void SetEntitySetID(unsigned char _EntitySetID) { DoorEntry.EntitySetID =_EntitySetID; }
         void SetGlobalDoorID(int doorId) { DoorID = doorId; }
         void SetLinkerDestination(int dest_RoomId) { DoorEntry.LinkerDestination = (unsigned char) dest_RoomId; }
-        void SetDelta(unsigned char _DeltaX, unsigned char _DeltaY)
+        void SetDelta(signed char _DeltaX, signed char _DeltaY)
         {
             DoorEntry.HorizontalDelta = (signed char) _DeltaX;
             DoorEntry.VerticalDelta = (signed char) _DeltaY;