From 52f2b79b44855a879981a945f787f1e3daf775c9 Mon Sep 17 00:00:00 2001 From: jummy Date: Thu, 12 Sep 2024 12:48:11 -0500 Subject: [PATCH] gwa gwa --- src/decblupi.cpp | 10 +- src/decmove.cpp | 22 +- src/def.h | 46 +-- src/event.cpp | 923 +++++++++++++++++++++++++++++------------------ src/event.h | 6 +- src/misc.cpp | 15 - src/misc.h | 2 - src/pixmap.cpp | 10 +- src/sound.cpp | 4 +- 9 files changed, 614 insertions(+), 424 deletions(-) diff --git a/src/decblupi.cpp b/src/decblupi.cpp index 4ba5780..9939f2c 100644 --- a/src/decblupi.cpp +++ b/src/decblupi.cpp @@ -310,7 +310,7 @@ void CDecor::BlupiStep() int m_blupiSpeedX = 0; // int m_blupiSpeedY = 0; // lol. lmao even POINT tinyPoint; - POINT tinyPoint2; + POINT tinyPoint2 = m_blupiPos; // = m_blupiPos ? BlupiAdjust(); //m_blupiLastPos = m_blupiPos; POINT tinyPoint3 = m_blupiPos; @@ -386,7 +386,7 @@ void CDecor::BlupiStep() rect.bottom = tinyPoint3.y + 20; BOOL flag5 = DecorDetect(rect); int detectIcon = m_detectIcon; - if (!m_blupiAir && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && flag4 && m_blupiFocus) + if (!m_blupiAir && !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiJeep && !m_blupiTank && !m_blupiNage && !m_blupiSurf && !m_blupiSuspend && flag5 && m_blupiFocus) { if (m_blupiFocus) { @@ -2220,7 +2220,7 @@ void CDecor::BlupiStep() PlaySound(35, tinyPoint3); } } - if ( !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiTank && !m_blupiJeep && !m_blupiSkate && !flag4 && m_blupiTransport == -1 && m_blupiFocus) + if ( !m_blupiHelico && !m_blupiOver && !m_blupiBalloon && !m_blupiEcrase && !m_blupiTank && !m_blupiJeep && !m_blupiSkate /*&& !flag4*/ && m_blupiTransport == -1 && m_blupiFocus) { if (m_blupiDynamite > 0) { @@ -4066,7 +4066,7 @@ BOOL CDecor::DecorDetect(RECT rect, BOOL bCaisse) src.top = i * 16; src.bottom = src.top + 16; RECT tinyRect; - if (IntersectRect(tinyRect, src, rect)) + if (IntersectRect(&tinyRect, &src, &rect)) { m_detectIcon = icon; return TRUE; @@ -4089,7 +4089,7 @@ BOOL CDecor::DecorDetect(RECT rect, BOOL bCaisse) src.top = m_moveObject[num8].posCurrent.y; src.bottom = m_moveObject[num8].posCurrent.y + 64; RECT tinyRect; - if (IntersectRect(tinyRect, src, rect)) + if (IntersectRect(&tinyRect, &src, &rect)) { m_detectIcon = m_moveObject[num8].icon; return TRUE; diff --git a/src/decmove.cpp b/src/decmove.cpp index 3e6dea4..5ba4351 100644 --- a/src/decmove.cpp +++ b/src/decmove.cpp @@ -493,7 +493,7 @@ void CDecor::MoveObjectStepLine(int i) tinyRect.top = m_moveObject[i].posCurrent.y; tinyRect.bottom = m_moveObject[i].posCurrent.y + 16; RECT tinyRect2; - flag = IntersectRect(tinyRect2, tinyRect, src); + flag = IntersectRect(&tinyRect2, &tinyRect, &src); tinyPoint = m_moveObject[i].posCurrent; } POINT posCurrent; @@ -1553,7 +1553,7 @@ void CDecor::DynamiteStart(int i, int dx, int dy) src2.top = m_moveObject[i].posCurrent.y; src2.bottom = m_moveObject[i].posCurrent.y + 20; RECT tinyRect; - if (IntersectRect(tinyRect, src2, src)) + if (IntersectRect(&tinyRect, &src2, &src)) { if (m_moveObject[i].type == 12) { @@ -1617,7 +1617,7 @@ int CDecor::AscenseurDetect(RECT rect, POINT oldpos, POINT newpos) if (num < 30) { RECT tinyRect; - if (IntersectRect(tinyRect, src, rect)) + if (IntersectRect(&tinyRect, &src, &rect)) { return i; } @@ -1630,7 +1630,7 @@ int CDecor::AscenseurDetect(RECT rect, POINT oldpos, POINT newpos) for (int j = 0; j <= num / 30; j++) { RECT tinyRect; - if (IntersectRect(tinyRect, src, src2)) + if (IntersectRect(&tinyRect, &src, &src2)) { return i; } @@ -1772,7 +1772,7 @@ void CDecor::SearchLinkCaisse(int rank, BOOL bPop) src2.right = src2.left + 64 + 1; src2.bottom = src2.top + 64 + 1; RECT tinyRect; - if (IntersectRect(tinyRect, src2, src) && AddLinkCaisse(num2)) + if (IntersectRect(&tinyRect, &src2, &src) && AddLinkCaisse(num2)) { flag = TRUE; } @@ -1895,7 +1895,7 @@ int CDecor::MockeryDetect(POINT pos) src2.top = m_moveObject[i].posCurrent.y + 36; src2.bottom = m_moveObject[i].posCurrent.y + 60; RECT tinyRect; - if (IntersectRect(tinyRect, src2, src)) + if (IntersectRect(&tinyRect, &src2, &src)) { if (m_moveObject[i].type == 54) { @@ -1948,7 +1948,7 @@ BOOL CDecor::BlupiElectro(POINT pos) src2.top = m_blupiPos.y + 11 - 40; src2.bottom = m_blupiPos.y + 60 - 2 + 40; RECT tinyRect; - return IntersectRect(tinyRect, src, src2); + return IntersectRect(&tinyRect, &src, &src2); } void CDecor::MoveObjectFollow(POINT pos) @@ -1970,7 +1970,7 @@ void CDecor::MoveObjectFollow(POINT pos) src2.top = m_moveObject[i].posCurrent.y - 100; src2.bottom = m_moveObject[i].posCurrent.y + 60 + 100; RECT tinyRect; - if (IntersectRect(tinyRect, src2, src)) + if (IntersectRect(&tinyRect, &src2, &src)) { m_moveObject[i].type = 97; PlaySound(92, m_moveObject[i].posCurrent); @@ -2031,7 +2031,7 @@ int CDecor::MoveAscenseurDetect(POINT pos, int height) src2.top = m_moveObject[i].posCurrent.y; src2.bottom = m_moveObject[i].posCurrent.y + 16; RECT tinyRect; - if (IntersectRect(tinyRect, src2, src)) + if (IntersectRect(&tinyRect, &src2, &src)) { return i; } @@ -2057,7 +2057,7 @@ int CDecor::MoveChargeDetect(POINT pos) src2.top = m_moveObject[i].posCurrent.y + 36; src2.bottom = m_moveObject[i].posCurrent.y + 60; RECT tinyRect; - if (IntersectRect(tinyRect, src2, src)) + if (IntersectRect(&tinyRect, &src2, &src)) { return i; } @@ -2083,7 +2083,7 @@ int CDecor::MovePersoDetect(POINT pos) src2.top = m_moveObject[i].posCurrent.y + 36; src2.bottom = m_moveObject[i].posCurrent.y + 60; RECT tinyRect; - if (IntersectRect(tinyRect, src2, src)) + if (IntersectRect(&tinyRect, &src2, &src)) { return i; } diff --git a/src/def.h b/src/def.h index 925ba2d..10eb3d7 100644 --- a/src/def.h +++ b/src/def.h @@ -481,7 +481,7 @@ enum { WM_BUTTON38, WM_BUTTON39, - WM_DIMS1, + WM_DIMS1 = WM_USER + 241, WM_DIMS2, WM_DIMS3, WM_DIMS4, @@ -522,58 +522,58 @@ enum { WM_PHASE_PLAYMOVIE, WM_PHASE_WINMOVIE, WM_PHASE_1539, - WM_PHASE_DOPLAY, + WM_PHASE_DOPLAY, // do singleplayer WM_PHASE_LASTWIN, // PB vestige WM_PHASE_SETUPp, WM_PHASE_REGION, WM_PHASE_INSERT, - WM_PHASE_1544, + WM_PHASE_QUITPLAYTEST, WM_PHASE_GAMER, WM_PHASE_WINDESIGN, WM_PHASE_LOSTDESIGN, WM_PHASE_WINMOVIEDESIGN, - WM_PHASE_WINMULTI, WM_PHASE_LOSTMULTI, + WM_PHASE_WINMULTI, WM_PHASE_WINMOVIEMULTI, WM_PHASE_TESTCD, WM_PHASE_MANUEL, WM_PHASE_PRIVATE, - WM_PHASE_UNDO, + WM_PHASE_UNDO, // PB vestige WM_PHASE_BYE, WM_PHASE_DEMO, WM_PHASE_NAMEDESIGN, - WM_PHASE_WRITEDESIGN, - WM_PHASE_READDESIGN, + WM_PHASE_WRITEDESIGN, // export design to c:\user + WM_PHASE_READDESIGN, // import design from c:\user WM_PHASE_CLEARDESIGN, WM_PHASE_DONAMEGAMER, WM_PHASE_DOCLEARGAMER, WM_PHASE_DONAMEDESIGN, - WM_PHASE_1565, - WM_PHASE_1566, + WM_PHASE_DOWRITEDESIGN, + WM_PHASE_DOREADDESIGN, WM_PHASE_DOCLEARDESIGN, WM_PHASE_SERVICE, - WM_PHASE_DPLAY_DO_SERVICE, - WM_PHASE_DPLAY_CANCEL_SERVICE, + WM_PHASE_DP_DOSERVICE, + WM_PHASE_DP_CANCELSERVICE, WM_PHASE_SESSION, - WM_PHASE_1572, - WM_PHASE_DPLAY_CREATE_LOBBY, - WM_PHASE_DPLAY_REFRESH, - WM_PHASE_DPLAY_CANCEL_SESSION, + WM_PHASE_DP_JOIN, + WM_PHASE_DP_CREATELOBBY, + WM_PHASE_DP_REFRESH, + WM_PHASE_DP_CANCELSESSION, WM_PHASE_MULTI, - WM_PHASE_DPLAY_START_GAME_2, - WM_PHASE_DPLAY_CANCEL_MULTI, + WM_PHASE_DP_STARTMULTI, + WM_PHASE_DP_CANCELMULTI, WM_PHASE_CREATE, - WM_PHASE_DPLAY_CREATE, - WM_PHASE_DPLAY_CANCEL_CREATE, - WM_PHASE_STOP, + WM_PHASE_DP_DOCREATE, + WM_PHASE_DP_CANCELCREATE, + WM_PHASE_STOP, // escape key pause menu during gameplay WM_PHASE_HELP, WM_PHASE_GWRITE, WM_PHASE_GREADp, WM_PHASE_GREAD, - WM_PHASE_DOQUIT, + WM_PHASE_QUITPLAY, WM_PHASE_1588, - WM_PHASE_INTRO1, // PB vestige - WM_PHASE_INTRO2, // PB vestige + WM_PHASE_INTRO1, + WM_PHASE_INTRO2, WM_PREV = WM_USER + 600, WM_NEXT, diff --git a/src/event.cpp b/src/event.cpp index 975ffe1..618b98f 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -91,38 +91,49 @@ static char cheat_code[25][60] = ///////////////////////////////////////////////////////////////////////////// - static Phase table[] = { { - 1552, + WM_PHASE_TESTCD, "init.blp", FALSE, FALSE, - { - { 0 } - }, + { 0 } }, { - 1524, + WM_PHASE_INTRO1, + "intro1.blp", + FALSE, + FALSE, + { 0 } + }, + { + WM_PHASE_INTRO2, + "intro2.blp", + FALSE, + FALSE, + { 0 } + }, + { + WM_PHASE_INIT, "init.blp", FALSE, FALSE, { { - 1545, + WM_PHASE_GAMER, 0,{ 1, 48 }, 86, 410, { 1, 109 } }, { - 1557, + WM_PHASE_DEMO, 0,{ 1, 84 }, 128, 410, { 1, 212 } }, { - 1556, + WM_PHASE_BYE, 0,{ 1, 6 }, 540, 410, { 1, 106 } @@ -131,103 +142,103 @@ static Phase table[] = }, }, { - 1545, + WM_PHASE_GAMER, "gamer.blp", FALSE, FALSE, { { - 1225, + WM_BUTTON1, 0,{ 0 }, 60, 58, { 1, 117 } }, { - 1226, + WM_BUTTON2, 0,{ 0 }, 60, 98, { 1, 117 } }, { - 1227, + WM_BUTTON3, 0,{ 0 }, 60, 138, { 1, 117 } }, { - 1228, + WM_BUTTON4, 0,{ 0 }, 60, 178, { 1, 117 } }, { - 1229, + WM_BUTTON5, 0,{ 0 }, 60, 218, { 1, 117 } }, { - 1230, + WM_BUTTON6, 0,{ 0 }, 60, 258, { 1, 117 } }, { - 1231, + WM_BUTTON7, 0,{ 0 }, 60, 298, { 1, 117 } }, { - 1232, + WM_BUTTON8, 0,{ 0 }, 60, 338, { 1, 117 } }, { - 1527, + WM_PHASE_NAMEGAMER, 0,{ 1, 46 }, 546, 178, { 1, 118 } }, { - 1528, + WM_PHASE_CLEARGAMER, 0,{ 1, 36 }, 546, 220, { 1, 127 } }, { - 1539, + WM_PHASE_DOPLAY, 0,{ 1, 48 }, 65, 414, { 1, 195 } }, { - 1568, + WM_PHASE_SERVICE, 0,{ 1, 83 }, 107, 414, { 1, 196 } }, { - 1554, + WM_PHASE_PRIVATE, 0,{ 1, 49 }, 149, 414, { 1, 188 } }, { - 1586, + WM_PHASE_GREAD, 0,{ 1, 52 }, 191, 414, { 1, 264 } }, { - 1534, + WM_PHASE_SETUP, 0,{ 1, 47 }, 330, 414, { 1, 128 } }, { - 1524, + WM_PHASE_INIT, 0,{ 1, 40 }, 540, 414, { 1, 111 } @@ -236,19 +247,19 @@ static Phase table[] = }, }, { - 1527, + WM_PHASE_NAMEGAMER, "name.blp", FALSE, FALSE, { { - 1562, + WM_PHASE_DONAMEGAMER, 0,{ 1, 18 }, 222, 326, { 1, 174 } }, { - 1545, + WM_PHASE_GAMER, 0,{ 1, 36 }, 378, 326, { 1, 175 } @@ -257,19 +268,19 @@ static Phase table[] = }, }, { - 1528, + WM_PHASE_CLEARGAMER, "clear.blp", FALSE, FALSE, { { - 1563, + WM_PHASE_DOCLEARGAMER, 0,{ 1, 18 }, 222, 326, { 1, 176 } }, { - 1545, + WM_PHASE_GAMER, 0,{ 1, 36 }, 378, 326, { 1, 177 } @@ -278,67 +289,67 @@ static Phase table[] = }, }, { - 1568, + WM_PHASE_SERVICE, "service.blp", FALSE, FALSE, { { - 1225, + WM_BUTTON1, 0,{ 1, 51 }, 140, 110, { 0 } }, { - 1226, + WM_BUTTON2, 0,{ 1, 51 }, 140, 150, { 0 } }, { - 1227, + WM_BUTTON3, 0,{ 1, 51 }, 140, 190, { 0 } }, { - 1228, + WM_BUTTON4, 0,{ 1, 51 }, 140, 230, { 0 } }, { - 1229, + WM_BUTTON5, 0,{ 1, 51 }, 140, 270, { 0 } }, { - 1230, + WM_BUTTON6, 0,{ 1, 51 }, 140, 310, { 0 } }, { - 1234, + WM_BUTTON10, 0,{ 1, 72 }, 466, 110, { 1, 242 } }, { - 1235, + WM_BUTTON11, 0,{ 1, 73 }, 466, 310, { 1, 241 } }, { - 1569, + WM_PHASE_DP_DOSERVICE, 0,{ 1, 18 }, 222, 389, { 1, 174 } }, { - 1570, + WM_PHASE_DP_CANCELSERVICE, 0,{ 1, 36 }, 380, 389, { 1, 175 } @@ -347,79 +358,79 @@ static Phase table[] = }, }, { - 1571, + WM_PHASE_SESSION, "session.blp", FALSE, FALSE, { { - 1225, + WM_BUTTON1, 0,{ 1, 51 }, 120, 110, { 0 } }, { - 1226, + WM_BUTTON2, 0,{ 1, 51 }, 120, 150, { 0 } }, { - 1227, + WM_BUTTON3, 0,{ 1, 51 }, 120, 190, { 0 } }, { - 1228, + WM_BUTTON4, 0,{ 1, 51 }, 120, 230, { 0 } }, { - 1229, + WM_BUTTON5, 0,{ 1, 51 }, 120, 270, { 0 } }, { - 1230, + WM_BUTTON6, 0,{ 1, 51 }, 120, 310, { 0 } }, { - 1234, + WM_BUTTON10, 0,{ 1, 72 }, 490, 110, { 1, 246 } }, { - 1235, + WM_BUTTON11, 0,{ 1, 73 }, 490, 310, { 1, 245 } }, { - 1572, + WM_PHASE_DP_JOIN, 0,{ 1, 45 }, 120, 389, { 1, 247 } }, { - 1573, + WM_PHASE_DP_CREATELOBBY, 0,{ 1, 43 }, 162, 389, { 1, 248 } }, { - 1574, + WM_PHASE_DP_REFRESH, 0,{ 1, 72 }, 260, 389, { 1, 249 } }, { - 1575, + WM_PHASE_DP_CANCELSESSION, 0,{ 1, 36 }, 485, 389, { 1, 175 } @@ -428,19 +439,19 @@ static Phase table[] = }, }, { - 1579, + WM_PHASE_CREATE, "create.blp", FALSE, FALSE, { { - 1580, + WM_PHASE_DP_DOCREATE, 0,{ 1, 18 }, 222, 326, { 1, 174 } }, { - 1581, + WM_PHASE_DP_CANCELCREATE, 0,{ 1, 36 }, 378, 326, { 1, 175 } @@ -449,85 +460,85 @@ static Phase table[] = }, }, { - 1576, + WM_PHASE_MULTI, "multi.blp", FALSE, FALSE, { { - 1225, + WM_BUTTON1, 0,{ 0 }, 80, 98, { 1, 207 } }, { - 1226, + WM_BUTTON2, 0,{ 0 }, 80, 140, { 1, 207 } }, { - 1227, + WM_BUTTON3, 0,{ 0 }, 80, 182, { 1, 207 } }, { - 1228, + WM_BUTTON4, 0,{ 0 }, 80, 224, { 1, 207 } }, { - 1235, + WM_BUTTON11, 0,{ 1, 36 }, 288, 98, { 1, 208 } }, { - 1236, + WM_BUTTON12, 0,{ 1, 36 }, 288, 140, { 1, 208 } }, { - 1237, + WM_BUTTON13, 0,{ 1, 36 }, 288, 182, { 1, 208 } }, { - 1238, + WM_BUTTON14, 0,{ 1, 36 }, 288, 224, { 1, 208 } }, { - 1244, + WM_BUTTON20, 0,{ 1, 94 }, 404, 388, { 1, 262 } }, { - 1624, + WM_PREV, 0,{ 1, 50 }, 438, 249, { 1, 107 } }, { - 1625, + WM_NEXT, 0,{ 1, 51 }, 480, 249, { 1, 108 } }, { - 1577, + WM_PHASE_DP_STARTMULTI, 0,{ 1, 48 }, 508, 389, { 1, 252 } }, { - 1578, + WM_PHASE_DP_CANCELMULTI, 0,{ 1, 36 }, 508, 330, { 1, 175 } @@ -536,73 +547,73 @@ static Phase table[] = }, }, { - 1529, + WM_PHASE_INFO, "info.blp", FALSE, TRUE, { { - 1559, + WM_PHASE_WRITEDESIGN, 0,{ 1, 53 }, 188, 306, { 1, 113 } }, { - 1560, + WM_PHASE_READDESIGN, 0,{ 1, 52 }, 232, 306, { 1, 112 } }, { - 1561, + WM_PHASE_CLEARDESIGN, 0,{ 1, 36 }, 276, 306, { 1, 183 } }, { - 1624, + WM_PREV, 0,{ 1, 50 }, 188, 398, { 1, 107 } }, { - 1536, + WM_PHASE_PLAYMOVIE, 0,{ 1, 48 }, 232, 398, { 1, 109 } }, { - 1625, + WM_NEXT, 0,{ 1, 51 }, 276, 398, { 1, 108 } }, { - 1526, + WM_PHASE_BUILD, 0,{ 1, 49 }, 422, 98, { 1, 110 } }, { - 1542, + WM_PHASE_REGION, 0,{ 1, 22 }, 422, 195, { 1, 144 } }, { - 1558, + WM_PHASE_NAMEDESIGN, 0,{ 1, 46 }, 422, 239, { 1, 185 } }, { - 1535, + WM_PHASE_MUSIC, 0,{ 1, 44 }, 422, 283, { 1, 129 } }, { - 1545, + WM_PHASE_GAMER, 0,{ 1, 40 }, 422, 398, { 1, 111 } @@ -611,7 +622,7 @@ static Phase table[] = }, }, { - 1525, + WM_PHASE_PLAY, "", FALSE, FALSE, @@ -620,7 +631,7 @@ static Phase table[] = }, }, { - 1530, + WM_PHASE_PLAYTEST, "", FALSE, FALSE, @@ -629,43 +640,43 @@ static Phase table[] = }, }, { - 1582, + WM_PHASE_STOP, "stop.blp", FALSE, FALSE, { { - 1584, + WM_PHASE_GWRITE, 0,{ 1, 53 }, 187, 178, { 1, 263 } }, { - 1585, + WM_PHASE_GREADp, 0,{ 1, 52 }, 187, 296, { 1, 264 } }, { - 1541, + WM_PHASE_SETUPp, 0,{ 1, 47 }, 350, 156, { 1, 128 } }, { - 1583, + WM_PHASE_HELP, 0,{ 1, 86 }, 391, 156, { 1, 267 } }, { - 1587, + WM_PHASE_QUITPLAY, 0,{ 1, 78 }, 413, 262, { 1, 266 } }, { - 1525, + WM_PHASE_PLAY, 0,{ 1, 77 }, 413, 323, { 1, 265 } @@ -674,13 +685,13 @@ static Phase table[] = }, }, { - 1583, + WM_PHASE_HELP, "help.blp", FALSE, FALSE, { { - 1525, + WM_PHASE_PLAY, 0,{ 1, 18 }, 442, 358, { 1, 174 } @@ -689,55 +700,55 @@ static Phase table[] = }, }, { - 1586, + WM_PHASE_GREAD, "gread.blp", FALSE, TRUE, { { - 1225, + WM_BUTTON1, 0,{ 0 }, 280, 110, { 0 } }, { - 1226, + WM_BUTTON2, 0,{ 0 }, 280, 150, { 0 } }, { - 1227, + WM_BUTTON3, 0,{ 0 }, 280, 190, { 0 } }, { - 1228, + WM_BUTTON4, 0,{ 0 }, 280, 230, { 0 } }, { - 1229, + WM_BUTTON5, 0,{ 0 }, 280, 270, { 0 } }, { - 1230, + WM_BUTTON6, 0,{ 0 }, 280, 310, { 0 } }, { - 1244, + WM_BUTTON20, 0,{ 1, 18 }, 330, 387, { 1, 174 } }, { - 1545, + WM_PHASE_GAMER, 0,{ 1, 36 }, 458, 387, { 1, 175 } @@ -746,55 +757,55 @@ static Phase table[] = }, }, { - 1585, + WM_PHASE_GREADp, "gread.blp", FALSE, FALSE, { { - 1225, + WM_BUTTON1, 0,{ 0 }, 280, 110, { 0 } }, { - 1226, + WM_BUTTON2, 0,{ 0 }, 280, 150, { 0 } }, { - 1227, + WM_BUTTON3, 0,{ 0 }, 280, 190, { 0 } }, { - 1228, + WM_BUTTON4, 0,{ 0 }, 280, 230, { 0 } }, { - 1229, + WM_BUTTON5, 0,{ 0 }, 280, 270, { 0 } }, { - 1230, + WM_BUTTON6, 0,{ 0 }, 280, 310, { 0 } }, { - 1244, + WM_BUTTON20, 0,{ 1, 18 }, 330, 387, { 1, 174 } }, { - 1582, + WM_PHASE_STOP, 0,{ 1, 36 }, 458, 387, { 1, 175 } @@ -803,55 +814,55 @@ static Phase table[] = }, }, { - 1584, + WM_PHASE_GWRITE, "gwrite.blp", FALSE, FALSE, { { - 1225, + WM_BUTTON1, 0,{ 0 }, 280, 110, { 0 } }, { - 1226, + WM_BUTTON2, 0,{ 0 }, 280, 150, { 0 } }, { - 1227, + WM_BUTTON3, 0,{ 0 }, 280, 190, { 0 } }, { - 1228, + WM_BUTTON4, 0,{ 0 }, 280, 230, { 0 } }, { - 1229, + WM_BUTTON5, 0,{ 0 }, 280, 270, { 0 } }, { - 1230, + WM_BUTTON6, 0,{ 0 }, 280, 310, { 0 } }, { - 1244, + WM_BUTTON20, 0,{ 1, 18 }, 330, 387, { 1, 174 } }, { - 1582, + WM_PHASE_STOP, 0,{ 1, 36 }, 458, 387, { 1, 175 } @@ -860,97 +871,97 @@ static Phase table[] = }, }, { - 1534, + WM_PHASE_SETUP, "setup.blp", FALSE, FALSE, { { - 1225, + WM_BUTTON1, 0,{ 1, 50 }, 70, 110, { 1, 130 } }, { - 1226, + WM_BUTTON2, 0,{ 1, 51 }, 110, 110, { 1, 131 } }, { - 1227, + WM_BUTTON3, 0,{ 1, 50 }, 70, 220, { 1, 132 } }, { - 1228, + WM_BUTTON4, 0,{ 1, 51 }, 110, 220, { 1, 133 } }, { - 1229, + WM_BUTTON5, 0,{ 1, 133 }, 70, 330, { 1, 154 } }, { - 1230, + WM_BUTTON6, 0,{ 1, 134 }, 110, 330, { 1, 155 } }, { - 1237, + WM_BUTTON13, 0,{ 1, 135 }, 170, 330, { 1, 305 } }, { - 1238, + WM_BUTTON14, 0,{ 1, 136 }, 210, 330, { 1, 306 } }, { - 1231, + WM_BUTTON7, 0,{ 0 }, 370, 110, { 1, 156 } }, { - 1232, + WM_BUTTON8, 0,{ 0 }, 370, 150, { 1, 157 } }, { - 1233, + WM_BUTTON9, 0,{ 0 }, 370, 190, { 1, 157 } }, { - 1234, + WM_BUTTON10, 0,{ 0 }, 370, 230, { 1, 157 } }, { - 1235, + WM_BUTTON11, 0,{ 0 }, 370, 270, { 1, 157 } }, { - 1236, + WM_BUTTON12, 0,{ 0 }, 370, 310, { 1, 157 } }, { - 1545, + WM_PHASE_GAMER, 0,{ 1, 18 }, 541, 411, { 1, 174 } @@ -959,97 +970,97 @@ static Phase table[] = }, }, { - 1541, + WM_PHASE_SETUPp, "setup.blp", FALSE, FALSE, { { - 1225, + WM_BUTTON1, 0,{ 1, 50 }, 70, 110, { 1, 130 } }, { - 1226, + WM_BUTTON2, 0,{ 1, 51 }, 110, 110, { 1, 131 } }, { - 1227, + WM_BUTTON3, 0,{ 1, 50 }, 70, 220, { 1, 132 } }, { - 1228, + WM_BUTTON4, 0,{ 1, 51 }, 110, 220, { 1, 133 } }, { - 1229, + WM_BUTTON5, 0,{ 1, 133 }, 70, 330, { 1, 154 } }, { - 1230, + WM_BUTTON6, 0,{ 1, 134 }, 110, 330, { 1, 155 } }, { - 1237, + WM_BUTTON13, 0,{ 1, 135 }, 170, 330, { 1, 305 } }, { - 1238, + WM_BUTTON14, 0,{ 1, 136 }, 210, 330, { 1, 306 } }, { - 1231, + WM_BUTTON7, 0,{ 0 }, 370, 110, { 1, 156 } }, { - 1232, + WM_BUTTON8, 0,{ 0 }, 370, 150, { 1, 157 } }, { - 1233, + WM_BUTTON9, 0,{ 0 }, 370, 190, { 1, 157 } }, { - 1234, + WM_BUTTON10, 0,{ 0 }, 370, 230, { 1, 157 } }, { - 1235, + WM_BUTTON11, 0,{ 0 }, 370, 270, { 1, 157 } }, { - 1236, + WM_BUTTON12, 0,{ 0 }, 370, 310, { 1, 157 } }, { - 1525, + WM_PHASE_PLAY, 0,{ 1, 18 }, 541, 411, { 1, 174 } @@ -1058,13 +1069,13 @@ static Phase table[] = }, }, { - 1533, + WM_PHASE_LOST, "lost.blp", FALSE, FALSE, { { - 1525, + WM_PHASE_PLAY, 0,{ 1, 18 }, 541, 411, { 1, 174 } @@ -1073,13 +1084,13 @@ static Phase table[] = }, }, { - 1547, + WM_PHASE_LOSTDESIGN, "lost.blp", FALSE, FALSE, { { - 1529, + WM_PHASE_INFO, 0,{ 1, 18 }, 541, 411, { 1, 174 } @@ -1088,13 +1099,13 @@ static Phase table[] = }, }, { - 1549, + WM_PHASE_LOSTMULTI, "lost.blp", FALSE, FALSE, { { - 1545, + WM_PHASE_GAMER, 0,{ 1, 18 }, 541, 411, { 1, 174 } @@ -1103,13 +1114,13 @@ static Phase table[] = }, }, { - 1532, + WM_PHASE_WIN, "win.blp", FALSE, FALSE, { { - 1545, + WM_PHASE_GAMER, 0,{ 1, 18 }, 541, 411, { 1, 174 } @@ -1118,13 +1129,13 @@ static Phase table[] = }, }, { - 1546, + WM_PHASE_WINDESIGN, "win.blp", FALSE, FALSE, { { - 1529, + WM_PHASE_INFO, 0,{ 1, 18 }, 541, 411, { 1, 174 } @@ -1133,13 +1144,13 @@ static Phase table[] = }, }, { - 1550, + WM_PHASE_WINMULTI, "win.blp", FALSE, FALSE, { { - 1545, + WM_PHASE_GAMER, 0,{ 1, 18 }, 541, 411, { 1, 174 } @@ -1148,85 +1159,85 @@ static Phase table[] = }, }, { - 1526, + WM_PHASE_BUILD, "", FALSE, FALSE, { { - 1044, + WM_DECOR1, 0,{ 1, 6 }, 11, 11, { 1, 1000 } }, { - 1045, + WM_DECOR2, 0,{ 11, 31, 29, 32, 69, 33, 37, 82, 130, 139, 30, 142 }, 11, 53, { 11, 2030, 1023, 2072, 1042, 2047, 1026, 1049, 1076, 1080, 1021, 1082 } }, { - 1046, + WM_DECOR3, 0,{ 8, 0, 1, 2, 27, 34, 35, 67, 106 }, 11, 95, { 8, 1001, 1002, 1003, 1020, 1024, 1025, 1038, 1062 } }, { - 1047, + WM_DECOR4, 0,{ 10, 22, 59, 68, 118, 127, 100, 128, 129, 39, 38 }, 11, 137, { 10, 2033, 1032, 1037, 1067, 1075, 1061, 1074, 1076, 2038, 2041 } }, { - 1048, + WM_DECOR5, 0,{ 10, 137, 138, 65, 66, 112, 58, 23, 80, 81, 79 }, 11, 179, { 10, 1079, 1080, 1039, 1040, 1065, 1031, 1015, 1047, 1048, 1022 } }, { - 1049, + WM_DECOR6, 0,{ 12, 8, 9, 107, 26, 42, 41, 131, 143, 132, 101, 120, 122 }, 11, 221, { 12, 1006, 1007, 1063, 1018, 1028, 1027, 1077, 1083, 1078, 1064, 1069, 1071 } }, { - 1050, + WM_DECOR7, 0,{ 13, 21, 20, 19, 28, 121, 16, 55, 60, 113, 140, 54, 95, 99 }, 11, 263, { 13, 1009, 1010, 1011, 1019, 1070, 1012, 1030, 1033, 1066, 1081, 1029, 1059, 1060 } }, { - 1051, + WM_DECOR8, 0,{ 9, 7, 10, 75, 74, 89, 88, 93, 92, 87 }, 11, 305, { 9, 1004, 1005, 1046, 1045, 1052, 1051, 1054, 1053, 2007 } }, { - 1052, + WM_DECOR9, 0,{ 10, 125, 126, 144, 124, 56, 70, 123, 141, 17, 76 }, 11, 347, { 10, 1036, 1035, 1084, 1073, 1041, 1043, 1072, 2044, 1013, 1014 } }, { - 1053, + WM_DECOR10, 0,{ 5, 119, 24, 71, 57, 85 }, 11, 389, { 5, 1068, 1016, 1044, 2004, 1050 } }, { - 1054, + WM_DECOR11, 0,{ 8, 11, 5, 96, 97, 98, 63, 62, 64 }, 11, 431, { 8, 1008, 1055, 1056, 1057, 1058, 1035, 1034, 1036 } }, { - 1530, + WM_PHASE_PLAYTEST, 0,{ 1, 48 }, 544, 431, { 1, 124 } }, { - 1529, + WM_PHASE_INFO, 0,{ 1, 40 }, 586, 431, { 1, 119 } @@ -1235,79 +1246,79 @@ static Phase table[] = }, }, { - 1535, + WM_PHASE_MUSIC, "music.blp", FALSE, FALSE, { { - 1225, + WM_BUTTON1, 0,{ 1, 40 }, 200, 130, { 1, 134 } }, { - 1226, + WM_BUTTON2, 0,{ 1, 44 }, 290, 130, { 1, 135 } }, { - 1227, + WM_BUTTON3, 0,{ 1, 44 }, 290, 170, { 1, 136 } }, { - 1228, + WM_BUTTON4, 0,{ 1, 44 }, 290, 210, { 1, 137 } }, { - 1229, + WM_BUTTON5, 0,{ 1, 44 }, 290, 250, { 1, 138 } }, { - 1230, + WM_BUTTON6, 0,{ 1, 44 }, 290, 290, { 1, 139 } }, { - 1231, + WM_BUTTON7, 0,{ 1, 44 }, 350, 130, { 1, 140 } }, { - 1232, + WM_BUTTON8, 0,{ 1, 44 }, 350, 170, { 1, 141 } }, { - 1233, + WM_BUTTON9, 0,{ 1, 44 }, 350, 210, { 1, 142 } }, { - 1234, + WM_BUTTON10, 0,{ 1, 44 }, 350, 250, { 1, 143 } }, { - 1235, + WM_BUTTON11, 0,{ 1, 44 }, 350, 290, { 1, 171 } }, { - 1529, + WM_PHASE_INFO, 0,{ 1, 18 }, 540, 410, { 1, 174 } @@ -1316,229 +1327,229 @@ static Phase table[] = }, }, { - 1542, + WM_PHASE_REGION, "region.blp", FALSE, FALSE, { { - 1227, + WM_BUTTON3, 0,{ 0 }, 48, 58, { 1, 217 } }, { - 1252, + WM_BUTTON28, 0,{ 0 }, 48, 98, { 1, 300 } }, { - 1246, + WM_BUTTON22, 0,{ 0 }, 48, 138, { 1, 236 } }, { - 1243, + WM_BUTTON19, 0,{ 0 }, 48, 178, { 1, 233 } }, { - 1245, + WM_BUTTON21, 0,{ 0 }, 48, 218, { 1, 235 } }, { - 1244, + WM_BUTTON20, 0,{ 0 }, 48, 258, { 1, 234 } }, { - 1231, + WM_BUTTON7, 0,{ 0 }, 48, 298, { 1, 221 } }, { - 1234, + WM_BUTTON10, 0,{ 0 }, 48, 338, { 1, 224 } }, { - 1225, + WM_BUTTON1, 0,{ 0 }, 148, 58, { 1, 215 } }, { - 1239, + WM_BUTTON15, 0,{ 0 }, 148, 98, { 1, 229 } }, { - 1238, + WM_BUTTON14, 0,{ 0 }, 148, 138, { 1, 228 } }, { - 1235, + WM_BUTTON11, 0,{ 0 }, 148, 178, { 1, 225 } }, { - 1232, + WM_BUTTON8, 0,{ 0 }, 148, 218, { 1, 222 } }, { - 1247, + WM_BUTTON23, 0,{ 0 }, 148, 258, { 1, 237 } }, { - 1237, + WM_BUTTON13, 0,{ 0 }, 148, 298, { 1, 227 } }, { - 1230, + WM_BUTTON6, 0,{ 0 }, 148, 338, { 1, 220 } }, { - 1241, + WM_BUTTON17, 0,{ 0 }, 248, 58, { 1, 231 } }, { - 1242, + WM_BUTTON18, 0,{ 0 }, 248, 98, { 1, 232 } }, { - 1236, + WM_BUTTON12, 0,{ 0 }, 248, 138, { 1, 226 } }, { - 1251, + WM_BUTTON27, 0,{ 0 }, 248, 178, { 1, 299 } }, { - 1240, + WM_BUTTON16, 0,{ 0 }, 248, 218, { 1, 230 } }, { - 1226, + WM_BUTTON2, 0,{ 0 }, 248, 258, { 1, 216 } }, { - 1254, + WM_BUTTON30, 0,{ 0 }, 248, 298, { 1, 302 } }, { - 1253, + WM_BUTTON29, 0,{ 0 }, 248, 338, { 1, 301 } }, { - 1256, + WM_BUTTON32, 0,{ 0 }, 348, 58, { 1, 304 } }, { - 1229, + WM_BUTTON5, 0,{ 0 }, 348, 98, { 1, 219 } }, { - 1233, + WM_BUTTON9, 0,{ 0 }, 348, 138, { 1, 223 } }, { - 1255, + WM_BUTTON31, 0,{ 0 }, 348, 178, { 1, 303 } }, { - 1250, + WM_BUTTON26, 0,{ 0 }, 348, 218, { 1, 298 } }, { - 1248, + WM_BUTTON24, 0,{ 0 }, 348, 258, { 1, 238 } }, { - 1228, + WM_BUTTON4, 0,{ 0 }, 348, 298, { 1, 218 } }, { - 1249, + WM_BUTTON25, 0,{ 0 }, 348, 338, { 1, 297 } }, { - 1265, + WM_DIMS1, 0,{ 1, 15 }, 521, 135, { 1, 121 } }, { - 1266, + WM_DIMS2, 0,{ 1, 13 }, 521, 175, { 1, 122 } }, { - 1267, + WM_DIMS3, 0,{ 1, 14 }, 521, 215, { 1, 123 } }, { - 1268, + WM_DIMS4, 0,{ 1, 61 }, 521, 255, { 1, 126 } }, { - 1529, + WM_PHASE_INFO, 0,{ 1, 18 }, 540, 411, { 1, 174 } @@ -1547,19 +1558,19 @@ static Phase table[] = }, }, { - 1558, + WM_PHASE_NAMEDESIGN, "name.blp", FALSE, FALSE, { { - 1564, + WM_PHASE_DONAMEDESIGN, 0,{ 1, 18 }, 222, 326, { 1, 174 } }, { - 1529, + WM_PHASE_INFO, 0,{ 1, 36 }, 378, 326, { 1, 175 } @@ -1568,31 +1579,31 @@ static Phase table[] = }, }, { - 1559, + WM_PHASE_WRITEDESIGN, "write.blp", FALSE, FALSE, { { - 1234, + WM_BUTTON10, 0,{ 1, 72 }, 420, 112, { 1, 193 } }, { - 1235, + WM_BUTTON11, 0,{ 1, 73 }, 420, 252, { 1, 192 } }, { - 1565, + WM_PHASE_DOWRITEDESIGN, 0,{ 1, 18 }, 222, 387, { 1, 174 } }, { - 1529, + WM_PHASE_INFO, 0,{ 1, 36 }, 380, 387, { 1, 175 } @@ -1601,67 +1612,67 @@ static Phase table[] = }, }, { - 1560, + WM_PHASE_READDESIGN, "read.blp", FALSE, FALSE, { { - 1225, + WM_BUTTON1, 0,{ 1, 51 }, 190, 110, { 0 } }, { - 1226, + WM_BUTTON2, 0,{ 1, 51 }, 190, 150, { 0 } }, { - 1227, + WM_BUTTON3, 0,{ 1, 51 }, 190, 190, { 0 } }, { - 1228, + WM_BUTTON4, 0,{ 1, 51 }, 190, 230, { 0 } }, { - 1229, + WM_BUTTON5, 0,{ 1, 51 }, 190, 270, { 0 } }, { - 1230, + WM_BUTTON6, 0,{ 1, 51 }, 190, 310, { 0 } }, { - 1234, + WM_BUTTON10, 0,{ 1, 72 }, 420, 110, { 1, 193 } }, { - 1235, + WM_BUTTON11, 0,{ 1, 73 }, 420, 310, { 1, 192 } }, { - 1566, + WM_PHASE_DOREADDESIGN, 0,{ 1, 18 }, 222, 387, { 1, 174 } }, { - 1529, + WM_PHASE_INFO, 0,{ 1, 36 }, 380, 387, { 1, 175 } @@ -1670,19 +1681,19 @@ static Phase table[] = }, }, { - 1561, + WM_PHASE_CLEARDESIGN, "clear.blp", FALSE, FALSE, { { - 1567, + WM_PHASE_DOCLEARDESIGN, 0,{ 1, 18 }, 222, 326, { 1, 176 } }, { - 1529, + WM_PHASE_INFO, 0,{ 1, 36 }, 378, 326, { 1, 177 } @@ -1691,7 +1702,7 @@ static Phase table[] = }, }, { - 1536, + WM_PHASE_PLAYMOVIE, "movie.blp", FALSE, FALSE, @@ -1700,7 +1711,7 @@ static Phase table[] = }, }, { - 1537, + WM_PHASE_PLAYMOVIE, "movie.blp", FALSE, FALSE, @@ -1709,7 +1720,7 @@ static Phase table[] = }, }, { - 1548, + WM_PHASE_WINMOVIEDESIGN, "movie.blp", FALSE, FALSE, @@ -1718,7 +1729,7 @@ static Phase table[] = }, }, { - 1551, + WM_PHASE_WINMOVIEMULTI, "movie.blp", FALSE, FALSE, @@ -1727,7 +1738,7 @@ static Phase table[] = }, }, { - 1556, + WM_PHASE_BYE, "bye.blp", FALSE, FALSE, @@ -1736,13 +1747,13 @@ static Phase table[] = }, }, { - 1543, + WM_PHASE_INSERT, "insert.blp", FALSE, FALSE, { { - 1545, + WM_PHASE_GAMER, 0,{ 1, 40 }, 16, 424, { 1, 106 } @@ -1805,7 +1816,7 @@ CEvent::CEvent() m_pDemoBuffer = NULL; m_demoTime = 0; m_bCtrlDown = FALSE; - m_input = 0; + m_keyPress = 0; m_menuIndex = 0; ZeroMemory(m_menuDecor, sizeof(m_menuDecor)); @@ -1987,7 +1998,7 @@ void CEvent::RestoreGame() void CEvent::FlushInput() { - m_input = 0; + m_keyPress = 0; m_pDecor->SetInput(0); return; @@ -2072,35 +2083,35 @@ void CEvent::ReadInput() if (joyPos == 0) { - m_input = 0; + m_keyPress = 0; if ((int)joy.dwXpos < 16384) { - m_input = KEY_LEFT; + m_keyPress = KEY_LEFT; } - if ((m_input == KEY_NONE) && ((int)joy.dwYpos < 16384)) + if ((m_keyPress == KEY_NONE) && ((int)joy.dwYpos < 16384)) { - m_input = KEY_UP; + m_keyPress = KEY_UP; } - if (((m_input == KEY_NONE) || (something)) && (49152 < (int)joy.dwYpos)) + if (((m_keyPress == KEY_NONE) || (something)) && (49152 < (int)joy.dwYpos)) { - m_input = m_input | KEY_DOWN; + m_keyPress = m_keyPress | KEY_DOWN; } if (((BYTE)joy.dwButtons & JOY_BUTTON1) != 0) { - m_input = m_input & ~(KEY_DOWN | KEY_UP) | KEY_JUMP; + m_keyPress = m_keyPress & ~(KEY_DOWN | KEY_UP) | KEY_JUMP; } if (((BYTE)joy.dwButtons & JOY_BUTTON2) != 0) { if (bSkateboard == FALSE) { - keyInput = m_input & ~KEY_DOWN | KEY_UP | KEY_JUMP; + keyInput = m_keyPress & ~KEY_DOWN | KEY_UP | KEY_JUMP; } else { - keyInput = m_input & ~(KEY_DOWN | KEY_UP) | KEY_JUMP; + keyInput = m_keyPress & ~(KEY_DOWN | KEY_UP) | KEY_JUMP; } - m_input = keyInput; + m_keyPress = keyInput; } if (((BYTE)joy.dwButtons & JOY_BUTTON3) != 0) { @@ -2108,25 +2119,25 @@ void CEvent::ReadInput() { if (bSkateboard == FALSE) { - keyInput = m_input | KEY_DOWN | KEY_JUMP; + keyInput = m_keyPress | KEY_DOWN | KEY_JUMP; } else { - keyInput = m_input & ~(KEY_DOWN | KEY_UP) | KEY_JUMP; + keyInput = m_keyPress & ~(KEY_DOWN | KEY_UP) | KEY_JUMP; } } else { - keyInput = m_input | KEY_DOWN; + keyInput = m_keyPress | KEY_DOWN; } - m_input = keyInput; - m_input = keyInput & ~KEY_UP; + m_keyPress = keyInput; + m_keyPress = keyInput & ~KEY_UP; } if (((BYTE)joy.dwButtons & JOY_BUTTON4) != 0) { - m_input = m_input & ~(KEY_DOWN | KEY_UP) | KEY_FIRE; + m_keyPress = m_keyPress & ~(KEY_DOWN | KEY_UP) | KEY_FIRE; } - m_pDecor->SetInput(m_input); + m_pDecor->SetInput(m_keyPress); m_pDecor->SetJoystickEnable(TRUE); return; } @@ -2833,12 +2844,12 @@ BOOL CEvent::TreatEventBase(UINT message, WPARAM wParam, LPARAM lParam) { if (m_phase == WM_PHASE_SERVICE) { - ChangePhase(WM_PHASE_DPLAY_DO_SERVICE); + ChangePhase(WM_PHASE_DP_DOSERVICE); return TRUE; } if (m_phase == WM_PHASE_CREATE) { - ChangePhase(WM_PHASE_DPLAY_CREATE); + ChangePhase(WM_PHASE_DP_DOCREATE); return TRUE; } if (m_phase == WM_PHASE_MULTI) @@ -2966,110 +2977,140 @@ BOOL CEvent::TreatEventBase(UINT message, WPARAM wParam, LPARAM lParam) case WM_PHASE_READDESIGN: case WM_PHASE_CLEARDESIGN: case WM_PHASE_SERVICE: - case WM_PHASE_DPLAY_DO_SERVICE: - case WM_PHASE_DPLAY_CANCEL_SERVICE: + case WM_PHASE_DP_DOSERVICE: + case WM_PHASE_DP_CANCELSERVICE: case WM_PHASE_SESSION: - case WM_PHASE_1572: - case WM_PHASE_DPLAY_CREATE_LOBBY: - case WM_PHASE_DPLAY_REFRESH: - case WM_PHASE_DPLAY_CANCEL_SESSION: + case WM_PHASE_DP_JOIN: + case WM_PHASE_DP_CREATELOBBY: + case WM_PHASE_DP_REFRESH: + case WM_PHASE_DP_CANCELSESSION: case WM_PHASE_MULTI: - case WM_PHASE_DPLAY_START_GAME_2: - case WM_PHASE_DPLAY_CANCEL_MULTI: + case WM_PHASE_DP_STARTMULTI: + case WM_PHASE_DP_CANCELMULTI: case WM_PHASE_CREATE: - case WM_PHASE_DPLAY_CREATE: - case WM_PHASE_DPLAY_CANCEL_CREATE: + case WM_PHASE_DP_DOCREATE: + case WM_PHASE_DP_CANCELCREATE: case WM_PHASE_STOP: case WM_PHASE_HELP: case WM_PHASE_GWRITE: case WM_PHASE_GREADp: case WM_PHASE_GREAD: - case WM_PHASE_DOQUIT: + case WM_PHASE_QUITPLAY: case WM_PHASE_1588: if (ChangePhase(message)) return TRUE; break; case WM_PHASE_DOPLAY: - //TODO + m_bPrivate = FALSE; + m_mission = 1; + if (CheckCDForWorld1()) + { + return ChangePhase(WM_PHASE_PLAY); + } + else + { + m_tryInsertCount = 40; + m_tryPhase = WM_PHASE_PLAY; + return ChangePhase(WM_PHASE_INSERT); + } break; case WM_PHASE_PRIVATE: - // + m_bPrivate = true; + return ChangePhase(WM_PHASE_INFO); break; case WM_PHASE_DEMO: m_demoNumber = 0; DemoPlayStart(); + return FALSE; break; case WM_PHASE_DONAMEGAMER: case WM_PHASE_DOCLEARGAMER: case WM_PHASE_DONAMEDESIGN: - case WM_PHASE_1565: - case WM_PHASE_1566: + case WM_PHASE_DOWRITEDESIGN: + case WM_PHASE_DOREADDESIGN: case WM_PHASE_DOCLEARDESIGN: ChangeButtons(message); return FALSE; - case WM_PREV: // TODO: further is mostly copied from pb + case WM_PREV: + i = (m_keyPress & KEY_JUMP) ? 10 : 1; + if (m_phase == WM_PHASE_MULTI) + { + m_multi -= i; + if (m_multi < 1) m_multi = 1; + + m_b6D34 = m_pDecor->Read(m_gamer, m_multi + 200, FALSE); + if (m_b6D34) DrawMap(); + + NetSendLobby(); + NetAdjustLobbyButtons(); + return TRUE; + } + if (m_bPrivate) { - if (m_private > 0) - { - m_private--; - if (ChangePhase(WM_PHASE_INFO)) return TRUE; - } - } - else if (m_bSchool) - { - if (m_exercice > 0) - { - m_exercice--; - if (ChangePhase(WM_PHASE_INFO)) return TRUE; - } + m_private -= i; + if (m_private < 1) m_private = 1; + + return ChangePhase(WM_PHASE_INFO); } else { - if (m_mission > 0) - { - m_mission--; - if (ChangePhase(WM_PHASE_INFO)) return TRUE; - } + m_mission -= i; + if (m_mission < 1) m_mission = 1; + + return ChangePhase(WM_PHASE_INFO); } break; - case WM_NEXT: - if (m_bPrivate) + i = (m_keyPress & KEY_JUMP) ? 10 : 1; + if (m_phase == WM_PHASE_MULTI) { - if (m_private < 20 - 1) - { - m_private++; - if (ChangePhase(WM_PHASE_INFO)) return TRUE; - } + m_multi += i; + if (m_multi > 12) m_multi = 12; + + m_b6D34 = m_pDecor->Read(m_gamer, m_multi + 200, FALSE); + if (m_b6D34) DrawMap(); + + NetSendLobby(); + NetAdjustLobbyButtons(); + return TRUE; } - else if (m_bSchool) + + if (m_bPrivate || !m_bBuildOfficialMissions) { - if (m_exercice < 99) - { - m_exercice++; - if (ChangePhase(WM_PHASE_INFO)) return TRUE; - } + m_private += i; + if (m_private > 20) m_private = 20; + + return ChangePhase(WM_PHASE_INFO); } else { - if (m_mission < 99) - { - m_mission++; - if (m_maxMission < m_mission) - { - m_maxMission = m_mission; - } - if (ChangePhase(WM_PHASE_INFO)) return TRUE; - } + m_mission += i; + if (m_mission > 320) m_mission = 320; + + return ChangePhase(WM_PHASE_INFO); } break; - + case WM_MOVIE: + StartMovie("movie\\essai.avi"); + ChangePhase(WM_PHASE_INIT); + return FALSE; case WM_DECOR1: SetState(WM_DECOR1, 1); SetState(WM_DECOR2, 0); SetState(WM_DECOR3, 0); SetState(WM_DECOR4, 0); SetState(WM_DECOR5, 0); + SetState(WM_DECOR6, 0); + SetState(WM_DECOR7, 0); + SetState(WM_DECOR8, 0); + SetState(WM_DECOR9, 0); + SetState(WM_DECOR10, 0); + SetState(WM_DECOR11, 0); + + i = GetMenu(WM_DECOR1); + m_pDecor->SetFieldCC38AndStuff(1, i); + m_menuIndex = 0; + m_menuDecor[0] = i; break; case WM_DECOR2: @@ -3078,6 +3119,17 @@ BOOL CEvent::TreatEventBase(UINT message, WPARAM wParam, LPARAM lParam) SetState(WM_DECOR3, 0); SetState(WM_DECOR4, 0); SetState(WM_DECOR5, 0); + SetState(WM_DECOR6, 0); + SetState(WM_DECOR7, 0); + SetState(WM_DECOR8, 0); + SetState(WM_DECOR9, 0); + SetState(WM_DECOR10, 0); + SetState(WM_DECOR11, 0); + + i = GetMenu(WM_DECOR2); + m_pDecor->SetFieldCC38AndStuff(2, i); + m_menuIndex = 1; + m_menuDecor[1] = i; break; case WM_DECOR3: @@ -3086,6 +3138,17 @@ BOOL CEvent::TreatEventBase(UINT message, WPARAM wParam, LPARAM lParam) SetState(WM_DECOR3, 1); SetState(WM_DECOR4, 0); SetState(WM_DECOR5, 0); + SetState(WM_DECOR6, 0); + SetState(WM_DECOR7, 0); + SetState(WM_DECOR8, 0); + SetState(WM_DECOR9, 0); + SetState(WM_DECOR10, 0); + SetState(WM_DECOR11, 0); + + i = GetMenu(WM_DECOR3); + m_pDecor->SetFieldCC38AndStuff(3, i); + m_menuIndex = 2; + m_menuDecor[2] = i; break; case WM_DECOR4: @@ -3094,6 +3157,17 @@ BOOL CEvent::TreatEventBase(UINT message, WPARAM wParam, LPARAM lParam) SetState(WM_DECOR3, 0); SetState(WM_DECOR4, 1); SetState(WM_DECOR5, 0); + SetState(WM_DECOR6, 0); + SetState(WM_DECOR7, 0); + SetState(WM_DECOR8, 0); + SetState(WM_DECOR9, 0); + SetState(WM_DECOR10, 0); + SetState(WM_DECOR11, 0); + + i = GetMenu(WM_DECOR4); + m_pDecor->SetFieldCC38AndStuff(4, i); + m_menuIndex = 3; + m_menuDecor[3] = i; break; case WM_DECOR5: @@ -3102,6 +3176,131 @@ BOOL CEvent::TreatEventBase(UINT message, WPARAM wParam, LPARAM lParam) SetState(WM_DECOR3, 0); SetState(WM_DECOR4, 0); SetState(WM_DECOR5, 1); + SetState(WM_DECOR6, 0); + SetState(WM_DECOR7, 0); + SetState(WM_DECOR8, 0); + SetState(WM_DECOR9, 0); + SetState(WM_DECOR10, 0); + SetState(WM_DECOR11, 0); + + i = GetMenu(WM_DECOR5); + m_pDecor->SetFieldCC38AndStuff(5, i); + m_menuIndex = 4; + m_menuDecor[4] = i; + break; + + case WM_DECOR6: + SetState(WM_DECOR1, 0); + SetState(WM_DECOR2, 0); + SetState(WM_DECOR3, 0); + SetState(WM_DECOR4, 0); + SetState(WM_DECOR5, 0); + SetState(WM_DECOR6, 1); + SetState(WM_DECOR7, 0); + SetState(WM_DECOR8, 0); + SetState(WM_DECOR9, 0); + SetState(WM_DECOR10, 0); + SetState(WM_DECOR11, 0); + + i = GetMenu(WM_DECOR6); + m_pDecor->SetFieldCC38AndStuff(6, i); + m_menuIndex = 5; + m_menuDecor[5] = i; + break; + + case WM_DECOR7: + SetState(WM_DECOR1, 0); + SetState(WM_DECOR2, 0); + SetState(WM_DECOR3, 0); + SetState(WM_DECOR4, 0); + SetState(WM_DECOR5, 0); + SetState(WM_DECOR6, 0); + SetState(WM_DECOR7, 1); + SetState(WM_DECOR8, 0); + SetState(WM_DECOR9, 0); + SetState(WM_DECOR10, 0); + SetState(WM_DECOR11, 0); + + i = GetMenu(WM_DECOR7); + m_pDecor->SetFieldCC38AndStuff(7, i); + m_menuIndex = 6; + m_menuDecor[6] = i; + break; + + case WM_DECOR8: + SetState(WM_DECOR1, 0); + SetState(WM_DECOR2, 0); + SetState(WM_DECOR3, 0); + SetState(WM_DECOR4, 0); + SetState(WM_DECOR5, 0); + SetState(WM_DECOR6, 0); + SetState(WM_DECOR7, 0); + SetState(WM_DECOR8, 1); + SetState(WM_DECOR9, 0); + SetState(WM_DECOR10, 0); + SetState(WM_DECOR11, 0); + + i = GetMenu(WM_DECOR8); + m_pDecor->SetFieldCC38AndStuff(8, i); + m_menuIndex = 7; + m_menuDecor[7] = i; + break; + + case WM_DECOR9: + SetState(WM_DECOR1, 0); + SetState(WM_DECOR2, 0); + SetState(WM_DECOR3, 0); + SetState(WM_DECOR4, 0); + SetState(WM_DECOR5, 0); + SetState(WM_DECOR6, 0); + SetState(WM_DECOR7, 0); + SetState(WM_DECOR8, 0); + SetState(WM_DECOR9, 1); + SetState(WM_DECOR10, 0); + SetState(WM_DECOR11, 0); + + i = GetMenu(WM_DECOR9); + m_pDecor->SetFieldCC38AndStuff(9, i); + m_menuIndex = 8; + m_menuDecor[8] = i; + break; + + case WM_DECOR10: + SetState(WM_DECOR1, 0); + SetState(WM_DECOR2, 0); + SetState(WM_DECOR3, 0); + SetState(WM_DECOR4, 0); + SetState(WM_DECOR5, 0); + SetState(WM_DECOR6, 0); + SetState(WM_DECOR7, 0); + SetState(WM_DECOR8, 0); + SetState(WM_DECOR9, 0); + SetState(WM_DECOR10, 1); + SetState(WM_DECOR11, 0); + + i = GetMenu(WM_DECOR10); + m_pDecor->SetFieldCC38AndStuff(10, i); + m_menuIndex = 9; + m_menuDecor[9] = i; + break; + + case WM_DECOR11: + SetState(WM_DECOR1, 0); + SetState(WM_DECOR2, 0); + SetState(WM_DECOR3, 0); + SetState(WM_DECOR4, 0); + SetState(WM_DECOR5, 0); + SetState(WM_DECOR6, 0); + SetState(WM_DECOR7, 0); + SetState(WM_DECOR8, 0); + SetState(WM_DECOR9, 0); + SetState(WM_DECOR10, 0); + SetState(WM_DECOR11, 1); + + i = GetMenu(WM_DECOR11); + m_pDecor->SetFieldCC38AndStuff(11, i); + m_menuIndex = 10; + m_menuDecor[10] = i; break; case WM_BUTTON0: @@ -3146,10 +3345,6 @@ BOOL CEvent::TreatEventBase(UINT message, WPARAM wParam, LPARAM lParam) case WM_BUTTON39: ChangeButtons(message); break; - case WM_MOVIE: - StartMovie("movie\\essai.avi"); - ChangePhase(WM_PHASE_INIT); - break; } return FALSE; @@ -3513,7 +3708,7 @@ BOOL CEvent::ChangePhase(UINT phase) { m_bShowMouse = FALSE; } - if (phase == WM_PHASE_1544) + if (phase == WM_PHASE_QUITPLAYTEST) { m_pDecor->Read(m_gamer, 999, TRUE); phase = WM_PHASE_BUILD; @@ -3557,7 +3752,7 @@ BOOL CEvent::ChangePhase(UINT phase) DemoRecStop(); } - if (phase == WM_PHASE_DOQUIT) + if (phase == WM_PHASE_QUITPLAY) { if (!m_bPrivate) { @@ -3586,43 +3781,43 @@ BOOL CEvent::ChangePhase(UINT phase) return ChangePhase(WM_PHASE_INFO); } } - if (phase == WM_PHASE_DPLAY_DO_SERVICE) + if (phase == WM_PHASE_DP_DOSERVICE) { // ... } - if (phase == WM_PHASE_DPLAY_CANCEL_SERVICE) + if (phase == WM_PHASE_DP_CANCELSERVICE) { // ... } - if (phase == WM_PHASE_1572) + if (phase == WM_PHASE_DP_JOIN) { // ... } - if (phase == WM_PHASE_DPLAY_CREATE_LOBBY) + if (phase == WM_PHASE_DP_CREATELOBBY) { // ... } - if (phase == WM_PHASE_DPLAY_REFRESH) + if (phase == WM_PHASE_DP_REFRESH) { // ... } - if (phase == WM_PHASE_DPLAY_CANCEL_SESSION) + if (phase == WM_PHASE_DP_CANCELSESSION) { // ... } - if (phase == WM_PHASE_DPLAY_CREATE) + if (phase == WM_PHASE_DP_DOCREATE) { // ... } - if (phase == WM_PHASE_DPLAY_CANCEL_CREATE) + if (phase == WM_PHASE_DP_CANCELCREATE) { // ... } - if (phase == WM_PHASE_DPLAY_START_GAME_2) + if (phase == WM_PHASE_DP_STARTMULTI) { // ... } - if (phase == WM_PHASE_DPLAY_CANCEL_MULTI) + if (phase == WM_PHASE_DP_CANCELMULTI) { // ... } @@ -3649,7 +3844,7 @@ BOOL CEvent::ChangePhase(UINT phase) m_phase = phase; m_index = SearchPhase(phase); - if (table[m_index].bUnk && !FUN_1fbd0()) + if (table[m_index].bUnk && !CheckCDForWorld1()) { m_tryInsertCount = 40; m_tryPhase = m_phase; @@ -4282,7 +4477,7 @@ void CEvent::DemoPlayStop() m_bDemoPlay = FALSE; m_bDemoRec = FALSE; m_demoTime = 0; - m_input = 0; + m_keyPress = 0; m_pDecor->SetInput(0); m_private = 1; ChangePhase(WM_PHASE_INIT); @@ -4348,7 +4543,7 @@ void CEvent::DemoRecEvent(UINT message, UINT input, WPARAM wParam, LPARAM lParam { if (m_demoIndex > 0 && m_pDemoBuffer[m_demoIndex - 1].time == m_demoTime && - m_pDemoBuffer[m_demoIndex - 1].input == m_input) + m_pDemoBuffer[m_demoIndex - 1].input == m_keyPress) m_demoIndex++; if (m_demoIndex >= MAXDEMO) @@ -4655,8 +4850,18 @@ BOOL CEvent::ClearGamer(int gamer) return TRUE; } -BOOL CEvent::FUN_1fbd0() +BOOL CEvent::CheckCDForWorld1() { // TODO return TRUE; +} + +void CEvent::DrawMap() +{ + //TODO +} + +void CEvent::NetAdjustLobbyButtons() +{ + //TODO } \ No newline at end of file diff --git a/src/event.h b/src/event.h index 2fde885..81b004e 100644 --- a/src/event.h +++ b/src/event.h @@ -186,7 +186,9 @@ protected: void MouseRelease(); void MouseCapture(); - BOOL FUN_1fbd0(); + void DrawMap(); + BOOL CheckCDForWorld1(); + void NetAdjustLobbyButtons(); protected: @@ -274,7 +276,7 @@ protected: BOOL m_bDemoPlay; DemoEvent* m_pDemoBuffer; int m_demoTime; - int m_input; + int m_keyPress; int m_demoIndex; int m_demoEnd; int m_demoNumber; diff --git a/src/misc.cpp b/src/misc.cpp index 86f6b9e..a92a01d 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -89,21 +89,6 @@ int Random(int min, int max) return (int)n; } - -BOOL IntersectRect(RECT dst, RECT src1, RECT src2) -{ - dst.left = max(src1.left, src2.left); - dst.right = min(src1.right, src2.right); - dst.top = max(src1.top, src2.top); - dst.bottom = min(src1.bottom, src2.bottom); - return IsRectEmpty(&dst); -} - -BOOL IsRectEmpty(RECT rect) -{ - return rect.left >= rect.right || rect.top >= rect.bottom; -} - void GetCurrentDir(char *pName, int lg) { int i; diff --git a/src/misc.h b/src/misc.h index ab0977e..42b875b 100644 --- a/src/misc.h +++ b/src/misc.h @@ -13,8 +13,6 @@ extern POINT ConvLongToPos(LPARAM lParam); extern void InitRandom(); extern int Random(int min, int max); -extern BOOL IntersectRect(RECT dst, RECT src1, RECT src2); -extern BOOL IsRectEmpty(RECT rect); extern void GetCurrentDir(char *pName, int lg); extern void AddCDPath(char *pFilename); diff --git a/src/pixmap.cpp b/src/pixmap.cpp index 8c39f99..177e4be 100644 --- a/src/pixmap.cpp +++ b/src/pixmap.cpp @@ -1696,7 +1696,7 @@ void CPixmap::MouseBackDraw() } // Dessine le lutin dans m_lpDDSBack. - BltFast(m_lpDDSBack, CHELEMENT, dst, rcRect, 1); + BltFast(m_lpDDSBack, CHELEMENT, dst, rcRect, 0); } // Sauve le fond sous la souris. @@ -1786,18 +1786,18 @@ void CPixmap::MouseBackRestore() rcRect.left -= dst.x; dst.x = 0; } - if ( dst.x+DIMBLUPIX > LXIMAGE ) + if ( dst.x+ rcRect.right - rcRect.left > LXIMAGE ) { - rcRect.right -= (dst.x+DIMBLUPIX)-LXIMAGE; + rcRect.right -= (dst.x+ rcRect.right - rcRect.left)-LXIMAGE; } if ( dst.y < 0 ) { rcRect.top -= dst.y; dst.y = 0; } - if ( dst.y+DIMBLUPIY > LYIMAGE ) + if ( dst.y+ rcRect.top - rcRect.bottom > LYIMAGE ) { - rcRect.bottom -= (dst.y+DIMBLUPIY)-LYIMAGE; + rcRect.bottom -= (dst.y+ rcRect.top - rcRect.bottom)-LYIMAGE; } while( TRUE ) diff --git a/src/sound.cpp b/src/sound.cpp index a5e6bed..95f388a 100644 --- a/src/sound.cpp +++ b/src/sound.cpp @@ -579,7 +579,7 @@ BOOL CSound::PlayMusic(HWND hWnd, int music) // MCI will attempt to choose the MIDI mapper as the output port. mciOpenParms.dwCallback = 0; mciOpenParms.wDeviceID = 0; - mciOpenParms.lpstrDeviceType = (LPSTR)MCI_DEVTYPE_SEQUENCER; + mciOpenParms.lpstrDeviceType = "sequencer"; mciOpenParms.lpstrElementName = string; dwReturn = mciSendCommand(NULL, MCI_OPEN, @@ -704,7 +704,7 @@ BOOL CSound::PlayCDAudio(HWND hWnd, int track) mciOpenParms.dwCallback = 0; mciOpenParms.wDeviceID = 0; mciOpenParms.lpstrAlias = NULL; - mciOpenParms.lpstrDeviceType = (LPSTR)MCI_DEVTYPE_CD_AUDIO; + mciOpenParms.lpstrDeviceType = "cdaudio"; dwReturn = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE_ID | MCI_OPEN_TYPE,