From f77429abcf0b371538bc4778008fe3871531bd77 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Mon, 26 Sep 2016 00:05:49 +0200 Subject: CRYO: Fix some compilation warnings, change some variables to boolean --- engines/cryo/staticdata.cpp | 78 ++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'engines/cryo/staticdata.cpp') diff --git a/engines/cryo/staticdata.cpp b/engines/cryo/staticdata.cpp index 7b700d720e..00856ed6f0 100644 --- a/engines/cryo/staticdata.cpp +++ b/engines/cryo/staticdata.cpp @@ -112,7 +112,7 @@ goto_t gotos[] = { { 0, 7, 106, 2, 101 }, { 0, 10, 79, 3, 102 }, { 0, 12, 0, 3, 0 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 1, 3, 58, 2, 104 }, { 1, 4, 100, 4, 104 }, { 1, 5, 107, 6, 104 }, @@ -121,15 +121,15 @@ goto_t gotos[] = { { 1, 8, 169, 6, 104 }, { 1, 10, 111, 2, 104 }, { 1, 11, 164, 4, 104 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 1, 3, 161, 3, 102 }, { 1, 4, 163, 6, 102 }, { 1, 5, 157, 9, 102 }, { 1, 9, 160, 9, 102 }, { 1, 10, 79, 3, 102 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 1, 3, 0, 3, 153 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 3, 1, 154, 2, 103 }, { 3, 4, 100, 2, 103 }, { 3, 5, 107, 4, 103 }, @@ -138,14 +138,14 @@ goto_t gotos[] = { { 3, 8, 169, 6, 103 }, { 3, 10, 111, 4, 103 }, { 3, 11, 164, 6, 103 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 3, 1, 162, 3, 22 }, { 3, 4, 163, 6, 22 }, { 3, 5, 157, 9, 22 }, { 3, 9, 160, 9, 22 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 3, 1, 0, 3, 166 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 4, 1, 154, 4, 51 }, { 4, 3, 58, 2, 51 }, { 4, 5, 107, 2, 51 }, @@ -154,12 +154,12 @@ goto_t gotos[] = { { 4, 8, 169, 8, 51 }, { 4, 10, 111, 6, 51 }, { 4, 11, 164, 8, 51 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 4, 1, 162, 3, 109 }, { 4, 3, 161, 6, 109 }, { 4, 5, 157, 9, 109 }, { 4, 9, 160, 9, 109 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 5, 1, 154, 6, 33 }, { 5, 3, 58, 4, 33 }, { 5, 4, 100, 2, 33 }, @@ -168,17 +168,17 @@ goto_t gotos[] = { { 5, 8, 169, 8, 33 }, { 5, 10, 111, 8, 33 }, { 5, 11, 164, 8, 33 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 5, 1, 162, 3, 99 }, { 5, 3, 161, 6, 99 }, { 5, 4, 163, 9, 99 }, { 5, 9, 160, 9, 99 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 9, 1, 162, 3, 167 }, { 9, 3, 161, 6, 167 }, { 9, 4, 163, 9, 167 }, { 9, 5, 157, 9, 167 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 6, 1, 154, 8, 105 }, { 6, 3, 58, 6, 105 }, { 6, 4, 100, 4, 105 }, @@ -187,7 +187,7 @@ goto_t gotos[] = { { 6, 8, 169, 10, 105 }, { 6, 10, 111, 6, 105 }, { 6, 11, 164, 8, 105 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 7, 1, 154, 4, 158 }, { 7, 3, 58, 6, 158 }, { 7, 4, 100, 6, 158 }, @@ -196,7 +196,7 @@ goto_t gotos[] = { { 7, 8, 169, 8, 158 }, { 7, 10, 111, 4, 158 }, { 7, 11, 164, 6, 158 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 8, 1, 154, 2, 159 }, { 8, 3, 58, 4, 159 }, { 8, 4, 100, 6, 159 }, @@ -205,7 +205,7 @@ goto_t gotos[] = { { 8, 7, 165, 8, 159 }, { 8, 10, 111, 6, 159 }, { 8, 11, 164, 4, 159 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 10, 1, 154, 2, 77 }, { 10, 3, 58, 4, 77 }, { 10, 4, 100, 6, 77 }, @@ -214,7 +214,7 @@ goto_t gotos[] = { { 10, 7, 165, 4, 77 }, { 10, 8, 169, 6, 77 }, { 10, 11, 164, 4, 77 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 11, 1, 154, 2, 80 }, { 11, 3, 58, 4, 80 }, { 11, 4, 100, 6, 80 }, @@ -223,7 +223,7 @@ goto_t gotos[] = { { 11, 7, 165, 6, 80 }, { 11, 8, 169, 2, 80 }, { 11, 10, 111, 4, 80 }, - { -1, -1, -1, -1, -1 }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 12, 1, 154, 8, 56 }, { 12, 3, 58, 4, 56 }, { 12, 4, 100, 4, 56 }, @@ -233,7 +233,7 @@ goto_t gotos[] = { { 12, 8, 169, 4, 56 }, { 12, 10, 111, 10, 56 }, { 12, 11, 164, 6, 56 }, - { -1, -1, -1, -1, -1 } + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, }; #define SUB_LINE(start, end) \ @@ -424,7 +424,7 @@ perso_t kPersons[] = { { 0x618, 243, PersonMask::pmEnemy , PersonId::pidEnemy , PersonFlags::pf80 | PersonFlags::pftTyrann , 0, 0, 0, 0, 0, 0, 0, 0 }, { 0x71B, 243, PersonMask::pmEnemy , PersonId::pidEnemy , PersonFlags::pf80 | PersonFlags::pftTyrann , 0, 0, 0, 0, 0, 0, 0, 0 }, { 0x81B, 243, PersonMask::pmEnemy , PersonId::pidEnemy , PersonFlags::pf80 | PersonFlags::pftTyrann , 0, 0, 0, 0, 0, 0, 0, 0 }, - { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0xFF, 0xFF}, { 0x628, 237, PersonMask::pmEve , PersonId::pidEve , 0, 80, 9, 0, 0, 8, 35, 0, 0 }, { 0x628, 237, PersonMask::pmEve , PersonId::pidEve , 0, 78, 10, 0, 0, 7, 35, 0, 0 } }; @@ -532,26 +532,26 @@ prect_t perso_rects[] = { //TODO: just an array of int16s? }; byte tab_persxx[][5] = { //TODO: struc? - { 8, 15, 23, 25, -1}, - { 0, 9, -1 }, - { 0, 9, -1 }, - { 0, 9, -1 }, - { 0, 13, -1 }, - { 16, 21, -1 }, - { 11, 20, -1 }, - { 0, 12, -1 }, - { 0, 9, -1 }, - { 0, 9, -1 }, - { 5, 13, -1 }, - { -1 }, - { 0, 8, -1 }, - { -1 }, - { 0, 7, -1 }, - { 0, 8, -1 }, - { 8, 12, -1 }, - { 0, 5, -1 }, - { 0, 4, -1 }, - { -1 } + { 8, 15, 23, 25, 0xFF}, + { 0, 9, 0xFF }, + { 0, 9, 0xFF }, + { 0, 9, 0xFF }, + { 0, 13, 0xFF }, + { 16, 21, 0xFF }, + { 11, 20, 0xFF }, + { 0, 12, 0xFF }, + { 0, 9, 0xFF }, + { 0, 9, 0xFF }, + { 5, 13, 0xFF }, + { 0xFF }, + { 0, 8, 0xFF }, + { 0xFF }, + { 0, 7, 0xFF }, + { 0, 8, 0xFF }, + { 8, 12, 0xFF }, + { 0, 5, 0xFF }, + { 0, 4, 0xFF }, + { 0xFF } }; area_t kAreasTable[] = { -- cgit v1.2.3