From 13126a90d6aed8727b52ed5493455677a53894b8 Mon Sep 17 00:00:00 2001 From: galaxyhaxz Date: Tue, 4 Sep 2018 11:16:14 -0500 Subject: [PATCH] Fix garbage structs, data in setmaps (#189) --- Source/control.cpp | 18 +- Source/control.h | 2 +- Source/interfac.cpp | 6 +- Source/interfac.h | 2 +- Source/lighting.cpp | 752 +++++++++++++++++++++----------------------- Source/lighting.h | 4 +- Source/missiles.cpp | 46 +-- Source/setmaps.cpp | 105 ++++--- Source/setmaps.h | 8 +- Source/sound.cpp | 8 +- Source/sound.h | 2 +- structs.h | 72 ----- 12 files changed, 482 insertions(+), 543 deletions(-) diff --git a/Source/control.cpp b/Source/control.cpp index 8a832d80a..9f6f5ddee 100644 --- a/Source/control.cpp +++ b/Source/control.cpp @@ -173,7 +173,7 @@ char *PanBtnStr[8] = "Send Message", "Player Attack" }; -RECT32 attribute_inc_rects[4] = +int attribute_inc_rects[4][4] = { { 137, 138, 41, 22 }, { 137, 166, 41, 22 }, @@ -2455,11 +2455,11 @@ LABEL_12: if ( v5 ^ v6 ) { v10 = v0; - v11 = attribute_inc_rects[v0].x; - if ( v2 >= v11 && v2 <= v11 + attribute_inc_rects[v10].w ) + v11 = attribute_inc_rects[v0][0]; + if ( v2 >= v11 && v2 <= v11 + attribute_inc_rects[v10][2] ) { - v12 = attribute_inc_rects[v10].y; - if ( MouseY >= v12 && MouseY <= v12 + attribute_inc_rects[v10].h ) + v12 = attribute_inc_rects[v10][1]; + if ( MouseY >= v12 && MouseY <= v12 + attribute_inc_rects[v10][3] ) { chrbtn[v0] = 1; chrbtnactive = 1; @@ -2497,11 +2497,11 @@ void __cdecl ReleaseChrBtns() { *v1 = 0; v2 = v0; - v3 = attribute_inc_rects[v0].x; - if ( MouseX >= v3 && MouseX <= v3 + attribute_inc_rects[v2].w ) + v3 = attribute_inc_rects[v0][0]; + if ( MouseX >= v3 && MouseX <= v3 + attribute_inc_rects[v2][2] ) { - v4 = attribute_inc_rects[v2].y; - if ( MouseY >= v4 && MouseY <= v4 + attribute_inc_rects[v2].h ) + v4 = attribute_inc_rects[v2][1]; + if ( MouseY >= v4 && MouseY <= v4 + attribute_inc_rects[v2][3] ) { if ( v0 ) { diff --git a/Source/control.h b/Source/control.h index 7184b03eb..096ed98be 100644 --- a/Source/control.h +++ b/Source/control.h @@ -135,7 +135,7 @@ extern unsigned char SpellITbl[37]; extern int PanBtnPos[8][5]; extern char *PanBtnHotKey[8]; extern char *PanBtnStr[8]; -extern RECT32 attribute_inc_rects[4]; +extern int attribute_inc_rects[4][4]; extern int SpellPages[6][7]; #endif /* __CONTROL_H__ */ diff --git a/Source/interfac.cpp b/Source/interfac.cpp index 0f46236c6..91c370996 100644 --- a/Source/interfac.cpp +++ b/Source/interfac.cpp @@ -9,7 +9,7 @@ int progress_id; // idb int interfac_inf = 0x7F800000; // weak unsigned char progress_bar_colours[3] = { 138u, 43u, 254u }; -POINT32 progress_bar_screen_pos[3] = { { 53, 37 }, { 53, 421 }, { 53, 37 } }; +int progress_bar_screen_pos[3][2] = { { 53, 37 }, { 53, 421 }, { 53, 37 } }; struct interfac_cpp_init { @@ -56,8 +56,8 @@ void __cdecl DrawCutscene() { do DrawProgress( - progress_bar_screen_pos[progress_id].x + v0++ + 64, - progress_bar_screen_pos[progress_id].y + 160, + progress_bar_screen_pos[progress_id][0] + v0++ + 64, + progress_bar_screen_pos[progress_id][1] + 160, progress_id); while ( v0 < sgdwProgress ); } diff --git a/Source/interfac.h b/Source/interfac.h index 8b362d55b..a01431208 100644 --- a/Source/interfac.h +++ b/Source/interfac.h @@ -20,6 +20,6 @@ void __fastcall InitCutscene(int uMsg); extern int interfac_inf; // weak extern unsigned char progress_bar_colours[3]; -extern POINT32 progress_bar_screen_pos[3]; +extern int progress_bar_screen_pos[3][2]; #endif /* __INTERFAC_H__ */ diff --git a/Source/lighting.cpp b/Source/lighting.cpp index d3eb12d51..eea60cde3 100644 --- a/Source/lighting.cpp +++ b/Source/lighting.cpp @@ -16,418 +16,392 @@ int visionid; char *pLightTbl; /* todo: struct? */ int lightflag; // weak -CircleCoord CrawlTable = +char CrawlTable[2749] = { 1, - { - { 0, 0 } - }, + 0, 0, 4, - { - { 0, 1 }, { 0, -1 }, { -1, 0 }, { 1, 0 } - }, + 0, 1, 0, -1, -1, 0, 1, 0, 16, - { - { 0, 2 }, { 0, -2 }, { -1, 2 }, { 1, 2 }, - { -1, -2 }, { 1, -2 }, { -1, 1 }, { 1, 1 }, - { -1, -1 }, { 1, -1 }, { -2, 1 }, { 2, 1 }, - { -2, -1 }, { 2, -1 }, { -2, 0 }, { 2, 0 } - }, + 0, 2, 0, -2, -1, 2, 1, 2, + -1, -2, 1, -2, -1, 1, 1, 1, + -1, -1, 1, -1, -2, 1, 2, 1, + -2, -1, 2, -1, -2, 0, 2, 0, 24, - { - { 0, 3 }, { 0, -3 }, { -1, 3 }, { 1, 3 }, - { -1, -3 }, { 1, -3 }, { -2, 3 }, { 2, 3 }, - { -2, -3 }, { 2, -3 }, { -2, 2 }, { 2, 2 }, - { -2, -2 }, { 2, -2 }, { -3, 2 }, { 3, 2 }, - { -3, -2 }, { 3, -2 }, { -3, 1 }, { 3, 1 }, - { -3, -1 }, { 3, -1 }, { -3, 0 }, { 3, 0 } - }, + 0, 3, 0, -3, -1, 3, 1, 3, + -1, -3, 1, -3, -2, 3, 2, 3, + -2, -3, 2, -3, -2, 2, 2, 2, + -2, -2, 2, -2, -3, 2, 3, 2, + -3, -2, 3, -2, -3, 1, 3, 1, + -3, -1, 3, -1, -3, 0, 3, 0, 32, - { - { 0, 4 }, { 0, -4 }, { -1, 4 }, { 1, 4 }, - { -1, -4 }, { 1, -4 }, { -2, 4 }, { 2, 4 }, - { -2, -4 }, { 2, -4 }, { -3, 4 }, { 3, 4 }, - { -3, -4 }, { 3, -4 }, { -3, 3 }, { 3, 3 }, - { -3, -3 }, { 3, -3 }, { -4, 3 }, { 4, 3 }, - { -4, -3 }, { 4, -3 }, { -4, 2 }, { 4, 2 }, - { -4, -2 }, { 4, -2 }, { -4, 1 }, { 4, 1 }, - { -4, -1 }, { 4, -1 }, { -4, 0 }, { 4, 0 } - }, + 0, 4, 0, -4, -1, 4, 1, 4, + -1, -4, 1, -4, -2, 4, 2, 4, + -2, -4, 2, -4, -3, 4, 3, 4, + -3, -4, 3, -4, -3, 3, 3, 3, + -3, -3, 3, -3, -4, 3, 4, 3, + -4, -3, 4, -3, -4, 2, 4, 2, + -4, -2, 4, -2, -4, 1, 4, 1, + -4, -1, 4, -1, -4, 0, 4, 0, 40, - { - { 0, 5 }, { 0, -5 }, { -1, 5 }, { 1, 5 }, - { -1, -5 }, { 1, -5 }, { -2, 5 }, { 2, 5 }, - { -2, -5 }, { 2, -5 }, { -3, 5 }, { 3, 5 }, - { -3, -5 }, { 3, -5 }, { -4, 5 }, { 4, 5 }, - { -4, -5 }, { 4, -5 }, { -4, 4 }, { 4, 4 }, - { -4, -4 }, { 4, -4 }, { -5, 4 }, { 5, 4 }, - { -5, -4 }, { 5, -4 }, { -5, 3 }, { 5, 3 }, - { -5, -3 }, { 5, -3 }, { -5, 2 }, { 5, 2 }, - { -5, -2 }, { 5, -2 }, { -5, 1 }, { 5, 1 }, - { -5, -1 }, { 5, -1 }, { -5, 0 }, { 5, 0 } - }, + 0, 5, 0, -5, -1, 5, 1, 5, + -1, -5, 1, -5, -2, 5, 2, 5, + -2, -5, 2, -5, -3, 5, 3, 5, + -3, -5, 3, -5, -4, 5, 4, 5, + -4, -5, 4, -5, -4, 4, 4, 4, + -4, -4, 4, -4, -5, 4, 5, 4, + -5, -4, 5, -4, -5, 3, 5, 3, + -5, -3, 5, -3, -5, 2, 5, 2, + -5, -2, 5, -2, -5, 1, 5, 1, + -5, -1, 5, -1, -5, 0, 5, 0, 48, - { - { 0, 6 }, { 0, -6 }, { -1, 6 }, { 1, 6 }, - { -1, -6 }, { 1, -6 }, { -2, 6 }, { 2, 6 }, - { -2, -6 }, { 2, -6 }, { -3, 6 }, { 3, 6 }, - { -3, -6 }, { 3, -6 }, { -4, 6 }, { 4, 6 }, - { -4, -6 }, { 4, -6 }, { -5, 6 }, { 5, 6 }, - { -5, -6 }, { 5, -6 }, { -5, 5 }, { 5, 5 }, - { -5, -5 }, { 5, -5 }, { -6, 5 }, { 6, 5 }, - { -6, -5 }, { 6, -5 }, { -6, 4 }, { 6, 4 }, - { -6, -4 }, { 6, -4 }, { -6, 3 }, { 6, 3 }, - { -6, -3 }, { 6, -3 }, { -6, 2 }, { 6, 2 }, - { -6, -2 }, { 6, -2 }, { -6, 1 }, { 6, 1 }, - { -6, -1 }, { 6, -1 }, { -6, 0 }, { 6, 0 } - }, + 0, 6, 0, -6, -1, 6, 1, 6, + -1, -6, 1, -6, -2, 6, 2, 6, + -2, -6, 2, -6, -3, 6, 3, 6, + -3, -6, 3, -6, -4, 6, 4, 6, + -4, -6, 4, -6, -5, 6, 5, 6, + -5, -6, 5, -6, -5, 5, 5, 5, + -5, -5, 5, -5, -6, 5, 6, 5, + -6, -5, 6, -5, -6, 4, 6, 4, + -6, -4, 6, -4, -6, 3, 6, 3, + -6, -3, 6, -3, -6, 2, 6, 2, + -6, -2, 6, -2, -6, 1, 6, 1, + -6, -1, 6, -1, -6, 0, 6, 0, 56, - { - { 0, 7 }, { 0, -7 }, { -1, 7 }, { 1, 7 }, - { -1, -7 }, { 1, -7 }, { -2, 7 }, { 2, 7 }, - { -2, -7 }, { 2, -7 }, { -3, 7 }, { 3, 7 }, - { -3, -7 }, { 3, -7 }, { -4, 7 }, { 4, 7 }, - { -4, -7 }, { 4, -7 }, { -5, 7 }, { 5, 7 }, - { -5, -7 }, { 5, -7 }, { -6, 7 }, { 6, 7 }, - { -6, -7 }, { 6, -7 }, { -6, 6 }, { 6, 6 }, - { -6, -6 }, { 6, -6 }, { -7, 6 }, { 7, 6 }, - { -7, -6 }, { 7, -6 }, { -7, 5 }, { 7, 5 }, - { -7, -5 }, { 7, -5 }, { -7, 4 }, { 7, 4 }, - { -7, -4 }, { 7, -4 }, { -7, 3 }, { 7, 3 }, - { -7, -3 }, { 7, -3 }, { -7, 2 }, { 7, 2 }, - { -7, -2 }, { 7, -2 }, { -7, 1 }, { 7, 1 }, - { -7, -1 }, { 7, -1 }, { -7, 0 }, { 7, 0 } - }, + 0, 7, 0, -7, -1, 7, 1, 7, + -1, -7, 1, -7, -2, 7, 2, 7, + -2, -7, 2, -7, -3, 7, 3, 7, + -3, -7, 3, -7, -4, 7, 4, 7, + -4, -7, 4, -7, -5, 7, 5, 7, + -5, -7, 5, -7, -6, 7, 6, 7, + -6, -7, 6, -7, -6, 6, 6, 6, + -6, -6, 6, -6, -7, 6, 7, 6, + -7, -6, 7, -6, -7, 5, 7, 5, + -7, -5, 7, -5, -7, 4, 7, 4, + -7, -4, 7, -4, -7, 3, 7, 3, + -7, -3, 7, -3, -7, 2, 7, 2, + -7, -2, 7, -2, -7, 1, 7, 1, + -7, -1, 7, -1, -7, 0, 7, 0, 64, - { - { 0, 8 }, { 0, -8 }, { -1, 8 }, { 1, 8 }, - { -1, -8 }, { 1, -8 }, { -2, 8 }, { 2, 8 }, - { -2, -8 }, { 2, -8 }, { -3, 8 }, { 3, 8 }, - { -3, -8 }, { 3, -8 }, { -4, 8 }, { 4, 8 }, - { -4, -8 }, { 4, -8 }, { -5, 8 }, { 5, 8 }, - { -5, -8 }, { 5, -8 }, { -6, 8 }, { 6, 8 }, - { -6, -8 }, { 6, -8 }, { -7, 8 }, { 7, 8 }, - { -7, -8 }, { 7, -8 }, { -7, 7 }, { 7, 7 }, - { -7, -7 }, { 7, -7 }, { -8, 7 }, { 8, 7 }, - { -8, -7 }, { 8, -7 }, { -8, 6 }, { 8, 6 }, - { -8, -6 }, { 8, -6 }, { -8, 5 }, { 8, 5 }, - { -8, -5 }, { 8, -5 }, { -8, 4 }, { 8, 4 }, - { -8, -4 }, { 8, -4 }, { -8, 3 }, { 8, 3 }, - { -8, -3 }, { 8, -3 }, { -8, 2 }, { 8, 2 }, - { -8, -2 }, { 8, -2 }, { -8, 1 }, { 8, 1 }, - { -8, -1 }, { 8, -1 }, { -8, 0 }, { 8, 0 } - }, + 0, 8, 0, -8, -1, 8, 1, 8, + -1, -8, 1, -8, -2, 8, 2, 8, + -2, -8, 2, -8, -3, 8, 3, 8, + -3, -8, 3, -8, -4, 8, 4, 8, + -4, -8, 4, -8, -5, 8, 5, 8, + -5, -8, 5, -8, -6, 8, 6, 8, + -6, -8, 6, -8, -7, 8, 7, 8, + -7, -8, 7, -8, -7, 7, 7, 7, + -7, -7, 7, -7, -8, 7, 8, 7, + -8, -7, 8, -7, -8, 6, 8, 6, + -8, -6, 8, -6, -8, 5, 8, 5, + -8, -5, 8, -5, -8, 4, 8, 4, + -8, -4, 8, -4, -8, 3, 8, 3, + -8, -3, 8, -3, -8, 2, 8, 2, + -8, -2, 8, -2, -8, 1, 8, 1, + -8, -1, 8, -1, -8, 0, 8, 0, 72, - { - { 0, 9 }, { 0, -9 }, { -1, 9 }, { 1, 9 }, - { -1, -9 }, { 1, -9 }, { -2, 9 }, { 2, 9 }, - { -2, -9 }, { 2, -9 }, { -3, 9 }, { 3, 9 }, - { -3, -9 }, { 3, -9 }, { -4, 9 }, { 4, 9 }, - { -4, -9 }, { 4, -9 }, { -5, 9 }, { 5, 9 }, - { -5, -9 }, { 5, -9 }, { -6, 9 }, { 6, 9 }, - { -6, -9 }, { 6, -9 }, { -7, 9 }, { 7, 9 }, - { -7, -9 }, { 7, -9 }, { -8, 9 }, { 8, 9 }, - { -8, -9 }, { 8, -9 }, { -8, 8 }, { 8, 8 }, - { -8, -8 }, { 8, -8 }, { -9, 8 }, { 9, 8 }, - { -9, -8 }, { 9, -8 }, { -9, 7 }, { 9, 7 }, - { -9, -7 }, { 9, -7 }, { -9, 6 }, { 9, 6 }, - { -9, -6 }, { 9, -6 }, { -9, 5 }, { 9, 5 }, - { -9, -5 }, { 9, -5 }, { -9, 4 }, { 9, 4 }, - { -9, -4 }, { 9, -4 }, { -9, 3 }, { 9, 3 }, - { -9, -3 }, { 9, -3 }, { -9, 2 }, { 9, 2 }, - { -9, -2 }, { 9, -2 }, { -9, 1 }, { 9, 1 }, - { -9, -1 }, { 9, -1 }, { -9, 0 }, { 9, 0 } - }, + 0, 9, 0, -9, -1, 9, 1, 9, + -1, -9, 1, -9, -2, 9, 2, 9, + -2, -9, 2, -9, -3, 9, 3, 9, + -3, -9, 3, -9, -4, 9, 4, 9, + -4, -9, 4, -9, -5, 9, 5, 9, + -5, -9, 5, -9, -6, 9, 6, 9, + -6, -9, 6, -9, -7, 9, 7, 9, + -7, -9, 7, -9, -8, 9, 8, 9, + -8, -9, 8, -9, -8, 8, 8, 8, + -8, -8, 8, -8, -9, 8, 9, 8, + -9, -8, 9, -8, -9, 7, 9, 7, + -9, -7, 9, -7, -9, 6, 9, 6, + -9, -6, 9, -6, -9, 5, 9, 5, + -9, -5, 9, -5, -9, 4, 9, 4, + -9, -4, 9, -4, -9, 3, 9, 3, + -9, -3, 9, -3, -9, 2, 9, 2, + -9, -2, 9, -2, -9, 1, 9, 1, + -9, -1, 9, -1, -9, 0, 9, 0, 80, - { - { 0, 10 }, { 0, -10 }, { -1, 10 }, { 1, 10 }, - { -1, -10 }, { 1, -10 }, { -2, 10 }, { 2, 10 }, - { -2, -10 }, { 2, -10 }, { -3, 10 }, { 3, 10 }, - { -3, -10 }, { 3, -10 }, { -4, 10 }, { 4, 10 }, - { -4, -10 }, { 4, -10 }, { -5, 10 }, { 5, 10 }, - { -5, -10 }, { 5, -10 }, { -6, 10 }, { 6, 10 }, - { -6, -10 }, { 6, -10 }, { -7, 10 }, { 7, 10 }, - { -7, -10 }, { 7, -10 }, { -8, 10 }, { 8, 10 }, - { -8, -10 }, { 8, -10 }, { -9, 10 }, { 9, 10 }, - { -9, -10 }, { 9, -10 }, { -9, 9 }, { 9, 9 }, - { -9, -9 }, { 9, -9 }, { -10, 9 }, { 10, 9 }, - { -10, -9 }, { 10, -9 }, { -10, 8 }, { 10, 8 }, - { -10, -8 }, { 10, -8 }, { -10, 7 }, { 10, 7 }, - { -10, -7 }, { 10, -7 }, { -10, 6 }, { 10, 6 }, - { -10, -6 }, { 10, -6 }, { -10, 5 }, { 10, 5 }, - { -10, -5 }, { 10, -5 }, { -10, 4 }, { 10, 4 }, - { -10, -4 }, { 10, -4 }, { -10, 3 }, { 10, 3 }, - { -10, -3 }, { 10, -3 }, { -10, 2 }, { 10, 2 }, - { -10, -2 }, { 10, -2 }, { -10, 1 }, { 10, 1 }, - { -10, -1 }, { 10, -1 }, { -10, 0 }, { 10, 0 } - }, + 0, 10, 0, -10, -1, 10, 1, 10, + -1, -10, 1, -10, -2, 10, 2, 10, + -2, -10, 2, -10, -3, 10, 3, 10, + -3, -10, 3, -10, -4, 10, 4, 10, + -4, -10, 4, -10, -5, 10, 5, 10, + -5, -10, 5, -10, -6, 10, 6, 10, + -6, -10, 6, -10, -7, 10, 7, 10, + -7, -10, 7, -10, -8, 10, 8, 10, + -8, -10, 8, -10, -9, 10, 9, 10, + -9, -10, 9, -10, -9, 9, 9, 9, + -9, -9, 9, -9, -10, 9, 10, 9, + -10, -9, 10, -9, -10, 8, 10, 8, + -10, -8, 10, -8, -10, 7, 10, 7, + -10, -7, 10, -7, -10, 6, 10, 6, + -10, -6, 10, -6, -10, 5, 10, 5, + -10, -5, 10, -5, -10, 4, 10, 4, + -10, -4, 10, -4, -10, 3, 10, 3, + -10, -3, 10, -3, -10, 2, 10, 2, + -10, -2, 10, -2, -10, 1, 10, 1, + -10, -1, 10, -1, -10, 0, 10, 0, 88, - { - { 0, 11 }, { 0, -11 }, { -1, 11 }, { 1, 11 }, - { -1, -11 }, { 1, -11 }, { -2, 11 }, { 2, 11 }, - { -2, -11 }, { 2, -11 }, { -3, 11 }, { 3, 11 }, - { -3, -11 }, { 3, -11 }, { -4, 11 }, { 4, 11 }, - { -4, -11 }, { 4, -11 }, { -5, 11 }, { 5, 11 }, - { -5, -11 }, { 5, -11 }, { -6, 11 }, { 6, 11 }, - { -6, -11 }, { 6, -11 }, { -7, 11 }, { 7, 11 }, - { -7, -11 }, { 7, -11 }, { -8, 11 }, { 8, 11 }, - { -8, -11 }, { 8, -11 }, { -9, 11 }, { 9, 11 }, - { -9, -11 }, { 9, -11 }, { -10, 11 }, { 10, 11 }, - { -10, -11 }, { 10, -11 }, { -10, 10 }, { 10, 10 }, - { -10, -10 }, { 10, -10 }, { -11, 10 }, { 11, 10 }, - { -11, -10 }, { 11, -10 }, { -11, 9 }, { 11, 9 }, - { -11, -9 }, { 11, -9 }, { -11, 8 }, { 11, 8 }, - { -11, -8 }, { 11, -8 }, { -11, 7 }, { 11, 7 }, - { -11, -7 }, { 11, -7 }, { -11, 6 }, { 11, 6 }, - { -11, -6 }, { 11, -6 }, { -11, 5 }, { 11, 5 }, - { -11, -5 }, { 11, -5 }, { -11, 4 }, { 11, 4 }, - { -11, -4 }, { 11, -4 }, { -11, 3 }, { 11, 3 }, - { -11, -3 }, { 11, -3 }, { -11, 2 }, { 11, 2 }, - { -11, -2 }, { 11, -2 }, { -11, 1 }, { 11, 1 }, - { -11, -1 }, { 11, -1 }, { -11, 0 }, { 11, 0 } - }, + 0, 11, 0, -11, -1, 11, 1, 11, + -1, -11, 1, -11, -2, 11, 2, 11, + -2, -11, 2, -11, -3, 11, 3, 11, + -3, -11, 3, -11, -4, 11, 4, 11, + -4, -11, 4, -11, -5, 11, 5, 11, + -5, -11, 5, -11, -6, 11, 6, 11, + -6, -11, 6, -11, -7, 11, 7, 11, + -7, -11, 7, -11, -8, 11, 8, 11, + -8, -11, 8, -11, -9, 11, 9, 11, + -9, -11, 9, -11, -10, 11, 10, 11, + -10, -11, 10, -11, -10, 10, 10, 10, + -10, -10, 10, -10, -11, 10, 11, 10, + -11, -10, 11, -10, -11, 9, 11, 9, + -11, -9, 11, -9, -11, 8, 11, 8, + -11, -8, 11, -8, -11, 7, 11, 7, + -11, -7, 11, -7, -11, 6, 11, 6, + -11, -6, 11, -6, -11, 5, 11, 5, + -11, -5, 11, -5, -11, 4, 11, 4, + -11, -4, 11, -4, -11, 3, 11, 3, + -11, -3, 11, -3, -11, 2, 11, 2, + -11, -2, 11, -2, -11, 1, 11, 1, + -11, -1, 11, -1, -11, 0, 11, 0, 96, - { - { 0, 12 }, { 0, -12 }, { -1, 12 }, { 1, 12 }, - { -1, -12 }, { 1, -12 }, { -2, 12 }, { 2, 12 }, - { -2, -12 }, { 2, -12 }, { -3, 12 }, { 3, 12 }, - { -3, -12 }, { 3, -12 }, { -4, 12 }, { 4, 12 }, - { -4, -12 }, { 4, -12 }, { -5, 12 }, { 5, 12 }, - { -5, -12 }, { 5, -12 }, { -6, 12 }, { 6, 12 }, - { -6, -12 }, { 6, -12 }, { -7, 12 }, { 7, 12 }, - { -7, -12 }, { 7, -12 }, { -8, 12 }, { 8, 12 }, - { -8, -12 }, { 8, -12 }, { -9, 12 }, { 9, 12 }, - { -9, -12 }, { 9, -12 }, { -10, 12 }, { 10, 12 }, - { -10, -12 }, { 10, -12 }, { -11, 12 }, { 11, 12 }, - { -11, -12 }, { 11, -12 }, { -11, 11 }, { 11, 11 }, - { -11, -11 }, { 11, -11 }, { -12, 11 }, { 12, 11 }, - { -12, -11 }, { 12, -11 }, { -12, 10 }, { 12, 10 }, - { -12, -10 }, { 12, -10 }, { -12, 9 }, { 12, 9 }, - { -12, -9 }, { 12, -9 }, { -12, 8 }, { 12, 8 }, - { -12, -8 }, { 12, -8 }, { -12, 7 }, { 12, 7 }, - { -12, -7 }, { 12, -7 }, { -12, 6 }, { 12, 6 }, - { -12, -6 }, { 12, -6 }, { -12, 5 }, { 12, 5 }, - { -12, -5 }, { 12, -5 }, { -12, 4 }, { 12, 4 }, - { -12, -4 }, { 12, -4 }, { -12, 3 }, { 12, 3 }, - { -12, -3 }, { 12, -3 }, { -12, 2 }, { 12, 2 }, - { -12, -2 }, { 12, -2 }, { -12, 1 }, { 12, 1 }, - { -12, -1 }, { 12, -1 }, { -12, 0 }, { 12, 0 } - }, + 0, 12, 0, -12, -1, 12, 1, 12, + -1, -12, 1, -12, -2, 12, 2, 12, + -2, -12, 2, -12, -3, 12, 3, 12, + -3, -12, 3, -12, -4, 12, 4, 12, + -4, -12, 4, -12, -5, 12, 5, 12, + -5, -12, 5, -12, -6, 12, 6, 12, + -6, -12, 6, -12, -7, 12, 7, 12, + -7, -12, 7, -12, -8, 12, 8, 12, + -8, -12, 8, -12, -9, 12, 9, 12, + -9, -12, 9, -12, -10, 12, 10, 12, + -10, -12, 10, -12, -11, 12, 11, 12, + -11, -12, 11, -12, -11, 11, 11, 11, + -11, -11, 11, -11, -12, 11, 12, 11, + -12, -11, 12, -11, -12, 10, 12, 10, + -12, -10, 12, -10, -12, 9, 12, 9, + -12, -9, 12, -9, -12, 8, 12, 8, + -12, -8, 12, -8, -12, 7, 12, 7, + -12, -7, 12, -7, -12, 6, 12, 6, + -12, -6, 12, -6, -12, 5, 12, 5, + -12, -5, 12, -5, -12, 4, 12, 4, + -12, -4, 12, -4, -12, 3, 12, 3, + -12, -3, 12, -3, -12, 2, 12, 2, + -12, -2, 12, -2, -12, 1, 12, 1, + -12, -1, 12, -1, -12, 0, 12, 0, 104, - { - { 0, 13 }, { 0, -13 }, { -1, 13 }, { 1, 13 }, - { -1, -13 }, { 1, -13 }, { -2, 13 }, { 2, 13 }, - { -2, -13 }, { 2, -13 }, { -3, 13 }, { 3, 13 }, - { -3, -13 }, { 3, -13 }, { -4, 13 }, { 4, 13 }, - { -4, -13 }, { 4, -13 }, { -5, 13 }, { 5, 13 }, - { -5, -13 }, { 5, -13 }, { -6, 13 }, { 6, 13 }, - { -6, -13 }, { 6, -13 }, { -7, 13 }, { 7, 13 }, - { -7, -13 }, { 7, -13 }, { -8, 13 }, { 8, 13 }, - { -8, -13 }, { 8, -13 }, { -9, 13 }, { 9, 13 }, - { -9, -13 }, { 9, -13 }, { -10, 13 }, { 10, 13 }, - { -10, -13 }, { 10, -13 }, { -11, 13 }, { 11, 13 }, - { -11, -13 }, { 11, -13 }, { -12, 13 }, { 12, 13 }, - { -12, -13 }, { 12, -13 }, { -12, 12 }, { 12, 12 }, - { -12, -12 }, { 12, -12 }, { -13, 12 }, { 13, 12 }, - { -13, -12 }, { 13, -12 }, { -13, 11 }, { 13, 11 }, - { -13, -11 }, { 13, -11 }, { -13, 10 }, { 13, 10 }, - { -13, -10 }, { 13, -10 }, { -13, 9 }, { 13, 9 }, - { -13, -9 }, { 13, -9 }, { -13, 8 }, { 13, 8 }, - { -13, -8 }, { 13, -8 }, { -13, 7 }, { 13, 7 }, - { -13, -7 }, { 13, -7 }, { -13, 6 }, { 13, 6 }, - { -13, -6 }, { 13, -6 }, { -13, 5 }, { 13, 5 }, - { -13, -5 }, { 13, -5 }, { -13, 4 }, { 13, 4 }, - { -13, -4 }, { 13, -4 }, { -13, 3 }, { 13, 3 }, - { -13, -3 }, { 13, -3 }, { -13, 2 }, { 13, 2 }, - { -13, -2 }, { 13, -2 }, { -13, 1 }, { 13, 1 }, - { -13, -1 }, { 13, -1 }, { -13, 0 }, { 13, 0 } - }, + 0, 13, 0, -13, -1, 13, 1, 13, + -1, -13, 1, -13, -2, 13, 2, 13, + -2, -13, 2, -13, -3, 13, 3, 13, + -3, -13, 3, -13, -4, 13, 4, 13, + -4, -13, 4, -13, -5, 13, 5, 13, + -5, -13, 5, -13, -6, 13, 6, 13, + -6, -13, 6, -13, -7, 13, 7, 13, + -7, -13, 7, -13, -8, 13, 8, 13, + -8, -13, 8, -13, -9, 13, 9, 13, + -9, -13, 9, -13, -10, 13, 10, 13, + -10, -13, 10, -13, -11, 13, 11, 13, + -11, -13, 11, -13, -12, 13, 12, 13, + -12, -13, 12, -13, -12, 12, 12, 12, + -12, -12, 12, -12, -13, 12, 13, 12, + -13, -12, 13, -12, -13, 11, 13, 11, + -13, -11, 13, -11, -13, 10, 13, 10, + -13, -10, 13, -10, -13, 9, 13, 9, + -13, -9, 13, -9, -13, 8, 13, 8, + -13, -8, 13, -8, -13, 7, 13, 7, + -13, -7, 13, -7, -13, 6, 13, 6, + -13, -6, 13, -6, -13, 5, 13, 5, + -13, -5, 13, -5, -13, 4, 13, 4, + -13, -4, 13, -4, -13, 3, 13, 3, + -13, -3, 13, -3, -13, 2, 13, 2, + -13, -2, 13, -2, -13, 1, 13, 1, + -13, -1, 13, -1, -13, 0, 13, 0, 112, - { - { 0, 14 }, { 0, -14 }, { -1, 14 }, { 1, 14 }, - { -1, -14 }, { 1, -14 }, { -2, 14 }, { 2, 14 }, - { -2, -14 }, { 2, -14 }, { -3, 14 }, { 3, 14 }, - { -3, -14 }, { 3, -14 }, { -4, 14 }, { 4, 14 }, - { -4, -14 }, { 4, -14 }, { -5, 14 }, { 5, 14 }, - { -5, -14 }, { 5, -14 }, { -6, 14 }, { 6, 14 }, - { -6, -14 }, { 6, -14 }, { -7, 14 }, { 7, 14 }, - { -7, -14 }, { 7, -14 }, { -8, 14 }, { 8, 14 }, - { -8, -14 }, { 8, -14 }, { -9, 14 }, { 9, 14 }, - { -9, -14 }, { 9, -14 }, { -10, 14 }, { 10, 14 }, - { -10, -14 }, { 10, -14 }, { -11, 14 }, { 11, 14 }, - { -11, -14 }, { 11, -14 }, { -12, 14 }, { 12, 14 }, - { -12, -14 }, { 12, -14 }, { -13, 14 }, { 13, 14 }, - { -13, -14 }, { 13, -14 }, { -13, 13 }, { 13, 13 }, - { -13, -13 }, { 13, -13 }, { -14, 13 }, { 14, 13 }, - { -14, -13 }, { 14, -13 }, { -14, 12 }, { 14, 12 }, - { -14, -12 }, { 14, -12 }, { -14, 11 }, { 14, 11 }, - { -14, -11 }, { 14, -11 }, { -14, 10 }, { 14, 10 }, - { -14, -10 }, { 14, -10 }, { -14, 9 }, { 14, 9 }, - { -14, -9 }, { 14, -9 }, { -14, 8 }, { 14, 8 }, - { -14, -8 }, { 14, -8 }, { -14, 7 }, { 14, 7 }, - { -14, -7 }, { 14, -7 }, { -14, 6 }, { 14, 6 }, - { -14, -6 }, { 14, -6 }, { -14, 5 }, { 14, 5 }, - { -14, -5 }, { 14, -5 }, { -14, 4 }, { 14, 4 }, - { -14, -4 }, { 14, -4 }, { -14, 3 }, { 14, 3 }, - { -14, -3 }, { 14, -3 }, { -14, 2 }, { 14, 2 }, - { -14, -2 }, { 14, -2 }, { -14, 1 }, { 14, 1 }, - { -14, -1 }, { 14, -1 }, { -14, 0 }, { 14, 0 } - }, + 0, 14, 0, -14, -1, 14, 1, 14, + -1, -14, 1, -14, -2, 14, 2, 14, + -2, -14, 2, -14, -3, 14, 3, 14, + -3, -14, 3, -14, -4, 14, 4, 14, + -4, -14, 4, -14, -5, 14, 5, 14, + -5, -14, 5, -14, -6, 14, 6, 14, + -6, -14, 6, -14, -7, 14, 7, 14, + -7, -14, 7, -14, -8, 14, 8, 14, + -8, -14, 8, -14, -9, 14, 9, 14, + -9, -14, 9, -14, -10, 14, 10, 14, + -10, -14, 10, -14, -11, 14, 11, 14, + -11, -14, 11, -14, -12, 14, 12, 14, + -12, -14, 12, -14, -13, 14, 13, 14, + -13, -14, 13, -14, -13, 13, 13, 13, + -13, -13, 13, -13, -14, 13, 14, 13, + -14, -13, 14, -13, -14, 12, 14, 12, + -14, -12, 14, -12, -14, 11, 14, 11, + -14, -11, 14, -11, -14, 10, 14, 10, + -14, -10, 14, -10, -14, 9, 14, 9, + -14, -9, 14, -9, -14, 8, 14, 8, + -14, -8, 14, -8, -14, 7, 14, 7, + -14, -7, 14, -7, -14, 6, 14, 6, + -14, -6, 14, -6, -14, 5, 14, 5, + -14, -5, 14, -5, -14, 4, 14, 4, + -14, -4, 14, -4, -14, 3, 14, 3, + -14, -3, 14, -3, -14, 2, 14, 2, + -14, -2, 14, -2, -14, 1, 14, 1, + -14, -1, 14, -1, -14, 0, 14, 0, 120, - { - { 0, 15 }, { 0, -15 }, { -1, 15 }, { 1, 15 }, - { -1, -15 }, { 1, -15 }, { -2, 15 }, { 2, 15 }, - { -2, -15 }, { 2, -15 }, { -3, 15 }, { 3, 15 }, - { -3, -15 }, { 3, -15 }, { -4, 15 }, { 4, 15 }, - { -4, -15 }, { 4, -15 }, { -5, 15 }, { 5, 15 }, - { -5, -15 }, { 5, -15 }, { -6, 15 }, { 6, 15 }, - { -6, -15 }, { 6, -15 }, { -7, 15 }, { 7, 15 }, - { -7, -15 }, { 7, -15 }, { -8, 15 }, { 8, 15 }, - { -8, -15 }, { 8, -15 }, { -9, 15 }, { 9, 15 }, - { -9, -15 }, { 9, -15 }, { -10, 15 }, { 10, 15 }, - { -10, -15 }, { 10, -15 }, { -11, 15 }, { 11, 15 }, - { -11, -15 }, { 11, -15 }, { -12, 15 }, { 12, 15 }, - { -12, -15 }, { 12, -15 }, { -13, 15 }, { 13, 15 }, - { -13, -15 }, { 13, -15 }, { -14, 15 }, { 14, 15 }, - { -14, -15 }, { 14, -15 }, { -14, 14 }, { 14, 14 }, - { -14, -14 }, { 14, -14 }, { -15, 14 }, { 15, 14 }, - { -15, -14 }, { 15, -14 }, { -15, 13 }, { 15, 13 }, - { -15, -13 }, { 15, -13 }, { -15, 12 }, { 15, 12 }, - { -15, -12 }, { 15, -12 }, { -15, 11 }, { 15, 11 }, - { -15, -11 }, { 15, -11 }, { -15, 10 }, { 15, 10 }, - { -15, -10 }, { 15, -10 }, { -15, 9 }, { 15, 9 }, - { -15, -9 }, { 15, -9 }, { -15, 8 }, { 15, 8 }, - { -15, -8 }, { 15, -8 }, { -15, 7 }, { 15, 7 }, - { -15, -7 }, { 15, -7 }, { -15, 6 }, { 15, 6 }, - { -15, -6 }, { 15, -6 }, { -15, 5 }, { 15, 5 }, - { -15, -5 }, { 15, -5 }, { -15, 4 }, { 15, 4 }, - { -15, -4 }, { 15, -4 }, { -15, 3 }, { 15, 3 }, - { -15, -3 }, { 15, -3 }, { -15, 2 }, { 15, 2 }, - { -15, -2 }, { 15, -2 }, { -15, 1 }, { 15, 1 }, - { -15, -1 }, { 15, -1 }, { -15, 0 }, { 15, 0 } - }, + 0, 15, 0, -15, -1, 15, 1, 15, + -1, -15, 1, -15, -2, 15, 2, 15, + -2, -15, 2, -15, -3, 15, 3, 15, + -3, -15, 3, -15, -4, 15, 4, 15, + -4, -15, 4, -15, -5, 15, 5, 15, + -5, -15, 5, -15, -6, 15, 6, 15, + -6, -15, 6, -15, -7, 15, 7, 15, + -7, -15, 7, -15, -8, 15, 8, 15, + -8, -15, 8, -15, -9, 15, 9, 15, + -9, -15, 9, -15, -10, 15, 10, 15, + -10, -15, 10, -15, -11, 15, 11, 15, + -11, -15, 11, -15, -12, 15, 12, 15, + -12, -15, 12, -15, -13, 15, 13, 15, + -13, -15, 13, -15, -14, 15, 14, 15, + -14, -15, 14, -15, -14, 14, 14, 14, + -14, -14, 14, -14, -15, 14, 15, 14, + -15, -14, 15, -14, -15, 13, 15, 13, + -15, -13, 15, -13, -15, 12, 15, 12, + -15, -12, 15, -12, -15, 11, 15, 11, + -15, -11, 15, -11, -15, 10, 15, 10, + -15, -10, 15, -10, -15, 9, 15, 9, + -15, -9, 15, -9, -15, 8, 15, 8, + -15, -8, 15, -8, -15, 7, 15, 7, + -15, -7, 15, -7, -15, 6, 15, 6, + -15, -6, 15, -6, -15, 5, 15, 5, + -15, -5, 15, -5, -15, 4, 15, 4, + -15, -4, 15, -4, -15, 3, 15, 3, + -15, -3, 15, -3, -15, 2, 15, 2, + -15, -2, 15, -2, -15, 1, 15, 1, + -15, -1, 15, -1, -15, 0, 15, 0, 128, - { - { 0, 16 }, { 0, -16 }, { -1, 16 }, { 1, 16 }, - { -1, -16 }, { 1, -16 }, { -2, 16 }, { 2, 16 }, - { -2, -16 }, { 2, -16 }, { -3, 16 }, { 3, 16 }, - { -3, -16 }, { 3, -16 }, { -4, 16 }, { 4, 16 }, - { -4, -16 }, { 4, -16 }, { -5, 16 }, { 5, 16 }, - { -5, -16 }, { 5, -16 }, { -6, 16 }, { 6, 16 }, - { -6, -16 }, { 6, -16 }, { -7, 16 }, { 7, 16 }, - { -7, -16 }, { 7, -16 }, { -8, 16 }, { 8, 16 }, - { -8, -16 }, { 8, -16 }, { -9, 16 }, { 9, 16 }, - { -9, -16 }, { 9, -16 }, { -10, 16 }, { 10, 16 }, - { -10, -16 }, { 10, -16 }, { -11, 16 }, { 11, 16 }, - { -11, -16 }, { 11, -16 }, { -12, 16 }, { 12, 16 }, - { -12, -16 }, { 12, -16 }, { -13, 16 }, { 13, 16 }, - { -13, -16 }, { 13, -16 }, { -14, 16 }, { 14, 16 }, - { -14, -16 }, { 14, -16 }, { -15, 16 }, { 15, 16 }, - { -15, -16 }, { 15, -16 }, { -15, 15 }, { 15, 15 }, - { -15, -15 }, { 15, -15 }, { -16, 15 }, { 16, 15 }, - { -16, -15 }, { 16, -15 }, { -16, 14 }, { 16, 14 }, - { -16, -14 }, { 16, -14 }, { -16, 13 }, { 16, 13 }, - { -16, -13 }, { 16, -13 }, { -16, 12 }, { 16, 12 }, - { -16, -12 }, { 16, -12 }, { -16, 11 }, { 16, 11 }, - { -16, -11 }, { 16, -11 }, { -16, 10 }, { 16, 10 }, - { -16, -10 }, { 16, -10 }, { -16, 9 }, { 16, 9 }, - { -16, -9 }, { 16, -9 }, { -16, 8 }, { 16, 8 }, - { -16, -8 }, { 16, -8 }, { -16, 7 }, { 16, 7 }, - { -16, -7 }, { 16, -7 }, { -16, 6 }, { 16, 6 }, - { -16, -6 }, { 16, -6 }, { -16, 5 }, { 16, 5 }, - { -16, -5 }, { 16, -5 }, { -16, 4 }, { 16, 4 }, - { -16, -4 }, { 16, -4 }, { -16, 3 }, { 16, 3 }, - { -16, -3 }, { 16, -3 }, { -16, 2 }, { 16, 2 }, - { -16, -2 }, { 16, -2 }, { -16, 1 }, { 16, 1 }, - { -16, -1 }, { 16, -1 }, { -16, 0 }, { 16, 0 } - }, + 0, 16, 0, -16, -1, 16, 1, 16, + -1, -16, 1, -16, -2, 16, 2, 16, + -2, -16, 2, -16, -3, 16, 3, 16, + -3, -16, 3, -16, -4, 16, 4, 16, + -4, -16, 4, -16, -5, 16, 5, 16, + -5, -16, 5, -16, -6, 16, 6, 16, + -6, -16, 6, -16, -7, 16, 7, 16, + -7, -16, 7, -16, -8, 16, 8, 16, + -8, -16, 8, -16, -9, 16, 9, 16, + -9, -16, 9, -16, -10, 16, 10, 16, + -10, -16, 10, -16, -11, 16, 11, 16, + -11, -16, 11, -16, -12, 16, 12, 16, + -12, -16, 12, -16, -13, 16, 13, 16, + -13, -16, 13, -16, -14, 16, 14, 16, + -14, -16, 14, -16, -15, 16, 15, 16, + -15, -16, 15, -16, -15, 15, 15, 15, + -15, -15, 15, -15, -16, 15, 16, 15, + -16, -15, 16, -15, -16, 14, 16, 14, + -16, -14, 16, -14, -16, 13, 16, 13, + -16, -13, 16, -13, -16, 12, 16, 12, + -16, -12, 16, -12, -16, 11, 16, 11, + -16, -11, 16, -11, -16, 10, 16, 10, + -16, -10, 16, -10, -16, 9, 16, 9, + -16, -9, 16, -9, -16, 8, 16, 8, + -16, -8, 16, -8, -16, 7, 16, 7, + -16, -7, 16, -7, -16, 6, 16, 6, + -16, -6, 16, -6, -16, 5, 16, 5, + -16, -5, 16, -5, -16, 4, 16, 4, + -16, -4, 16, -4, -16, 3, 16, 3, + -16, -3, 16, -3, -16, 2, 16, 2, + -16, -2, 16, -2, -16, 1, 16, 1, + -16, -1, 16, -1, -16, 0, 16, 0, 136, - { - { 0, 17 }, { 0, -17 }, { -1, 17 }, { 1, 17 }, - { -1, -17 }, { 1, -17 }, { -2, 17 }, { 2, 17 }, - { -2, -17 }, { 2, -17 }, { -3, 17 }, { 3, 17 }, - { -3, -17 }, { 3, -17 }, { -4, 17 }, { 4, 17 }, - { -4, -17 }, { 4, -17 }, { -5, 17 }, { 5, 17 }, - { -5, -17 }, { 5, -17 }, { -6, 17 }, { 6, 17 }, - { -6, -17 }, { 6, -17 }, { -7, 17 }, { 7, 17 }, - { -7, -17 }, { 7, -17 }, { -8, 17 }, { 8, 17 }, - { -8, -17 }, { 8, -17 }, { -9, 17 }, { 9, 17 }, - { -9, -17 }, { 9, -17 }, { -10, 17 }, { 10, 17 }, - { -10, -17 }, { 10, -17 }, { -11, 17 }, { 11, 17 }, - { -11, -17 }, { 11, -17 }, { -12, 17 }, { 12, 17 }, - { -12, -17 }, { 12, -17 }, { -13, 17 }, { 13, 17 }, - { -13, -17 }, { 13, -17 }, { -14, 17 }, { 14, 17 }, - { -14, -17 }, { 14, -17 }, { -15, 17 }, { 15, 17 }, - { -15, -17 }, { 15, -17 }, { -16, 17 }, { 16, 17 }, - { -16, -17 }, { 16, -17 }, { -16, 16 }, { 16, 16 }, - { -16, -16 }, { 16, -16 }, { -17, 16 }, { 17, 16 }, - { -17, -16 }, { 17, -16 }, { -17, 15 }, { 17, 15 }, - { -17, -15 }, { 17, -15 }, { -17, 14 }, { 17, 14 }, - { -17, -14 }, { 17, -14 }, { -17, 13 }, { 17, 13 }, - { -17, -13 }, { 17, -13 }, { -17, 12 }, { 17, 12 }, - { -17, -12 }, { 17, -12 }, { -17, 11 }, { 17, 11 }, - { -17, -11 }, { 17, -11 }, { -17, 10 }, { 17, 10 }, - { -17, -10 }, { 17, -10 }, { -17, 9 }, { 17, 9 }, - { -17, -9 }, { 17, -9 }, { -17, 8 }, { 17, 8 }, - { -17, -8 }, { 17, -8 }, { -17, 7 }, { 17, 7 }, - { -17, -7 }, { 17, -7 }, { -17, 6 }, { 17, 6 }, - { -17, -6 }, { 17, -6 }, { -17, 5 }, { 17, 5 }, - { -17, -5 }, { 17, -5 }, { -17, 4 }, { 17, 4 }, - { -17, -4 }, { 17, -4 }, { -17, 3 }, { 17, 3 }, - { -17, -3 }, { 17, -3 }, { -17, 2 }, { 17, 2 }, - { -17, -2 }, { 17, -2 }, { -17, 1 }, { 17, 1 }, - { -17, -1 }, { 17, -1 }, { -17, 0 }, { 17, 0 } - }, + 0, 17, 0, -17, -1, 17, 1, 17, + -1, -17, 1, -17, -2, 17, 2, 17, + -2, -17, 2, -17, -3, 17, 3, 17, + -3, -17, 3, -17, -4, 17, 4, 17, + -4, -17, 4, -17, -5, 17, 5, 17, + -5, -17, 5, -17, -6, 17, 6, 17, + -6, -17, 6, -17, -7, 17, 7, 17, + -7, -17, 7, -17, -8, 17, 8, 17, + -8, -17, 8, -17, -9, 17, 9, 17, + -9, -17, 9, -17, -10, 17, 10, 17, + -10, -17, 10, -17, -11, 17, 11, 17, + -11, -17, 11, -17, -12, 17, 12, 17, + -12, -17, 12, -17, -13, 17, 13, 17, + -13, -17, 13, -17, -14, 17, 14, 17, + -14, -17, 14, -17, -15, 17, 15, 17, + -15, -17, 15, -17, -16, 17, 16, 17, + -16, -17, 16, -17, -16, 16, 16, 16, + -16, -16, 16, -16, -17, 16, 17, 16, + -17, -16, 17, -16, -17, 15, 17, 15, + -17, -15, 17, -15, -17, 14, 17, 14, + -17, -14, 17, -14, -17, 13, 17, 13, + -17, -13, 17, -13, -17, 12, 17, 12, + -17, -12, 17, -12, -17, 11, 17, 11, + -17, -11, 17, -11, -17, 10, 17, 10, + -17, -10, 17, -10, -17, 9, 17, 9, + -17, -9, 17, -9, -17, 8, 17, 8, + -17, -8, 17, -8, -17, 7, 17, 7, + -17, -7, 17, -7, -17, 6, 17, 6, + -17, -6, 17, -6, -17, 5, 17, 5, + -17, -5, 17, -5, -17, 4, 17, 4, + -17, -4, 17, -4, -17, 3, 17, 3, + -17, -3, 17, -3, -17, 2, 17, 2, + -17, -2, 17, -2, -17, 1, 17, 1, + -17, -1, 17, -1, -17, 0, 17, 0, 144, - { - { 0, 18 }, { 0, -18 }, { -1, 18 }, { 1, 18 }, - { -1, -18 }, { 1, -18 }, { -2, 18 }, { 2, 18 }, - { -2, -18 }, { 2, -18 }, { -3, 18 }, { 3, 18 }, - { -3, -18 }, { 3, -18 }, { -4, 18 }, { 4, 18 }, - { -4, -18 }, { 4, -18 }, { -5, 18 }, { 5, 18 }, - { -5, -18 }, { 5, -18 }, { -6, 18 }, { 6, 18 }, - { -6, -18 }, { 6, -18 }, { -7, 18 }, { 7, 18 }, - { -7, -18 }, { 7, -18 }, { -8, 18 }, { 8, 18 }, - { -8, -18 }, { 8, -18 }, { -9, 18 }, { 9, 18 }, - { -9, -18 }, { 9, -18 }, { -10, 18 }, { 10, 18 }, - { -10, -18 }, { 10, -18 }, { -11, 18 }, { 11, 18 }, - { -11, -18 }, { 11, -18 }, { -12, 18 }, { 12, 18 }, - { -12, -18 }, { 12, -18 }, { -13, 18 }, { 13, 18 }, - { -13, -18 }, { 13, -18 }, { -14, 18 }, { 14, 18 }, - { -14, -18 }, { 14, -18 }, { -15, 18 }, { 15, 18 }, - { -15, -18 }, { 15, -18 }, { -16, 18 }, { 16, 18 }, - { -16, -18 }, { 16, -18 }, { -17, 18 }, { 17, 18 }, - { -17, -18 }, { 17, -18 }, { -17, 17 }, { 17, 17 }, - { -17, -17 }, { 17, -17 }, { -18, 17 }, { 18, 17 }, - { -18, -17 }, { 18, -17 }, { -18, 16 }, { 18, 16 }, - { -18, -16 }, { 18, -16 }, { -18, 15 }, { 18, 15 }, - { -18, -15 }, { 18, -15 }, { -18, 14 }, { 18, 14 }, - { -18, -14 }, { 18, -14 }, { -18, 13 }, { 18, 13 }, - { -18, -13 }, { 18, -13 }, { -18, 12 }, { 18, 12 }, - { -18, -12 }, { 18, -12 }, { -18, 11 }, { 18, 11 }, - { -18, -11 }, { 18, -11 }, { -18, 10 }, { 18, 10 }, - { -18, -10 }, { 18, -10 }, { -18, 9 }, { 18, 9 }, - { -18, -9 }, { 18, -9 }, { -18, 8 }, { 18, 8 }, - { -18, -8 }, { 18, -8 }, { -18, 7 }, { 18, 7 }, - { -18, -7 }, { 18, -7 }, { -18, 6 }, { 18, 6 }, - { -18, -6 }, { 18, -6 }, { -18, 5 }, { 18, 5 }, - { -18, -5 }, { 18, -5 }, { -18, 4 }, { 18, 4 }, - { -18, -4 }, { 18, -4 }, { -18, 3 }, { 18, 3 }, - { -18, -3 }, { 18, -3 }, { -18, 2 }, { 18, 2 }, - { -18, -2 }, { 18, -2 }, { -18, 1 }, { 18, 1 }, - { -18, -1 }, { 18, -1 }, { -18, 0 }, { 18, 0 } - } + 0, 18, 0, -18, -1, 18, 1, 18, + -1, -18, 1, -18, -2, 18, 2, 18, + -2, -18, 2, -18, -3, 18, 3, 18, + -3, -18, 3, -18, -4, 18, 4, 18, + -4, -18, 4, -18, -5, 18, 5, 18, + -5, -18, 5, -18, -6, 18, 6, 18, + -6, -18, 6, -18, -7, 18, 7, 18, + -7, -18, 7, -18, -8, 18, 8, 18, + -8, -18, 8, -18, -9, 18, 9, 18, + -9, -18, 9, -18, -10, 18, 10, 18, + -10, -18, 10, -18, -11, 18, 11, 18, + -11, -18, 11, -18, -12, 18, 12, 18, + -12, -18, 12, -18, -13, 18, 13, 18, + -13, -18, 13, -18, -14, 18, 14, 18, + -14, -18, 14, -18, -15, 18, 15, 18, + -15, -18, 15, -18, -16, 18, 16, 18, + -16, -18, 16, -18, -17, 18, 17, 18, + -17, -18, 17, -18, -17, 17, 17, 17, + -17, -17, 17, -17, -18, 17, 18, 17, + -18, -17, 18, -17, -18, 16, 18, 16, + -18, -16, 18, -16, -18, 15, 18, 15, + -18, -15, 18, -15, -18, 14, 18, 14, + -18, -14, 18, -14, -18, 13, 18, 13, + -18, -13, 18, -13, -18, 12, 18, 12, + -18, -12, 18, -12, -18, 11, 18, 11, + -18, -11, 18, -11, -18, 10, 18, 10, + -18, -10, 18, -10, -18, 9, 18, 9, + -18, -9, 18, -9, -18, 8, 18, 8, + -18, -8, 18, -8, -18, 7, 18, 7, + -18, -7, 18, -7, -18, 6, 18, 6, + -18, -6, 18, -6, -18, 5, 18, 5, + -18, -5, 18, -5, -18, 4, 18, 4, + -18, -4, 18, -4, -18, 3, 18, 3, + -18, -3, 18, -3, -18, 2, 18, 2, + -18, -2, 18, -2, -18, 1, 18, 1, + -18, -1, 18, -1, -18, 0, 18, 0 }; -void *pCrawlTable[19] = /* figure out what this is for */ +char *pCrawlTable[19] = /* figure out what this is for */ { - &CrawlTable.n_1, &CrawlTable.n_4, &CrawlTable.n_16, - &CrawlTable.n_24, &CrawlTable.n_32, &CrawlTable.n_40, - &CrawlTable.n_48, &CrawlTable.n_56, &CrawlTable.n_64, - &CrawlTable.n_72, &CrawlTable.n_80, &CrawlTable.n_88, - &CrawlTable.n_96, &CrawlTable.n_104, &CrawlTable.n_112, - &CrawlTable.n_120, &CrawlTable.n_128, &CrawlTable.n_136, - &CrawlTable.n_144 + CrawlTable, + CrawlTable+3, + CrawlTable+12, + CrawlTable+45, + CrawlTable+94, + CrawlTable+159, + CrawlTable+240, + CrawlTable+337, + CrawlTable+450, + CrawlTable+579, + CrawlTable+724, + CrawlTable+885, + CrawlTable+1062, + CrawlTable+1255, + CrawlTable+1464, + CrawlTable+1689, + CrawlTable+1930, + CrawlTable+2187, + CrawlTable+2460 }; unsigned char vCrawlTable[23][30] = { diff --git a/Source/lighting.h b/Source/lighting.h index 38a497c69..40e1cf77e 100644 --- a/Source/lighting.h +++ b/Source/lighting.h @@ -46,8 +46,8 @@ void __cdecl lighting_color_cycling(); /* rdata */ -extern CircleCoord CrawlTable; -extern void *pCrawlTable[19]; +extern char CrawlTable[2749]; +extern char *pCrawlTable[19]; extern unsigned char vCrawlTable[23][30]; extern unsigned char byte_49463C[18][18]; extern unsigned char RadiusAdj[23]; diff --git a/Source/missiles.cpp b/Source/missiles.cpp index afdc1b20a..fbb5c5129 100644 --- a/Source/missiles.cpp +++ b/Source/missiles.cpp @@ -843,7 +843,7 @@ int __fastcall FindClosest(int sx, int sy, int rad) while ( 1 ) { v4 = CrawlNum[v3]; - v5 = *(&CrawlTable.n_1 + v4); + v5 = (unsigned char)CrawlTable[v4]; if ( v5 > 0 ) break; LABEL_13: @@ -851,7 +851,7 @@ LABEL_13: if ( v13 >= rad ) return -1; } - v6 = &CrawlTable.delta_1[0].y + v4; + v6 = &CrawlTable[v4 + 2]; while ( 1 ) { v7 = fx + (char)*(v6 - 1); @@ -2678,12 +2678,12 @@ void __fastcall AddTeleport(int mi, int sx, int sy, int dx, int dy, int midir, i do { v10 = CrawlNum[v23]; - v11 = *(&CrawlTable.n_1 + v10); - v22 = *(&CrawlTable.n_1 + v10); + v11 = (unsigned char)CrawlTable[v10]; + v22 = (unsigned char)CrawlTable[v10]; if ( v11 <= 0 ) goto LABEL_13; - v12 = &CrawlTable.delta_1[0].y + v10; - v21 = &CrawlTable.delta_1[0].y + v10; + v12 = &CrawlTable[v10 + 2]; + v21 = &CrawlTable[v10 + 2]; while ( 1 ) { v13 = dx + (char)*(v12 - 1); @@ -3023,11 +3023,11 @@ void __fastcall AddTown(int mi, int sx, int sy, int dx, int dy, int midir, int m do { v12 = CrawlNum[v26]; - v13 = *(&CrawlTable.n_1 + v12); - v27 = *(&CrawlTable.n_1 + v12); + v13 = (unsigned char)CrawlTable[v12]; + v27 = (unsigned char)CrawlTable[v12]; if ( v13 > 0 ) { - v14 = &CrawlTable.delta_1[0].y + v12; + v14 = &CrawlTable[v12 + 2]; v25 = v14; while ( 1 ) { @@ -3299,11 +3299,11 @@ void __fastcall AddGuardian(int mi, int sx, int sy, int dx, int dy, int midir, i do { v14 = CrawlNum[v36]; - v15 = *(&CrawlTable.n_1 + v14); - v35 = *(&CrawlTable.n_1 + v14); + v15 = (unsigned char)CrawlTable[v14]; + v35 = (unsigned char)CrawlTable[v14]; if ( v15 <= 0 ) goto LABEL_18; - v16 = &CrawlTable.delta_1[0].y + v14; + v16 = &CrawlTable[v14 + 2]; v34 = v16; while ( 1 ) { @@ -3657,11 +3657,11 @@ void __fastcall AddStone(int mi, int sx, int sy, int dx, int dy, int midir, int do { v12 = CrawlNum[v26]; - v13 = *(&CrawlTable.n_1 + v12); - v25 = *(&CrawlTable.n_1 + v12); + v13 = (unsigned char)CrawlTable[v12]; + v25 = (unsigned char)CrawlTable[v12]; if ( v13 > 0 ) { - v14 = &CrawlTable.delta_1[0].y + v12; + v14 = &CrawlTable[v12 + 2]; while ( 1 ) { v10 = dx + (char)*(v14 - 1); @@ -4000,11 +4000,11 @@ void __fastcall AddFirewallC(int mi, int sx, int sy, int dx, int dy, int midir, do { v10 = CrawlNum[v22]; - v11 = *(&CrawlTable.n_1 + v10); - v21 = *(&CrawlTable.n_1 + v10); + v11 = (unsigned char)CrawlTable[v10]; + v21 = (unsigned char)CrawlTable[v10]; if ( v11 <= 0 ) goto LABEL_16; - v12 = &CrawlTable.delta_1[0].y + v10; + v12 = &CrawlTable[v10 + 2]; v19 = v12; while ( 1 ) { @@ -4677,11 +4677,11 @@ void __fastcall MI_Golem(int i) do { v5 = CrawlNum[v21]; - v6 = *(&CrawlTable.n_1 + v5); - v20 = *(&CrawlTable.n_1 + v5); + v6 = (unsigned char)CrawlTable[v5]; + v20 = (unsigned char)CrawlTable[v5]; if ( v6 <= 0 ) goto LABEL_16; - v7 = &CrawlTable.delta_1[0].y + v5; + v7 = &CrawlTable[v5 + 2]; v19 = v7; while ( 1 ) { @@ -6059,10 +6059,10 @@ void __fastcall MI_Chain(int i) for ( j = 1; j < v8; ++j ) { v9 = CrawlNum[j]; - v10 = *(&CrawlTable.n_1 + v9); + v10 = (unsigned char)CrawlTable[v9]; if ( v10 > 0 ) { - v11 = &CrawlTable.delta_1[0].y + v9; + v11 = &CrawlTable[v9 + 2]; v18 = v10; v19 = v11; do diff --git a/Source/setmaps.cpp b/Source/setmaps.cpp index 88870c190..1cacd26a0 100644 --- a/Source/setmaps.cpp +++ b/Source/setmaps.cpp @@ -2,41 +2,66 @@ #include "../types.h" -RECT8 QSRects[32] = +unsigned char SkelKingTrans1[8] = { - { { 19u, 47u }, { 26u, 55u } }, - { { 26u, 49u }, { 30u, 53u } }, - { { 33u, 19u }, { 47u, 29u } }, - { { 37u, 29u }, { 43u, 39u } }, - { { 27u, 53u }, { 35u, 61u } }, - { { 27u, 35u }, { 34u, 42u } }, - { { 45u, 35u }, { 53u, 43u } }, - { { 45u, 53u }, { 53u, 61u } }, - { { 31u, 39u }, { 49u, 57u } }, - { { 49u, 45u }, { 58u, 51u } }, - { { 57u, 31u }, { 62u, 37u } }, - { { 63u, 31u }, { 69u, 40u } }, - { { 59u, 41u }, { 73u, 55u } }, - { { 63u, 55u }, { 69u, 65u } }, - { { 73u, 45u }, { 78u, 51u } }, - { { 79u, 43u }, { 89u, 53u } }, - { { 43u, 19u }, { 50u, 26u } }, - { { 51u, 19u }, { 59u, 26u } }, - { { 35u, 27u }, { 42u, 34u } }, - { { 43u, 27u }, { 49u, 34u } }, - { { 50u, 27u }, { 59u, 34u } }, - { { 19u, 31u }, { 34u, 47u } }, - { { 34u, 35u }, { 42u, 42u } }, - { { 43u, 35u }, { 50u, 42u } }, - { { 51u, 35u }, { 62u, 42u } }, - { { 63u, 31u }, { 66u, 46u } }, - { { 67u, 31u }, { 78u, 34u } }, - { { 67u, 35u }, { 78u, 42u } }, - { { 67u, 43u }, { 78u, 46u } }, - { { 35u, 43u }, { 42u, 51u } }, - { { 43u, 43u }, { 49u, 51u } }, - { { 50u, 43u }, { 59u, 51u } } + 19, 47, 26, 55, + 26, 49, 30, 53 }; + +unsigned char SkelKingTrans2[8] = +{ + 33, 19, 47, 29, + 37, 29, 43, 39 +}; + +unsigned char SkelKingTrans3[20] = +{ + 27, 53, 35, 61, + 27, 35, 34, 42, + 45, 35, 53, 43, + 45, 53, 53, 61, + 31, 39, 49, 57 +}; + +unsigned char SkelKingTrans4[28] = +{ + 49, 45, 58, 51, + 57, 31, 62, 37, + 63, 31, 69, 40, + 59, 41, 73, 55, + 63, 55, 69, 65, + 73, 45, 78, 51, + 79, 43, 89, 53 +}; + +unsigned char SkelChamTrans1[20] = +{ + 43, 19, 50, 26, + 51, 19, 59, 26, + 35, 27, 42, 34, + 43, 27, 49, 34, + 50, 27, 59, 34 +}; + +unsigned char SkelChamTrans2[8] = +{ + 19, 31, 34, 47, + 34, 35, 42, 42 +}; + +unsigned char SkelChamTrans3[36] = +{ + 43, 35, 50, 42, + 51, 35, 62, 42, + 63, 31, 66, 46, + 67, 31, 78, 34, + 67, 35, 78, 42, + 67, 43, 78, 46, + 35, 43, 42, 51, + 43, 43, 49, 51, + 50, 43, 59, 51 +}; + char *quest_level_names[] = { &empty_string, @@ -152,10 +177,10 @@ void __cdecl LoadSetMap() LoadPreL1Dungeon("Levels\\L1Data\\SklKng1.DUN", 83, 45); LoadL1Dungeon("Levels\\L1Data\\SklKng2.DUN", 83, 45); LoadPalette("Levels\\L1Data\\L1_2.pal"); - DRLG_AreaTrans(2, (unsigned char *)QSRects); - DRLG_ListTrans(2, (unsigned char *)&QSRects[2]); - DRLG_AreaTrans(5, (unsigned char *)&QSRects[4]); - DRLG_ListTrans(7, (unsigned char *)&QSRects[9]); + DRLG_AreaTrans(2, SkelKingTrans1); + DRLG_ListTrans(2, SkelKingTrans2); + DRLG_AreaTrans(5, SkelKingTrans3); + DRLG_ListTrans(7, SkelKingTrans4); AddL1Objs(0, 0, 112, 112); AddSKingObjs(); InitSKingTriggers(); @@ -164,9 +189,9 @@ void __cdecl LoadSetMap() LoadPreL2Dungeon("Levels\\L2Data\\Bonecha2.DUN", 69, 39); LoadL2Dungeon("Levels\\L2Data\\Bonecha1.DUN", 69, 39); LoadPalette("Levels\\L2Data\\L2_2.pal"); - DRLG_ListTrans(5, (unsigned char *)&QSRects[16]); - DRLG_AreaTrans(2, (unsigned char *)&QSRects[21]); - DRLG_ListTrans(9, (unsigned char *)&QSRects[23]); + DRLG_ListTrans(5, SkelChamTrans1); + DRLG_AreaTrans(2, SkelChamTrans2); + DRLG_ListTrans(9, SkelChamTrans3); AddL2Objs(0, 0, 112, 112); AddSChamObjs(); InitSChambTriggers(); diff --git a/Source/setmaps.h b/Source/setmaps.h index 1de8b87db..4feebe380 100644 --- a/Source/setmaps.h +++ b/Source/setmaps.h @@ -10,7 +10,13 @@ void __fastcall DRLG_SetMapTrans(char *sFileName); void __cdecl LoadSetMap(); /* rdata */ -extern RECT8 QSRects[32]; +extern unsigned char SkelKingTrans1[8]; +extern unsigned char SkelKingTrans2[8]; +extern unsigned char SkelKingTrans3[20]; +extern unsigned char SkelKingTrans4[28]; +extern unsigned char SkelChamTrans1[20]; +extern unsigned char SkelChamTrans2[8]; +extern unsigned char SkelChamTrans3[36]; extern char *quest_level_names[]; #endif /* __SETMAPS_H__ */ diff --git a/Source/sound.cpp b/Source/sound.cpp index 45e0b3060..f82e37d28 100644 --- a/Source/sound.cpp +++ b/Source/sound.cpp @@ -29,7 +29,13 @@ char *sgszMusicTracks[6] = "Music\\DLvlD.wav", "Music\\Dintro.wav" }; -RECT8 QSRect[2] = { { { 15, -16 }, { 15, -16 } }, { { 30, -31 }, { 30, -31 } } }; /* psx version? */ +char unk_volume[4][2] = +{ + { 15, -16 }, + { 15, -16 }, + { 30, -31 }, + { 30, -31 } +}; struct sound_cpp_init { diff --git a/Source/sound.h b/Source/sound.h index 7d4320535..64b28b3a2 100644 --- a/Source/sound.h +++ b/Source/sound.h @@ -45,6 +45,6 @@ extern char gbSoundOn; // weak extern char gbDupSounds; // weak extern int sgnMusicTrack; extern char *sgszMusicTracks[6]; -extern RECT8 QSRect[2]; /* psx version? */ +extern char unk_volume[4][2]; #endif /* __SOUND_H__ */ diff --git a/structs.h b/structs.h index 884086934..2fae1a9e5 100644 --- a/structs.h +++ b/structs.h @@ -1656,75 +1656,3 @@ struct ChatCmd struct ChatCmd *next; ServerCommand *extern_msgs[2]; }; - -////////////////////////////////////////////////// -// garbage (should be removed) -////////////////////////////////////////////////// - -struct RECT32 -{ - int x; - int y; - int w; - int h; -}; - -struct POINT32 -{ - int x; - int y; -}; - -struct Coord -{ - char x; - char y; -}; - -struct RECT8 -{ - Coord x; - Coord y; -}; - -struct CircleCoord -{ - unsigned char n_1; - Coord delta_1[1]; - unsigned char n_4; - Coord delta_4[4]; - unsigned char n_16; - Coord delta_16[16]; - unsigned char n_24; - Coord delta_24[24]; - unsigned char n_32; - Coord delta_32[32]; - unsigned char n_40; - Coord delta_40[40]; - unsigned char n_48; - Coord delta_48[48]; - unsigned char n_56; - Coord delta_56[56]; - unsigned char n_64; - Coord delta_64[64]; - unsigned char n_72; - Coord delta_72[72]; - unsigned char n_80; - Coord delta_80[80]; - unsigned char n_88; - Coord delta_88[88]; - unsigned char n_96; - Coord delta_96[96]; - unsigned char n_104; - Coord delta_104[104]; - unsigned char n_112; - Coord delta_112[112]; - unsigned char n_120; - Coord delta_120[120]; - unsigned char n_128; - Coord delta_128[128]; - unsigned char n_136; - Coord delta_136[136]; - unsigned char n_144; - Coord delta_144[144]; -};