Fix ace_map changes to compass display object

1. RscDisplayDiary doesn't even have a compass object that needs to be changed
2. The briefing displays (RscDisplayGetReady, RscDisplayClientGetReady, RscDisplayServerGetReady) were all inheriting from base class RscDisplayMainMap and re-defined the compass object subclasses was overriding that subclass inheritance chain (producing missing idc errors in the .rpt).
This commit is contained in:
SilentSpike
2015-08-03 13:30:08 +01:00
parent 261cd42202
commit 17e6aca0c8

View File

@ -125,13 +125,6 @@ class RscDisplayDiary {
}; };
}; };
}; };
// scale up the compass
class objects {
class Compass: RscObject {
scale = 0.7;
zoomDuration = 0;
};
};
}; };
// BRIEFING SCREEN // BRIEFING SCREEN
@ -149,13 +142,6 @@ class RscDisplayGetReady: RscDisplayMainMap {
#include "MapControls.hpp" #include "MapControls.hpp"
}; };
}; };
// scale up the compass
class objects {
class Compass: RscObject {
scale = 0.7;
zoomDuration = 0;
};
};
}; };
class RscDisplayClientGetReady: RscDisplayGetReady { class RscDisplayClientGetReady: RscDisplayGetReady {
// get rid of the "center to player position" - button (as it works even on elite) // get rid of the "center to player position" - button (as it works even on elite)
@ -164,13 +150,6 @@ class RscDisplayClientGetReady: RscDisplayGetReady {
#include "MapControls.hpp" #include "MapControls.hpp"
}; };
}; };
// scale up the compass
class objects {
class Compass: RscObject {
scale = 0.7;
zoomDuration = 0;
};
};
}; };
class RscDisplayServerGetReady: RscDisplayGetReady { class RscDisplayServerGetReady: RscDisplayGetReady {
// get rid of the "center to player position" - button (as it works even on elite) // get rid of the "center to player position" - button (as it works even on elite)
@ -179,11 +158,4 @@ class RscDisplayServerGetReady: RscDisplayGetReady {
#include "MapControls.hpp" #include "MapControls.hpp"
}; };
}; };
// scale up the compass
class objects {
class Compass: RscObject {
scale = 0.7;
zoomDuration = 0;
};
};
}; };