|
15 | 15 | class RGBClass
|
16 | 16 | {
|
17 | 17 | public:
|
18 |
| - static constexpr reference<RGBClass, 0xA80220> White {}; |
19 |
| - static constexpr reference<int, 0x8A0DD0> const RedShiftLeft {}; |
20 |
| - static constexpr reference<int, 0x8A0DD4> const RedShiftRight {}; |
21 |
| - static constexpr reference<int, 0x8A0DE0> const GreenShiftLeft {}; |
22 |
| - static constexpr reference<int, 0x8A0DE4> const GreenShiftRight {}; |
23 |
| - static constexpr reference<int, 0x8A0DD8> const BlueShiftLeft {}; |
24 |
| - static constexpr reference<int, 0x8A0DDC> const BlueShiftRight {}; |
| 18 | + DEFINE_REFERENCE(RGBClass, White, 0xA80220) |
| 19 | + DEFINE_REFERENCE(int, RedShiftLeft, 0x8A0DD0) |
| 20 | + DEFINE_REFERENCE(int, RedShiftRight, 0x8A0DD4) |
| 21 | + DEFINE_REFERENCE(int, GreenShiftLeft, 0x8A0DE0) |
| 22 | + DEFINE_REFERENCE(int, GreenShiftRight, 0x8A0DE4) |
| 23 | + DEFINE_REFERENCE(int, BlueShiftLeft, 0x8A0DD8) |
| 24 | + DEFINE_REFERENCE(int, BlueShiftRight, 0x8A0DDC) |
25 | 25 |
|
26 | 26 | unsigned char Red;
|
27 | 27 | unsigned char Green;
|
@@ -115,16 +115,16 @@ struct DirtyAreaStruct
|
115 | 115 | class Drawing
|
116 | 116 | {
|
117 | 117 | public:
|
118 |
| - constexpr static reference<DynamicVectorClass<DirtyAreaStruct>, 0xB0CE78> DirtyAreas {}; |
119 |
| - static constexpr reference<ColorStruct, 0xB0FA1C> const TooltipColor {}; |
| 118 | + DEFINE_REFERENCE(DynamicVectorClass<DirtyAreaStruct>, DirtyAreas, 0xB0CE78) |
| 119 | + DEFINE_REFERENCE(ColorStruct, TooltipColor, 0xB0FA1C) |
120 | 120 | // RGB color mode currently in use, determined by primary drawing surface. The bitshift values below can change depending on this.
|
121 |
| - static constexpr reference<RGBMode, 0x8205D0> ColorMode {}; |
122 |
| - static constexpr reference<int, 0x8A0DD0> const RedShiftLeft {}; |
123 |
| - static constexpr reference<int, 0x8A0DD4> const RedShiftRight {}; |
124 |
| - static constexpr reference<int, 0x8A0DE0> const GreenShiftLeft {}; |
125 |
| - static constexpr reference<int, 0x8A0DE4> const GreenShiftRight {}; |
126 |
| - static constexpr reference<int, 0x8A0DD8> const BlueShiftLeft {}; |
127 |
| - static constexpr reference<int, 0x8A0DDC> const BlueShiftRight {}; |
| 121 | + DEFINE_REFERENCE(RGBMode, ColorMode, 0x8205D0) |
| 122 | + DEFINE_REFERENCE(int, RedShiftLeft, 0x8A0DD0) |
| 123 | + DEFINE_REFERENCE(int, RedShiftRight, 0x8A0DD4) |
| 124 | + DEFINE_REFERENCE(int, GreenShiftLeft, 0x8A0DE0) |
| 125 | + DEFINE_REFERENCE(int, GreenShiftRight, 0x8A0DE4) |
| 126 | + DEFINE_REFERENCE(int, BlueShiftLeft, 0x8A0DD8) |
| 127 | + DEFINE_REFERENCE(int, BlueShiftRight, 0x8A0DDC) |
128 | 128 |
|
129 | 129 | //TextBox dimensions for tooltip-style boxes
|
130 | 130 | static RectangleStruct* __fastcall GetTextDimensions(
|
@@ -228,7 +228,7 @@ class Drawing
|
228 | 228 | class NOVTABLE ABuffer
|
229 | 229 | {
|
230 | 230 | public:
|
231 |
| - static constexpr reference<ABuffer*, 0x87E8A4> Instance {}; |
| 231 | + DEFINE_REFERENCE(ABuffer*, Instance, 0x87E8A4) |
232 | 232 |
|
233 | 233 | ABuffer(RectangleStruct Rect) { JMP_THIS(0x410CE0); }
|
234 | 234 | bool BlitTo(Surface* pSurface, int X, int Y, int Offset, int Size) { JMP_THIS(0x410DC0); }
|
@@ -261,7 +261,7 @@ class NOVTABLE ABuffer
|
261 | 261 | class NOVTABLE ZBuffer
|
262 | 262 | {
|
263 | 263 | public:
|
264 |
| - static constexpr reference<ZBuffer*, 0x887644> Instance {}; |
| 264 | + DEFINE_REFERENCE(ZBuffer*, Instance, 0x887644) |
265 | 265 |
|
266 | 266 | ZBuffer(RectangleStruct Rect) { JMP_THIS(0x7BC970); }
|
267 | 267 | bool BlitTo(Surface* pSurface, int X, int Y, int Offset, int Size) { JMP_THIS(0x7BCA50); }
|
|
0 commit comments